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

根据发起人、责任人匹配人员。

Browse Source 
update。
This commit is contained in:
wangzhijiang
2022-04-20 15:52:43 +08:00
parent a67e779314
commit 3009d3a723
7 changed files with 962 additions and 720 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/ProjectLawsInventoryEOController.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
@GetMapping(value = "/list")
public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) {
List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO,req);
return Result.OK(list);
return Result.OK(projectLawsInventoryEO.getCut(),list);
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+57 -15
View File
@@ -170,18 +170,32 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String designDeliverableTemplateName;
/**设计符合性确认-发起人*/
@Excel(name = "设计符合性确认-发起人", width = 15)
@ApiModelProperty(value = "设计符合性确认-发起人")
/**设计符合性确认-发起人角色*/
@Excel(name = "设计符合性确认-发起人角色", width = 15)
@ApiModelProperty(value = "设计符合性确认-发起人角色")
@Dict(dicCode ="fa1_qi3_ren2")
private String designInitiator;
/**设计符合性确认-责任人*/
@Excel(name = "设计符合性确认-责任人", width = 15)
@ApiModelProperty(value = "设计符合性确认-责任人")
/**设计符合性确认-发起人id*/
@ApiModelProperty(value = "设计符合性确认-发起人id")
private String designInitiatorId;
/**设计符合性确认-发起人名称*/
@TableField(exist = false)
private String designInitiatorName;
/**设计符合性确认-责任人角色*/
@Excel(name = "设计符合性确认-责任人角色", width = 15)
@ApiModelProperty(value = "设计符合性确认-责任人角色")
@Dict(dicCode ="ze2_ren4_ren2")
private String designDuty;
/**设计符合性确认-责任人id*/
@ApiModelProperty(value = "设计符合性确认-责任人id")
private String designDutyId;
/**设计符合性确认-责任人名称*/
@TableField(exist = false)
private String designDutyName;
/**设计符合性确认-截止时间*/
@Excel(name = "设计符合性确认-截止时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -204,18 +218,32 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String prehomoDeliverableTemplateName;
/**prehomo确认-发起人*/
@Excel(name = "prehomo确认-发起人", width = 15)
@ApiModelProperty(value = "prehomo确认-发起人")
/**prehomo确认-发起人角色*/
@Excel(name = "prehomo确认-发起人角色", width = 15)
@ApiModelProperty(value = "prehomo确认-发起人角色")
@Dict(dicCode ="fa1_qi3_ren2")
private String prehomoInitiator;
/**prehomo确认-责任人*/
@Excel(name = "prehomo确认-责任人", width = 15)
@ApiModelProperty(value = "prehomo确认-责任人")
/**prehomo确认-发起人id*/
@ApiModelProperty(value = "prehomo确认-发起人id")
private String prehomoInitiatorId;
/**prehomo确认-发起人名称*/
@TableField(exist = false)
private String prehomoInitiatorName;
/**prehomo确认-责任人角色*/
@Excel(name = "prehomo确认-责任人角色", width = 15)
@ApiModelProperty(value = "prehomo确认-责任人角色")
@Dict(dicCode ="ze2_ren4_ren2")
private String prehomoDuty;
/**prehomo确认-责任人id*/
@ApiModelProperty(value = "prehomo确认-责任人id")
private String prehomoDutyId;
/**prehomo确认-责任人名称*/
@TableField(exist = false)
private String prehomoDutyName;
/**prehomo确认-截止时间*/
@Excel(name = "prehomo确认-截止时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -238,18 +266,32 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String verifyDeliverableTemplateName;
/**验证符合性确认-发起人*/
@Excel(name = "验证符合性确认-发起人", width = 15)
@ApiModelProperty(value = "验证符合性确认-发起人")
/**验证符合性确认-发起人角色*/
@Excel(name = "验证符合性确认-发起人角色", width = 15)
@ApiModelProperty(value = "验证符合性确认-发起人角色")
@Dict(dicCode ="fa1_qi3_ren2")
private String verifyInitiator;
/**验证符合性确认-发起人id*/
@ApiModelProperty(value = "验证符合性确认-发起人id")
private String verifyInitiatorId;
/**验证符合性确认-发起人名称*/
@TableField(exist = false)
private String verifyInitiatorName;
/**验证符合性确认-责任人*/
@Excel(name = "验证符合性确认-责任人", width = 15)
@ApiModelProperty(value = "验证符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String verifyDuty;
/**验证符合性确认-责任人id*/
@ApiModelProperty(value = "验证符合性确认-责任人id")
private String verifyDutyId;
/**验证符合性确认-责任人名称*/
@TableField(exist = false)
private String verifyDutyName;
/**验证符合性确认-截止时间*/
@Excel(name = "验证符合性确认-截止时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+198 -19
View File
@@ -213,16 +213,49 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
List<String> userIdList = new ArrayList<>();
List<String> deliverableList = new ArrayList<>();
for (ProjectLawsInventoryEO projectLawsInventoryEO : list) {
//认证工程师id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){
userIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
}
//法规工程师id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){
userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
}
//工程接口人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())){
userIdList.add(projectLawsInventoryEO.getEngineeringInterfacePerson());
}
//设计符合性确认
//发起人
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
userIdList.add(projectLawsInventoryEO.getDesignInitiatorId());
}
//责任人
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){
userIdList.add(projectLawsInventoryEO.getDesignDutyId());
}
//prehomo确认
//发起人
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
userIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId());
}
//责任人
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
userIdList.add(projectLawsInventoryEO.getPrehomoDutyId());
}
//验证符合性确认
//发起人
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
userIdList.add(projectLawsInventoryEO.getVerifyInitiatorId());
}
//责任人
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){
userIdList.add(projectLawsInventoryEO.getVerifyDutyId());
}
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
@@ -272,6 +305,54 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
}
//设计符合性确认
//发起人
String designInitiatorId = projectLawsInventoryEO.getDesignInitiatorId();
if(StringUtils.isNotEmpty(designInitiatorId)){
String designInitiatorName = sysUsers.stream().filter(e -> designInitiatorId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignInitiatorName(designInitiatorName);
}
//责任人
String designDutyId = projectLawsInventoryEO.getDesignDutyId();
if(StringUtils.isNotEmpty(designDutyId)){
String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDutyName(designDutyName);
}
//prehomo确认
//发起人
String prehomoInitiatorId = projectLawsInventoryEO.getPrehomoInitiatorId();
if(StringUtils.isNotEmpty(prehomoInitiatorId)){
String prehomoInitiatorName = sysUsers.stream().filter(e -> prehomoInitiatorId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setPrehomoInitiatorName(prehomoInitiatorName);
}
//责任人
String prehomoDutyId = projectLawsInventoryEO.getPrehomoDutyId();
if(StringUtils.isNotEmpty(prehomoDutyId)){
String prehomoDutyName = sysUsers.stream().filter(e -> prehomoDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setPrehomoDutyName(prehomoDutyName);
}
//验证符合性确认
//发起人
String verifyInitiatorId = projectLawsInventoryEO.getVerifyInitiatorId();
if(StringUtils.isNotEmpty(verifyInitiatorId)){
String verifyInitiatorName = sysUsers.stream().filter(e -> verifyInitiatorId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyInitiatorName(verifyInitiatorName);
}
//责任人
String verifyDutyId = projectLawsInventoryEO.getVerifyDutyId();
if(StringUtils.isNotEmpty(verifyDutyId)){
String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyDutyName(verifyDutyName);
}
}
//清单确认状态
@@ -632,10 +713,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CollectionUtils.isNotEmpty(projectRelatedPersonnels)){
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<String> inventoryAffirmStatusList = new ArrayList<>();
/*List<String> inventoryAffirmStatusList = new ArrayList<>();
inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.REJECTED.getValue());
queryWrapper.lambda().in(ProjectLawsInventoryEO::getInventoryAffirmStatus,inventoryAffirmStatusList);
queryWrapper.lambda().in(ProjectLawsInventoryEO::getInventoryAffirmStatus,inventoryAffirmStatusList);*/
queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
//查询当前项目下，清单状态为 未发起、拒绝状态的法规清单。
List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
@@ -645,33 +726,90 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){
//法规工程师
if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
String lawEngineer = projectRelatedPersonnel.getLawEngineer();
if(StringUtils.isNotEmpty(lawEngineer)){
String[] lawEngineerArr = lawEngineer.split(",");
if(lawEngineerArr.length == 1){
projectLawsInventoryEO.setRegulationOwnerId(lawEngineer);
}
String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setRegulationOwnerId(userId);
}
}
//认证工程师
if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
String certificationEngineer = projectRelatedPersonnel.getCertificationEngineer();
if(StringUtils.isNotEmpty(certificationEngineer)){
String[] certificationEngineerArr = certificationEngineer.split(",");
if(certificationEngineerArr.length == 1){
projectLawsInventoryEO.setHomologationEngineerId(certificationEngineer);
}
String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setHomologationEngineerId(userId);
}
}
//项目接口人
if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePerson();
if(StringUtils.isNotEmpty(engineeringInterfacePerson)){
String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
if(engineeringInterfacePersonArr.length == 1){
projectLawsInventoryEO.setEngineeringInterfacePerson(engineeringInterfacePerson);
String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
}
}
//设计符合性确认
//发起人角色
if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
String designInitiator = projectLawsInventoryEO.getDesignInitiator();
if(StringUtils.isNotEmpty(designInitiator)){
String userId = ToGetAUserId(designInitiator, projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setDesignInitiatorId(userId);
}
}
}
//责任人角色
if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())){
String designDuty = projectLawsInventoryEO.getDesignDuty();
if(StringUtils.isNotEmpty(designDuty)){
String userId = ToGetAUserId(designDuty, projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setDesignDutyId(userId);
}
}
}
//prehomo确认
//发起人角色
if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
if(StringUtils.isNotEmpty(prehomoInitiator)){
String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setPrehomoInitiatorId(userId);
}
}
}
if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
//责任人角色
String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
if(StringUtils.isNotEmpty(prehomoDuty)){
String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setPrehomoDutyId(userId);
}
}
}
//验证符合性确认
if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
//发起人角色
String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
if(StringUtils.isNotEmpty(verifyInitiator)){
String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setVerifyInitiatorId(userId);
}
}
}
if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyDutyId())){
//责任人角色
String verifyDuty = projectLawsInventoryEO.getVerifyDuty();
if(StringUtils.isNotEmpty(verifyDuty)){
String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnel);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setVerifyDutyId(userId);
}
}
}
@@ -687,4 +825,45 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
return new Result<>().success("带入成功！");
}
/**
* 获取一个用户的id
* @param roleCode
* @param projectRelatedPersonnel
* @return
*/
public String ToGetAUserId(String roleCode,ProjectRelatedPersonnel projectRelatedPersonnel){
String resultUserId = "";
//法规工程师
if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
String lawEngineer = projectRelatedPersonnel.getLawEngineer();
if(StringUtils.isNotEmpty(lawEngineer)){
String[] lawEngineerArr = lawEngineer.split(",");
if(lawEngineerArr.length == 1){
resultUserId = lawEngineer;
}
}
}
//认证工程师
if(StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
String certificationEngineer = projectRelatedPersonnel.getCertificationEngineer();
if(StringUtils.isNotEmpty(certificationEngineer)){
String[] certificationEngineerArr = certificationEngineer.split(",");
if(certificationEngineerArr.length == 1){
resultUserId = certificationEngineer;
}
}
}
//工程接口人
if(StringUtils.equals(roleCode,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())){
String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePerson();
if(StringUtils.isNotEmpty(engineeringInterfacePerson)){
String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
if(engineeringInterfacePersonArr.length == 1){
resultUserId = engineeringInterfacePerson;
}
}
}
return resultUserId;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+12
View File
@@ -223,6 +223,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
@Override
public Result<?> queryPersonByProjectId(String projectId,String dutyTerritory) {
JSONObject result = new JSONObject();
List<Map<String,Object>> allPersonList = new ArrayList<>();
List<Map<String,Object>> lawEngineerList = new ArrayList<>();
List<Map<String,Object>> certificationEngineerList = new ArrayList<>();
List<Map<String,Object>> engineeringInterfacePersonList = new ArrayList<>();
@@ -301,10 +302,21 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
}
}
}
allPersonList.addAll(lawEngineerList);
allPersonList.addAll(certificationEngineerList);
allPersonList.addAll(engineeringInterfacePersonList);
//把userId相同的用户进行去重。
allPersonList = allPersonList.stream().collect(
Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(o -> (String)o.get("value")))), ArrayList::new
)
);
result.put("lawEngineerList",lawEngineerList);
result.put("certificationEngineerList",certificationEngineerList);
result.put("engineeringInterfacePersonList",engineeringInterfacePersonList);
result.put("allPersonList",allPersonList);
return Result.OK(result);
}
jero-web/src/common/lang/en-us.js
+1
View File
@@ -691,4 +691,5 @@ module.exports = {
historicalVersion:'Historical version',
versionName:'Version name',
finalizationTime:'Finalization time',
incorrectsubmitted:'The data status is incorrect; Only data with status to be confirmed can be submitted',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -676,6 +676,7 @@ module.exports = {
confirmOverrule:'确认驳回？',
The:'第',
submitted:'条数据已提交不能重复提交',
incorrectsubmitted:'条数据状态有误；只能提交状态为待确认的数据',
basicInformationOfParameters:'参数基本信息',
regulatoryCertificationTaskPlan:'法规/认证任务计划',
bringInRelevantPersonnel:'带入相关人员',
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+692 -685
View File
File diff suppressed because it is too large Load Diff