WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据项目库id，查询该项目下所有的工程接口人接口开发。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-18 11:54:51 +08:00
parent 6c4df3e809
commit 3893045b55
4 changed files with 92 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+14
View File
@@ -260,4 +260,18 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
List<Map<String,Object>> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params);
return Result.OK(regulatoryEngineerMapList);
}
//engineeringInterfacePerson
/**
* 通过projectId查询法规工程师
*
* @return
*/
@AutoLog(value = "项目库-相关人员维护表-根据projectId查询工程接口人")
@ApiOperation(value="项目库-相关人员维护表-根据projectId查询工程接口人", notes="项目库-相关人员维护表-根据projectId查询工程接口人")
@GetMapping(value = "/queryEngineeringInterfacePersonByProjectId")
public Result<?> queryEngineeringInterfacePersonByProjectId(@RequestParam Map<String,Object> params){
List<Map<String,Object>> engineeringInterfacePersonMapList = projectRelatedPersonnelService.queryEngineeringInterfacePersonByProjectId(params);
return Result.OK(engineeringInterfacePersonMapList);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
+2
View File
@@ -101,4 +101,6 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
* @return
*/
List<Map<String, Object>> queryLawEngineerByProjectId(Map<String, Object> params);
List<Map<String, Object>> queryEngineeringInterfacePersonByProjectId(Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+36
View File
@@ -1588,6 +1588,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
});
}
}
// 设计符合性-流程状态 designFlowStatusName
if("designFlowStatusName".equals(orderByField)){
// if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
// Collections.sort(result,(e1, e2)->{
// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName());
// }
// return -1;
// });
// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
// Collections.sort(result,(e1,e2)->{
// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName());
// }
// return -1;
// });
// }
}
// 验证符合性排序
// 验证符合性-责任人 verifyDutyId
@@ -1642,6 +1660,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
});
}
}
// 验证符合性-流程状态 designFlowStatusName
if("verifyFlowStatusName".equals(orderByField)){
// if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
// Collections.sort(result,(e1, e2)->{
// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
// return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName());
// }
// return -1;
// });
// }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
// Collections.sort(result,(e1,e2)->{
// if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
// return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName());
// }
// return -1;
// });
// }
}
}
return result;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+40
View File
@@ -1823,4 +1823,44 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
return resultList;
}
@Override
public List<Map<String, Object>> queryEngineeringInterfacePersonByProjectId(Map<String, Object> params) {
List<Map<String, Object>> resultList = new ArrayList<>();
String projectLibraryId = (String) params.get("projectLibraryId");
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
List<ProjectRelatedPersonnel> prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId));
if(CollectionUtils.isNotEmpty(prpEoList)){
List<String> userIdList = new ArrayList<>();
String engineeringInterfacePersonIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineeringInterfacePerson()))
.map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){
userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(",")));
}
String engineerAttSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerAttSet()))
.map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineerAttSetIds)){
userIdList.addAll(Arrays.asList(engineerAttSetIds.split(",")));
}
String engineerLawSetIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getEngineerLawSet()))
.map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineerLawSetIds)){
userIdList.addAll(Arrays.asList(engineerLawSetIds.split(",")));
}
if(CollectionUtils.isNotEmpty(userIdList)){
List<SysUser> engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList);
if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){
for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) {
Map<String,Object> engineeringInterfacePersonMap = new HashMap<>();
engineeringInterfacePersonMap.put("id",engineeringInterfacePerson.getId());
engineeringInterfacePersonMap.put("userName",engineeringInterfacePerson.getUsername());
resultList.add(engineeringInterfacePersonMap);
}
}
}
}
return resultList;
}
}