1、查询项目参与人员接口添加queryType字段,支持查询特定状态的人员
This commit is contained in:
@@ -163,8 +163,8 @@ public class SimulationLyricNodeController {
|
||||
*/
|
||||
@GetMapping("/queryProjectMember")
|
||||
@Operation(summary = "查询项目参与人员", description = "查询项目参与人员")
|
||||
public SdmResponse queryProjectMember(@RequestParam String projectId,@RequestParam Integer current,@RequestParam Integer size) {
|
||||
return lyricInternalService.queryProjectMember(projectId,current,size);
|
||||
public SdmResponse queryProjectMember(@RequestParam String projectId,@RequestParam Integer queryType,@RequestParam Integer current,@RequestParam Integer size) {
|
||||
return lyricInternalService.queryProjectMember(projectId,queryType,current,size);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -37,6 +37,14 @@ public interface ILyricInternalService {
|
||||
|
||||
SdmResponse getHkToken();
|
||||
|
||||
SdmResponse queryProjectMember(String projectId, Integer current, Integer size);
|
||||
/**
|
||||
* 查询项目参与人员
|
||||
* @param projectId 项目的uuid
|
||||
* @param queryType 区分人员状态的标识,为空:代表查询所有状态的人员,0:存在, 1:删除 , 2:冻结
|
||||
* @param current 当前页码,从1开始
|
||||
* @param size 每页展示的条数
|
||||
* @return
|
||||
*/
|
||||
SdmResponse queryProjectMember(String projectId, Integer queryType,Integer current, Integer size);
|
||||
|
||||
}
|
||||
|
||||
@@ -1620,8 +1620,16 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目参与人员
|
||||
* @param projectId 项目的uuid
|
||||
* @param queryType 区分人员状态的标识,为空:代表查询所有状态的人员,0:存在, 1:删除 , 2:冻结
|
||||
* @param current 当前页码,从1开始
|
||||
* @param size 每页展示的条数
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public SdmResponse queryProjectMember(String projectId, Integer current, Integer size) {
|
||||
public SdmResponse queryProjectMember(String projectId,Integer queryType, Integer current, Integer size) {
|
||||
log.info("开始查询项目参与人员信息,projectId:{}", projectId);
|
||||
// 1. 入参校验
|
||||
if (StringUtils.isBlank(projectId)) {
|
||||
@@ -1650,7 +1658,8 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
|
||||
PageHelper.startPage(pageCurrent, pageSize);
|
||||
List<LyricVProjectResourcePlanDM> projectMemberList = new ArrayList<>();
|
||||
try {
|
||||
projectMemberList = lyricVProjectResourcePlanDMService.lambdaQuery().eq(LyricVProjectResourcePlanDM::getProjectId, syncProjectId).list();
|
||||
projectMemberList = lyricVProjectResourcePlanDMService.lambdaQuery().eq(LyricVProjectResourcePlanDM::getProjectId, syncProjectId)
|
||||
.eq(ObjectUtils.isNotEmpty(queryType), LyricVProjectResourcePlanDM::getDelFlag, queryType).list();
|
||||
}catch (Exception ex) {
|
||||
// 查询发生异常,记录异常日志(可能是测试环境预期异常)
|
||||
if (ex instanceof MyBatisSystemException) {
|
||||
|
||||
Reference in New Issue
Block a user