diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index 92f524779..b78cfc973 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -323,4 +323,15 @@ public class ProjectCertificationInventoryEOController extends JeroController addConfigByIds(@RequestBody JSONObject json) { return this.projectCertificationInventoryEOService.addConfigByIds(json); } + + /** + * 获取责任人和接口人 + * @return + */ + @AutoLog(value = "项目库-认证清单表-获取责任人和接口人") + @ApiOperation(value="项目库-认证清单表-获取责任人和接口人", notes="项目库-认证清单表-获取责任人和接口人") + @GetMapping(value = "/queryDutyPersonByProjectId") + public Result queryDutyPersonByProjectId(@RequestParam Map params) { + return Result.OK(this.projectCertificationInventoryEOService.queryDutyPersonByProjectId(params)); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 44c2312ef..5982d82e7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -527,4 +527,17 @@ public class ProjectLawsInventoryEOController extends JeroController compulsoryTransfer(@RequestBody JSONObject json) { return this.projectLawsInventoryEOService.compulsoryTransfer(json); } + + /** + * 通过projectId查询责任人 + * + * @return + */ + @AutoLog(value = "项目库-法规清单表-通过projectId查询责任人") + @ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人") + @GetMapping(value = "/queryDutyPersonByProjectId") + public Result queryDutyPersonByProjectId(@RequestParam Map params){ + Map>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params); + return Result.OK(res); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index fc087b9d6..67bdd8777 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -253,4 +253,5 @@ public interface IProjectCertificationInventoryEOService extends IService projectCertificationInventoryEOList); void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List projectCertificationInventoryEOList); void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List projectCertificationInventoryEOList); + Map>> queryDutyPersonByProjectId(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index bfc425ec0..363994741 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -255,4 +255,6 @@ public interface IProjectLawsInventoryEOService extends IService citeDeliverable(JSONObject json); Result compulsoryTransfer(JSONObject json); + + Map>> queryDutyPersonByProjectId(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 80be66333..fd5e39de5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -5277,4 +5277,55 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl>> queryDutyPersonByProjectId(Map params) { + Map>> result = new HashMap<>(); + String projectLibraryId = (String) params.get("projectLibraryId"); + if(StringUtils.isNotEmpty(projectLibraryId)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId); + List pciList = this.list(queryWrapper); + List dutyList = new ArrayList<>(); + List interfaceList = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci : pciList) { + if(StringUtils.isNotEmpty(pci.getDutyPerson())){ + dutyList.add(pci.getDutyPerson()); + } + if(StringUtils.isNotEmpty(pci.getSdt())){ + interfaceList.add(pci.getSdt()); + } + } + if(CollectionUtils.isNotEmpty(dutyList)){ + List> resList = new ArrayList<>(); + List userList = this.sysUserService.querySysUserListByIdList(dutyList); + if(CollectionUtils.isNotEmpty(userList)){ + for (SysUser user : userList) { + Map userMap = new HashMap<>(); + userMap.put("id",user.getId()); + userMap.put("userName",user.getUsername()); + resList.add(userMap); + } + } + result.put("dutyList",resList); + } + + if(CollectionUtils.isNotEmpty(interfaceList)){ + List> resList = new ArrayList<>(); + List userList = this.sysUserService.querySysUserListByIdList(interfaceList); + if(CollectionUtils.isNotEmpty(userList)){ + for (SysUser user : userList) { + Map userMap = new HashMap<>(); + userMap.put("id",user.getId()); + userMap.put("userName",user.getUsername()); + resList.add(userMap); + } + } + result.put("interfaceList",resList); + } + } + return result; + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 967381589..411164699 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -45,6 +45,7 @@ import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.*; import com.jero.modules.project.mapper.*; @@ -274,38 +275,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectTaskInventoryEOList = new ArrayList<>(); //法规清单所有的数据 LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEO.getProjectLibraryId()); + wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEO.getProjectLibraryId()); List projectLawsInventoryEOList = this.list(wrapperTemp); //调取 String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId(); - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDummyids())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDummyids())) { //查询虚拟清单对应清单维护中的数据 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(DummyInventoryInfoEO::getId,Arrays.asList(projectLawsInventoryEO.getDummyids().split(","))); + lambdaQueryWrapper.in(DummyInventoryInfoEO::getId, Arrays.asList(projectLawsInventoryEO.getDummyids().split(","))); List dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper); - List dummyInventoryInfoEOListNew = new ArrayList<>(); - if(dummyInventoryInfoEOList.size() != 0){ + List dummyInventoryInfoEOListNew = new ArrayList<>(); + if (dummyInventoryInfoEOList.size() != 0) { List projectLawsInventoryEOS = new ArrayList<>(); //责任领域如果有多个,则需要拆分成多条 for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) { String dutyTerritory = dummyInventoryInfoEO.getDutyTerritory(); - if(StringUtils.isNotBlank(dutyTerritory)){ + if (StringUtils.isNotBlank(dutyTerritory)) { for (String dutyTerritoryOne : dutyTerritory.split(",")) { DummyInventoryInfoEO dummyInventoryInfoEONew = new DummyInventoryInfoEO(); - BeanUtils.copyProperties(dummyInventoryInfoEO,dummyInventoryInfoEONew); + BeanUtils.copyProperties(dummyInventoryInfoEO, dummyInventoryInfoEONew); dummyInventoryInfoEONew.setDutyTerritory(dutyTerritoryOne); dummyInventoryInfoEOListNew.add(dummyInventoryInfoEONew); } - }else{ + } else { dummyInventoryInfoEOListNew.add(dummyInventoryInfoEO); } } - if(projectLawsInventoryEOList.size() ==0){ + if (projectLawsInventoryEOList.size() == 0) { //此时法规清单中没有数据,直接将维护清单中的数据添加即可 for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) { ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); - BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp); + BeanUtils.copyProperties(dummyInventoryInfoEO, projectLawsInventoryEOTemp); projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", "")); projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue()); projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); @@ -316,22 +317,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOListTemp = new ArrayList<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) { List collect = projectLawsInventoryEOList.stream() .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { for (ProjectLawsInventoryEO lawsInventoryEO : collect) { //数据对比 ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO); projectLawsInventoryEOListTemp.add(projectLawsInventoryEOTemp); } - }else{ + } else { ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); - BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp); + BeanUtils.copyProperties(dummyInventoryInfoEO, projectLawsInventoryEOTemp); projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", "")); projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue()); projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); @@ -343,11 +344,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getProjectLibraryId()).collect(Collectors.toList()).get(0); + String projectLibraryId = projectLawsInventoryEOS.stream().map(e -> e.getProjectLibraryId()).collect(Collectors.toList()).get(0); String username = sysUser.getUsername(); QueryWrapper queryWrapper = new QueryWrapper<>(); String dummyInventoryBaseName = dummyInventoryBaseEOService.list(queryWrapper.eq("id", dummyInventoryBaseId)).get(0).getName();//name - String contentLog = username+"调取了"+ dummyInventoryBaseName +"虚拟清单的标准内容"; - String enContentLog = username+" called the standard content of"+ dummyInventoryBaseName +"virtual inventory."; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); + String contentLog = username + "调取了" + dummyInventoryBaseName + "虚拟清单的标准内容"; + String enContentLog = username + " called the standard content of" + dummyInventoryBaseName + "virtual inventory."; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue()); } - }else if(dummyInventoryInfoEOList.size() == 0 && StringUtils.isBlank(projectLawsInventoryEO.getFlag())){ + } else if (dummyInventoryInfoEOList.size() == 0 && StringUtils.isBlank(projectLawsInventoryEO.getFlag())) { //flag为二次确认标识,flag为空时进行验证 throw new JeroBootException("该虚拟清单的维护清单中没有数据,是否需要添加"); } @@ -388,7 +389,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -461,15 +462,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"向清单中添加了“"+serialNumber+"”"; - String enContentLog = username+" added “"+serialNumber+"” to the list."; + String serialNumber = list.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username + "向清单中添加了“" + serialNumber + "”"; + String enContentLog = username + " added “" + serialNumber + "” to the list."; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(enContentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.EN.getValue()); + projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId(), CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLawsInventoryEO.getProjectLibraryId(), CutEnum.EN.getValue()); } - if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList)){ + if (CollectionUtils.isNotEmpty(projectTaskInventoryEOList)) { //项目任务清单数据初始化。 this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); projectTaskInventoryEOList.forEach(taskInventory -> { @@ -489,7 +490,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; - String enContentLog = username+" edited the “" + projectLawsInventoryEO.getSerialNumber() + "” in the list:
"; + String contentLog = username + "编辑了清单中的“" + projectLawsInventoryEO.getSerialNumber() + "”:
"; + String enContentLog = username + " edited the “" + projectLawsInventoryEO.getSerialNumber() + "” in the list:
"; List infoEOList = new ArrayList<>(); infoEOList.add(projectLawsInventoryEO); @@ -513,10 +514,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId())); List dataListCopy = DeepCopyListUtil.depCopy(dataList); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(ProjectLawsInventoryEO::getId,projectLawsInventoryEO.getId()); + updateWrapper.in(ProjectLawsInventoryEO::getId, projectLawsInventoryEO.getId()); setDateNull(projectLawsInventoryEO, updateWrapper); //保存 - this.update(projectLawsInventoryEO,updateWrapper); + this.update(projectLawsInventoryEO, updateWrapper); // saveOrUpdate(projectLawsInventoryEO); //获取编辑中的责任领域 @@ -527,10 +528,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("projectLibraryId",projectLibrartId); - params.put("userId",currentUser.getId()); - params.put("modelType",RoleRelModelTypeEnum.LAWS_INVENTORY.getValue()); + Map params = new HashMap<>(); + params.put("projectLibraryId", projectLibrartId); + params.put("userId", currentUser.getId()); + params.put("modelType", RoleRelModelTypeEnum.LAWS_INVENTORY.getValue()); ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params); String roleCode1 = projectLibraryRoleRelEO.getRoleCode(); //分别获取当前编辑中的设计符合性和认证符合性责任人 @@ -554,33 +555,33 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl enginnerLawSetList = new ArrayList<>(); List enginnerAttSetList = new ArrayList<>(); //根据相关人员名单获取的工程接口人 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson(); - if(!StringUtils.isEmpty(enginneringInterfacePerson)){ + if (!StringUtils.isEmpty(enginneringInterfacePerson)) { enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList()); allList.addAll(enginnerList); } } //获取相关人员名单中的法规工程师 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String lawEngineer = relatedPersonnel.getLawEngineer(); - if(!StringUtils.isEmpty(lawEngineer)){ + if (!StringUtils.isEmpty(lawEngineer)) { lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList()); allList.addAll(lawEnginnerList); } } //获取相关人员名单中的工程接口-法规工程师设置 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String engineerLawSet = relatedPersonnel.getEngineerLawSet(); - if(!StringUtils.isEmpty(engineerLawSet)){ + if (!StringUtils.isEmpty(engineerLawSet)) { enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList()); allList.addAll(enginnerLawSetList); } } //获取相关人员名单中的工程接口-认证工程师设置 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String engineerAttSet = relatedPersonnel.getEngineerAttSet(); - if(!StringUtils.isEmpty(engineerAttSet)){ + if (!StringUtils.isEmpty(engineerAttSet)) { enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList()); allList.addAll(enginnerAttSetList); } @@ -589,11 +590,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl studionList = new ArrayList<>(); List certificationEngineerList = new ArrayList<>(); List projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut); - for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){ + for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) { studionList.add(projectLibraryBase.getStudioEngineer()); String certificationEngineer = projectLibraryBase.getCertificationEngineer(); - if(!StringUtils.isEmpty(certificationEngineer)){ + if (!StringUtils.isEmpty(certificationEngineer)) { certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList()); allList.addAll(certificationEngineerList); } @@ -610,31 +611,31 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl0){ - for(String allDuty : allDutyList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { + if (allList.size() > 0) { + for (String allDuty : allDutyList) { String dutyPerson = allDuty; - if(!StringUtils.isEmpty(dutyPerson)){ - if(!allList.contains(dutyPerson)){ - if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineeringInterfacePerson() != null){ - String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson(); + if (!StringUtils.isEmpty(dutyPerson)) { + if (!allList.contains(dutyPerson)) { + if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineeringInterfacePerson() != null) { + String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); - }else { + } else { relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); } - }else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerLawSet() != null){ - String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet(); + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerLawSet() != null) { + String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); relatedPersonnel.setEngineerLawSet(engineerLawSet); - }else { + } else { relatedPersonnel.setEngineerLawSet(dutyPerson); } - }else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerAttSet() !=null){ - String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet(); + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerAttSet() != null) { + String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); relatedPersonnel.setEngineerAttSet(engineerAttSet); - }else { + } else { relatedPersonnel.setEngineerAttSet(dutyPerson); } } @@ -654,16 +655,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoDiff = ListDiff.compareObject(dataList.get(0),projectLawsInventoryEO); - Map infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy); + Map infoDiff = ListDiff.compareObject(dataList.get(0), projectLawsInventoryEO); + Map infoDiffEn = ListDiff.compareObject(dataListCopy.get(0), projectLawsInventoryEOCopy); //设置更新log - setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); + setContentLog(infoDiff, contentLog, infoDiffEn, enContentLog, projectLawsInventoryEO.getProjectLibraryId()); //验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程 int roleCode = checkUserRole(projectLawsInventoryEO.getProjectLibraryId(), currentUser.getId(), ""); - if (StringUtils.equals(String.valueOf(roleCode),ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ + if (StringUtils.equals(String.valueOf(roleCode), ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { //更新流程信息 updateFlowInfo(projectLawsInventoryEO); } @@ -674,41 +675,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("contentCn","您好，您以下任务已被发起人撤回。"); - params.put("contentEn","Hello! Your task has been withdrawn by the initiator."); + Map params = new HashMap<>(); + params.put("contentCn", "您好，您以下任务已被发起人撤回。"); + params.put("contentEn", "Hello! Your task has been withdrawn by the initiator."); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); - params.put("endTime",endTime); - params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); - params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + params.put("endTime", endTime); + params.put("userIdList", Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber()); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId()); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); // 将之前的法规工程师的待办任务，转给新的法规工程师办理 QueryWrapper pidEoQueryWrap = new QueryWrapper<>(); - pidEoQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); + pidEoQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId()); List pidEoList = this.processInfoDetailEOService.list(pidEoQueryWrap); - if(CollectionUtils.isNotEmpty(pidEoList)){ + if (CollectionUtils.isNotEmpty(pidEoList)) { // 过滤出来，清单确认流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 List qdqrPidEoList = pidEoList.stream().filter(pidEo -> { boolean flag = ( - StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.QDQR.getValue()) - && StringUtils.equals(pidEo.getTaskDefinitionKey(),InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()) + StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.QDQR.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()) && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) ); return flag; @@ -794,7 +796,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designFlowPidEoList = pidEoList.stream().filter(pidEo -> { boolean flag = ( - StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue()) + StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue()) && StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) ); @@ -812,7 +814,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl verifyFlowPidEoList = pidEoList.stream().filter(pidEo -> { boolean flag = ( - StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue()) + StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue()) && StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) ); @@ -830,260 +832,260 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("contentCn","您好，以下符合性任务的截止时间已被发起人修改。"); - params.put("contentEn","Hello! The due date of the compliance task has been modified by the initiator."); + Map params = new HashMap<>(); + params.put("contentCn", "您好，以下符合性任务的截止时间已被发起人修改。"); + params.put("contentEn", "Hello! The due date of the compliance task has been modified by the initiator."); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); - params.put("endTime",endTime); - params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); - params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + params.put("endTime", endTime); + params.put("userIdList", Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber()); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId()); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); } } } - if((projectLawsInventoryOld.getVerifyDueDate() != null && projectLawsInventoryEO.getVerifyDueDate() != null) && toBeCheckedFlag){ - if(!projectLawsInventoryOld.getVerifyDueDate().equals(projectLawsInventoryEO.getVerifyDueDate())){ + if ((projectLawsInventoryOld.getVerifyDueDate() != null && projectLawsInventoryEO.getVerifyDueDate() != null) && toBeCheckedFlag) { + if (!projectLawsInventoryOld.getVerifyDueDate().equals(projectLawsInventoryEO.getVerifyDueDate())) { String endTime = ""; - if(projectLawsInventoryEO.getVerifyDueDate() != null){ + if (projectLawsInventoryEO.getVerifyDueDate() != null) { endTime = DateUtils.formatDate(projectLawsInventoryEO.getVerifyDueDate()); } String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId(); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，以下符合性任务的截止时间已被发起人修改。"); - params.put("contentEn","Hello! The due date of the compliance task has been modified by the initiator."); + Map params = new HashMap<>(); + params.put("contentCn", "您好，以下符合性任务的截止时间已被发起人修改。"); + params.put("contentEn", "Hello! The due date of the compliance task has been modified by the initiator."); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); - params.put("endTime",endTime); - params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); - params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + params.put("endTime", endTime); + params.put("userIdList", Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber()); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId()); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); } } } // 设计符合性 任务待确认消息 标识 boolean toBeConfirmedDesignFlag = ( - StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) ); - if((projectLawsInventoryOld.getDesignDutyId() != null && projectLawsInventoryEO.getDesignDutyId() != null) && toBeConfirmedDesignFlag){ - if(!projectLawsInventoryOld.getDesignDutyId().equals(projectLawsInventoryEO.getDesignDutyId())){ + if ((projectLawsInventoryOld.getDesignDutyId() != null && projectLawsInventoryEO.getDesignDutyId() != null) && toBeConfirmedDesignFlag) { + if (!projectLawsInventoryOld.getDesignDutyId().equals(projectLawsInventoryEO.getDesignDutyId())) { String endTime = ""; - if(projectLawsInventoryOld.getDesignDueDate() != null){ + if (projectLawsInventoryOld.getDesignDueDate() != null) { endTime = DateUtils.formatDate(projectLawsInventoryOld.getDesignDueDate()); } String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId(); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，您以下任务已被发起人撤回。"); - params.put("contentEn","Hello! Your task has been withdrawn by the initiator."); + Map params = new HashMap<>(); + params.put("contentCn", "您好，您以下任务已被发起人撤回。"); + params.put("contentEn", "Hello! Your task has been withdrawn by the initiator."); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); - params.put("endTime",endTime); - params.put("userIdList",Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(","))); - params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + params.put("endTime", endTime); + params.put("userIdList", Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(","))); + params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber()); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId()); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); } } } // 验证符合性 任务待确认消息 标识 boolean toBeConfirmedVerifyFlag = ( - StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - || StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(projectLawsInventoryOld.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) ); - if((projectLawsInventoryOld.getVerifyDutyId() != null && projectLawsInventoryEO.getVerifyDutyId() != null) && toBeConfirmedVerifyFlag){ - if(!projectLawsInventoryOld.getVerifyDutyId().equals(projectLawsInventoryEO.getVerifyDutyId())){ + if ((projectLawsInventoryOld.getVerifyDutyId() != null && projectLawsInventoryEO.getVerifyDutyId() != null) && toBeConfirmedVerifyFlag) { + if (!projectLawsInventoryOld.getVerifyDutyId().equals(projectLawsInventoryEO.getVerifyDutyId())) { String endTime = ""; - if(projectLawsInventoryOld.getVerifyDueDate() != null){ + if (projectLawsInventoryOld.getVerifyDueDate() != null) { endTime = DateUtils.formatDate(projectLawsInventoryOld.getVerifyDueDate()); } String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId(); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，您以下任务已被发起人撤回。"); - params.put("contentEn","Hello! Your task has been withdrawn by the initiator."); + Map params = new HashMap<>(); + params.put("contentCn", "您好，您以下任务已被发起人撤回。"); + params.put("contentEn", "Hello! Your task has been withdrawn by the initiator."); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); - params.put("endTime",endTime); - params.put("userIdList",Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(","))); - params.put("serialNumbers",projectLawsInventoryOld.getSerialNumber()); + params.put("endTime", endTime); + params.put("userIdList", Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(","))); + params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber()); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId()); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); } } } // 如果编辑了法规工程师，给新的法规工程师发消息 - if((StringUtils.isNotEmpty(projectLawsInventoryOld.getRegulationOwnerId()) && StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()))){ + if ((StringUtils.isNotEmpty(projectLawsInventoryOld.getRegulationOwnerId()) && StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()))) { if (!StringUtils.equals(projectLawsInventoryOld.getRegulationOwnerId(), projectLawsInventoryEO.getRegulationOwnerId())) { String endTime = ""; String regulationOwnerId = ""; // 设计符合性 结果待审查、结果待提交 标识 判断法规工程师是否被修改了 如果被修改了，给新的法规工程师发消息 boolean toBeReviewedDesignFlag = ( - StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) ); - if(toBeReviewedDesignFlag){ - if(projectLawsInventoryEO.getDesignDueDate() != null){ + if (toBeReviewedDesignFlag) { + if (projectLawsInventoryEO.getDesignDueDate() != null) { endTime = DateUtils.formatDate(projectLawsInventoryEO.getDesignDueDate()); } regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理。"); - params.put("contentEn","Hello! "+currentUser.getUsername()+" has assigned this task to you. Please check and address it in a timely manner."); + Map params = new HashMap<>(); + params.put("contentCn", "您好，" + currentUser.getUsername() + "向您分发了该任务，请及时查看处理。"); + params.put("contentEn", "Hello! " + currentUser.getUsername() + " has assigned this task to you. Please check and address it in a timely manner."); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); - params.put("endTime",endTime); - params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); - params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber()); + params.put("endTime", endTime); + params.put("userIdList", Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers", projectLawsInventoryEO.getSerialNumber()); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId()); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params); } } // 验证符合性 结果待审查、结果待提交 标识 判断法规工程师是否被修改了 如果被修改了，给新的法规工程师发消息 boolean toBeReviewedVerifyFlag = ( - StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) + StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) + || StringUtils.equals(projectLawsInventoryOld.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) ); if (toBeReviewedVerifyFlag) { - if(projectLawsInventoryEO.getVerifyDueDate() != null){ + if (projectLawsInventoryEO.getVerifyDueDate() != null) { endTime = DateUtils.formatDate(projectLawsInventoryEO.getVerifyDueDate()); } regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理。"); - params.put("contentEn","Hello! "+currentUser.getUsername()+" has assigned this task to you. Please check and address it in a timely manner."); + Map params = new HashMap<>(); + params.put("contentCn", "您好，" + currentUser.getUsername() + "向您分发了该任务，请及时查看处理。"); + params.put("contentEn", "Hello! " + currentUser.getUsername() + " has assigned this task to you. Please check and address it in a timely manner."); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); - params.put("endTime",endTime); - params.put("userIdList",Arrays.asList(regulationOwnerId.split(","))); - params.put("serialNumbers",projectLawsInventoryEO.getSerialNumber()); + params.put("endTime", endTime); + params.put("userIdList", Arrays.asList(regulationOwnerId.split(","))); + params.put("serialNumbers", projectLawsInventoryEO.getSerialNumber()); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId()); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params); } } } } } - private void setProjectLawsInventoryPermission(String userId, String projectId,String lawsInventoryId,Date now, List adds, String belong) { + private void setProjectLawsInventoryPermission(String userId, String projectId, String lawsInventoryId, Date now, List adds, String belong) { QueryWrapper del = new QueryWrapper<>(); del.eq("project_id", projectId) .eq("belong", belong) @@ -1101,50 +1103,51 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateWrapper) { - if(ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ - updateWrapper.set(ProjectLawsInventoryEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,null); + if (ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())) { + updateWrapper.set(ProjectLawsInventoryEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1, null); } - if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())){ - updateWrapper.set(ProjectLawsInventoryEO::getImplementTime,null); + if (ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())) { + updateWrapper.set(ProjectLawsInventoryEO::getImplementTime, null); } - if(ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())){ - updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null); + if (ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())) { + updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate, null); } - if(ObjectUtils.isEmpty(projectLawsInventoryEO.getPrehomoDueDate())){ - updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null); + if (ObjectUtils.isEmpty(projectLawsInventoryEO.getPrehomoDueDate())) { + updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate, null); } - if(ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())){ - updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null); + if (ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())) { + updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate, null); } - if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementType())){ - updateWrapper.set(ProjectLawsInventoryEO::getImplementType,null); + if (ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementType())) { + updateWrapper.set(ProjectLawsInventoryEO::getImplementType, null); } } /** * 更新流程信息 + * * @param projectLawsInventoryEO */ - public void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO){ + public void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO) { //只有法规的 任务确认状态为接受，才能启动 设计、验证、prehomo三个流程。 - if(StringUtils.equals(projectLawsInventoryEO.getTaskAffirmStatus(),TaskAffirmStatusEnum.ACCEPTED.getValue())){ + if (StringUtils.equals(projectLawsInventoryEO.getTaskAffirmStatus(), TaskAffirmStatusEnum.ACCEPTED.getValue())) { QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); - taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); + taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId()); ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper); - if(projectTaskInventoryEO != null){ + if (projectTaskInventoryEO != null) { String designPId = projectTaskInventoryEO.getDesignPId(); - if(StringUtils.isNotEmpty(designPId)){ - updateFlowAssignee(projectLawsInventoryEO,projectTaskInventoryEO,designPId, FlowTypeEnum.SJFHXSHLC.getValue()); + if (StringUtils.isNotEmpty(designPId)) { + updateFlowAssignee(projectLawsInventoryEO, projectTaskInventoryEO, designPId, FlowTypeEnum.SJFHXSHLC.getValue()); } String verifyPId = projectTaskInventoryEO.getVerifyPId(); - if(StringUtils.isNotEmpty(verifyPId)){ - updateFlowAssignee(projectLawsInventoryEO,projectTaskInventoryEO,verifyPId, FlowTypeEnum.YZFHXSCLC.getValue()); + if (StringUtils.isNotEmpty(verifyPId)) { + updateFlowAssignee(projectLawsInventoryEO, projectTaskInventoryEO, verifyPId, FlowTypeEnum.YZFHXSCLC.getValue()); } String prehomoPId = projectTaskInventoryEO.getPrehomoPId(); - if(StringUtils.isNotEmpty(prehomoPId)){ - updateFlowAssignee(projectLawsInventoryEO,projectTaskInventoryEO,prehomoPId, FlowTypeEnum.PREHOMOQRLC.getValue()); + if (StringUtils.isNotEmpty(prehomoPId)) { + updateFlowAssignee(projectLawsInventoryEO, projectTaskInventoryEO, prehomoPId, FlowTypeEnum.PREHOMOQRLC.getValue()); } } } @@ -1152,50 +1155,51 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryDetailWrapper = new QueryWrapper<>(); - taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectTaskInventoryEO.getProjectLawsInventoryId()); - taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,pId); - taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType,flowType); + taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId, projectTaskInventoryEO.getProjectLawsInventoryId()); + taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId, pId); + taskInventoryDetailWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType, flowType); List taskInventoryDetailList = projectTaskInventoryDetailEOService.getBaseMapper().selectList(taskInventoryDetailWrapper); - if(CollectionUtils.isNotEmpty(taskInventoryDetailList)){ - if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + if (CollectionUtils.isNotEmpty(taskInventoryDetailList)) { + if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) { for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : taskInventoryDetailList) { - if(StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){ + if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())) { //更新责任人的任务 projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getDesignDutyId()); } - if(StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){ + if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())) { //更新发起人的任务 projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getDesignInitiatorId()); } this.projectTaskInventoryDetailEOService.updateById(projectTaskInventoryDetailEO); } - }else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){ + } else if (StringUtils.equals(flowType, FlowTypeEnum.PREHOMOQRLC.getValue())) { for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : taskInventoryDetailList) { - if(StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){ + if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())) { //更新责任人的任务 projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getPrehomoDutyId()); } - if(StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){ + if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())) { //更新发起人的任务 projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getPrehomoInitiatorId()); } this.projectTaskInventoryDetailEOService.updateById(projectTaskInventoryDetailEO); } - }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + } else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) { for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : taskInventoryDetailList) { - if(StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())){ + if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey())) { //更新责任人的任务 projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getVerifyDutyId()); } - if(StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())){ + if (StringUtils.equals(projectTaskInventoryDetailEO.getTaskDefinitionKey(), DesignComplianceNodeEnum.SPONSOR_REVIEW.getKey())) { //更新发起人的任务 projectTaskInventoryDetailEO.setUserId(projectLawsInventoryEO.getVerifyInitiatorId()); } @@ -1203,19 +1207,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - String serialNumber = list(queryWrapper.eq("id",id)).get(0).getSerialNumber(); - String contentLog = username+"删除了清单中的“"+serialNumber+"”"; - String enContentLog = username+" deleted “"+serialNumber+"” from the list"; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); + String serialNumber = list(queryWrapper.eq("id", id)).get(0).getSerialNumber(); + String contentLog = username + "删除了清单中的“" + serialNumber + "”"; + String enContentLog = username + " deleted “" + serialNumber + "” from the list"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue()); removeById(id); this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(Arrays.asList(id.split(","))); //删除该条法规清单数据的 项目当前状态数据 QueryWrapper conditionAssessmentRemoveWrapper = new QueryWrapper<>(); - conditionAssessmentRemoveWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,id); + conditionAssessmentRemoveWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId, id); this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper); //删除该条法规清单数据的拒绝原因。 QueryWrapper rejectCauseRemoveWrapper = new QueryWrapper<>(); - rejectCauseRemoveWrapper.lambda().eq(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId,id); + rejectCauseRemoveWrapper.lambda().eq(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId, id); this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper); //删除相关人员权限 QueryWrapper delPermission = new QueryWrapper<>(); @@ -1268,20 +1274,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl ids,String projectLibraryId,String cut) { - if(ObjectUtils.isEmpty(ids)){ - if(CutEnum.CN.getValue().equals(cut)){ + public void deleteByIds(List ids, String projectLibraryId, String cut) { + if (ObjectUtils.isEmpty(ids)) { + if (CutEnum.CN.getValue().equals(cut)) { throw new JeroBootException("请选择数据"); - }else{ + } else { throw new JeroBootException("Please select data"); } } LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(),""); - if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){ - if(CutEnum.CN.getValue().equals(cut)){ + int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), ""); + if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) { + if (CutEnum.CN.getValue().equals(cut)) { throw new JeroBootException("该用户没有删除权限"); - }else{ + } else { throw new JeroBootException("The user has no deletion permission"); } } @@ -1291,23 +1297,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); List lawsList = list(queryWrapper.in("id", ids)); - String serialNumber = lawsList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String serialNumber = lawsList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"删除了清单中的“"+serialNumber+"”"; - String enContentLog = username+" deleted “"+serialNumber+"” from the list"; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.EN.getValue()); + String contentLog = username + "删除了清单中的“" + serialNumber + "”"; + String enContentLog = username + " deleted “" + serialNumber + "” from the list"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.EN.getValue()); removeByIds(ids); this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids); //删除该条法规清单数据的 项目当前状态数据 QueryWrapper conditionAssessmentRemoveWrapper = new QueryWrapper<>(); - conditionAssessmentRemoveWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,ids); + conditionAssessmentRemoveWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId, ids); this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper); //删除该条法规清单数据的拒绝原因。 QueryWrapper rejectCauseRemoveWrapper = new QueryWrapper<>(); - rejectCauseRemoveWrapper.lambda().in(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId,ids); + rejectCauseRemoveWrapper.lambda().in(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId, ids); this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper); //删除相关人员权限 @@ -1346,19 +1352,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap()); - projectLawsInventoryEOQueryWrapper.orderByDesc("create_time","serial_number"); + QueryWrapper projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap()); + projectLawsInventoryEOQueryWrapper.orderByDesc("create_time", "serial_number"); String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId(); if (StringUtils.isNotEmpty(dutyTerritoryStr)) { - String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*",""); + String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*", ""); projectLawsInventoryEOQueryWrapper.and(query -> { query.lambda().like(ProjectLawsInventoryEO::getDutyTerritory, finalDutyTerritoryStr); - if(StringUtils.contains(finalDutyTerritoryStr,",")){ + if (StringUtils.contains(finalDutyTerritoryStr, ",")) { String[] dutyTerritoryArr = finalDutyTerritoryStr.split(","); for (String duty : dutyTerritoryArr) { query.or(q -> { - q.like("duty_territory",duty); + q.like("duty_territory", duty); }); } } @@ -1366,7 +1372,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ queryWrapper.eq("regulation_owner_id",currentUser.getId()). or().eq("engineering_interface_person",currentUser.getId()). @@ -1393,7 +1399,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper); log.info("二阶段消耗时间：" + (System.currentTimeMillis() - startTime)); @@ -1404,9 +1410,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList()); result = result.stream().filter(data -> { boolean flag = false; - if(StringUtils.isNotEmpty(data.getDutyTerritory())){ + if (StringUtils.isNotEmpty(data.getDutyTerritory())) { for (String dutyTerritory : dutyTerritoryList) { - if(StringUtils.contains(data.getDutyTerritory(),dutyTerritory)){ + if (StringUtils.contains(data.getDutyTerritory(), dutyTerritory)) { flag = true; break; } @@ -1418,9 +1424,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl(); } } - dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut()); + dataDispose(result, currentUser, isProjectRole, projectLawsInventoryEO.getCut()); log.info("三阶段消耗时间：" + (System.currentTimeMillis() - startTime)); - dataDictDispose(result,projectLawsInventoryEO.getCut()); + dataDictDispose(result, projectLawsInventoryEO.getCut()); log.debug("处理数据字典消耗时间：" + (System.currentTimeMillis() - startTime)); //表头排序 result = hearSort(projectLawsInventoryEO, result); @@ -1432,151 +1438,151 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ - return comparator.compare(e1.getSerialNumber(),e2.getSerialNumber()); + if ("serialNumber".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getSerialNumber(), e2.getSerialNumber()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getSerialNumber(),e1.getSerialNumber()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getSerialNumber(), e1.getSerialNumber()); }); } } // WVTA ID wvtaId - if("wvtaId".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - return comparator.compare(e1.getWvtaId(),e2.getWvtaId()); + if ("wvtaId".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getWvtaId(), e2.getWvtaId()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getWvtaId(),e1.getWvtaId()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getWvtaId(), e1.getWvtaId()); }); } } // 责任领域 dutyTerritory_dictText - if("dutyTerritory".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - return comparator.compare(e1.getDutyTerritory_dictText(),e2.getDutyTerritory_dictText()); + if ("dutyTerritory".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getDutyTerritory_dictText(), e2.getDutyTerritory_dictText()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getDutyTerritory_dictText(),e1.getDutyTerritory_dictText()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getDutyTerritory_dictText(), e1.getDutyTerritory_dictText()); }); } } // 法规工程师 regulationOwnerName - if("regulationOwnerName".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - return comparator.compare(e1.getRegulationOwnerName(),e2.getRegulationOwnerName()); + if ("regulationOwnerName".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getRegulationOwnerName(), e2.getRegulationOwnerName()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getRegulationOwnerName(),e1.getRegulationOwnerName()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getRegulationOwnerName(), e1.getRegulationOwnerName()); }); } } // 认证工程师 homologationEngineerName - if("homologationEngineerName".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - return comparator.compare(e1.getHomologationEngineerName(),e2.getHomologationEngineerName()); + if ("homologationEngineerName".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getHomologationEngineerName(), e2.getHomologationEngineerName()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getHomologationEngineerName(),e1.getHomologationEngineerName()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getHomologationEngineerName(), e1.getHomologationEngineerName()); }); } } // 工程接口人 engineeringInterfacePersonName - if("engineeringInterfacePersonName".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - return comparator.compare(e1.getEngineeringInterfacePersonName(),e2.getEngineeringInterfacePersonName()); + if ("engineeringInterfacePersonName".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getEngineeringInterfacePersonName(), e2.getEngineeringInterfacePersonName()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getEngineeringInterfacePersonName(),e1.getEngineeringInterfacePersonName()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getEngineeringInterfacePersonName(), e1.getEngineeringInterfacePersonName()); }); } } List list = new LinkedList<>(); // 清单确认状态（未发起，法规待确认，认证待确认，接受，法规拒绝，认证拒绝） inventoryAffirmStatusName //InventoryAffirmStatusEnum - if("inventoryAffirmStatusName".equals(orderByField)){ - result = inventorySort(orderBy,orderByField,result,list); + if ("inventoryAffirmStatusName".equals(orderByField)) { + result = inventorySort(orderBy, orderByField, result, list); } // 任务确认状态（未发起，待确认，接受，拒绝） taskAffirmStatusName //TaskAffirmStatusEnum - if("taskAffirmStatusName".equals(orderByField)){ - result = taskSort(orderBy,orderByField,result,list); + if ("taskAffirmStatusName".equals(orderByField)) { + result = taskSort(orderBy, orderByField, result, list); } // 认证级别（WVTA，Com.-VTA，Cert.-Market，Reg.-Market） attestationRank_dictText - if("attestationRank".equals(orderByField)){ - result = attestationRankSort(orderBy,orderByField,result,list); + if ("attestationRank".equals(orderByField)) { + result = attestationRankSort(orderBy, orderByField, result, list); } // 设计符合性排序 // 设计符合性-责任人 designDutyId - if("designDutyId".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - return comparator.compare(e1.getDesignDutyIdName(),e2.getDesignDutyIdName()); + if ("designDutyId".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getDesignDutyIdName(), e2.getDesignDutyIdName()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getDesignDutyIdName(),e1.getDesignDutyIdName()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getDesignDutyIdName(), e1.getDesignDutyIdName()); }); } } // 设计符合性-截止时间 designDueDate - if("designDueDate".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - if(e1.getDesignDueDate() != null && e2.getDesignDueDate() != null){ + if ("designDueDate".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + if (e1.getDesignDueDate() != null && e2.getDesignDueDate() != null) { String e1DesignDueDate = DateUtils.formatDate(e1.getDesignDueDate()); String e2DesignDueDate = DateUtils.formatDate(e2.getDesignDueDate()); - return comparator.compare(e1DesignDueDate,e2DesignDueDate); + return comparator.compare(e1DesignDueDate, e2DesignDueDate); } return -1; }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - if(e1.getDesignDueDate() != null && e2.getDesignDueDate() != null){ + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + if (e1.getDesignDueDate() != null && e2.getDesignDueDate() != null) { String e1DesignDueDate = DateUtils.formatDate(e1.getDesignDueDate()); String e2DesignDueDate = DateUtils.formatDate(e2.getDesignDueDate()); - return comparator.compare(e2DesignDueDate,e1DesignDueDate); + return comparator.compare(e2DesignDueDate, e1DesignDueDate); } return -1; }); } } // 设计符合性-交付物类型 designDeliverableType - if("designDeliverableType".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()); + if ("designDeliverableType".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()); + } 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; }); } } // 设计符合性-流程状态 designFlowStatusName - if("designFlowStatusName".equals(orderByField)){ + if ("designFlowStatusName".equals(orderByField)) { // if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ // Collections.sort(result,(e1, e2)->{ // if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ @@ -1596,59 +1602,59 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ - return comparator.compare(e1.getVerifyDutyIdName(),e2.getVerifyDutyIdName()); + if ("verifyDutyId".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e1.getVerifyDutyIdName(), e2.getVerifyDutyIdName()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - return comparator.compare(e2.getVerifyDutyIdName(),e1.getVerifyDutyIdName()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + return comparator.compare(e2.getVerifyDutyIdName(), e1.getVerifyDutyIdName()); }); } } // 验证符合性-截止时间 verifyDueDate - if("verifyDueDate".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - if(e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null){ + if ("verifyDueDate".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + if (e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null) { String e1VerifyDueDate = DateUtils.formatDate(e1.getVerifyDueDate()); String e2VerifyDueDate = DateUtils.formatDate(e2.getVerifyDueDate()); - return comparator.compare(e1VerifyDueDate,e2VerifyDueDate); + return comparator.compare(e1VerifyDueDate, e2VerifyDueDate); } return -1; }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - if(e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null){ + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + if (e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null) { String e1VerifyDueDate = DateUtils.formatDate(e1.getVerifyDueDate()); String e2VerifyDueDate = DateUtils.formatDate(e2.getVerifyDueDate()); - return comparator.compare(e2VerifyDueDate,e1VerifyDueDate); + return comparator.compare(e2VerifyDueDate, e1VerifyDueDate); } return -1; }); } } // 验证符合性-交付物类型 verifyDeliverableType - if("verifyDeliverableType".equals(orderByField)){ - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(result,(e1, e2)->{ - if(e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null){ - return comparator.compare(e1.getVerifyDeliverableTypeName(),e2.getVerifyDeliverableTypeName()); + if ("verifyDeliverableType".equals(orderByField)) { + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + if (e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null) { + return comparator.compare(e1.getVerifyDeliverableTypeName(), e2.getVerifyDeliverableTypeName()); } return -1; }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(result,(e1,e2)->{ - if(e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null){ - return comparator.compare(e2.getVerifyDeliverableTypeName(),e1.getVerifyDeliverableTypeName()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(result, (e1, e2) -> { + if (e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null) { + return comparator.compare(e2.getVerifyDeliverableTypeName(), e1.getVerifyDeliverableTypeName()); } return -1; }); } } // 验证符合性-流程状态 designFlowStatusName - if("verifyFlowStatusName".equals(orderByField)){ + if ("verifyFlowStatusName".equals(orderByField)) { // if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ // Collections.sort(result,(e1, e2)->{ // if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){ @@ -1671,9 +1677,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl inventorySort(String orderBy, String orderByField, - List dummyInventoryInfoEOList, - List list) { - if(ObjectUtils.isNotEmpty(orderByField) && "inventoryAffirmStatusName".equals(orderByField)){ + List dummyInventoryInfoEOList, + List list) { + if (ObjectUtils.isNotEmpty(orderByField) && "inventoryAffirmStatusName".equals(orderByField)) { List notStarted = dummyInventoryInfoEOList.stream() .filter(e -> e.getInventoryAffirmStatusName().equals(InventoryAffirmStatusEnum.NOT_STARTED.getName())).collect(Collectors.toList()); List regEngToConfirm = dummyInventoryInfoEOList.stream() @@ -1715,17 +1721,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskSort(String orderBy, String orderByField, - List dummyInventoryInfoEOList, - List list) { - if(ObjectUtils.isNotEmpty(orderByField) && "taskAffirmStatusName".equals(orderByField)){ + List dummyInventoryInfoEOList, + List list) { + if (ObjectUtils.isNotEmpty(orderByField) && "taskAffirmStatusName".equals(orderByField)) { List notStarted = dummyInventoryInfoEOList.stream() .filter(e -> e.getTaskAffirmStatusName().equals(TaskAffirmStatusEnum.NOT_STARTED.getName())).collect(Collectors.toList()); List listToConfirm = dummyInventoryInfoEOList.stream() @@ -1751,17 +1758,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl attestationRankSort(String orderBy, String orderByField, List dummyInventoryInfoEOList, List list) { - if(ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)){ + if (ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)) { List wvta = dummyInventoryInfoEOList.stream() .filter(e -> e.getAttestationRank_dictText().startsWith(AttestationRankEnum.WVTA.getValue())).collect(Collectors.toList()); List vta = dummyInventoryInfoEOList.stream() @@ -1805,150 +1813,152 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list, Collator comparator) { - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(list,(e1, e2)->{ - return comparator.compare(e1.getAttestationRank_dictText(),e2.getAttestationRank_dictText()); + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(list, (e1, e2) -> { + return comparator.compare(e1.getAttestationRank_dictText(), e2.getAttestationRank_dictText()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(list,(e1,e2)->{ - return comparator.compare(e2.getAttestationRank_dictText(),e1.getAttestationRank_dictText()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(list, (e1, e2) -> { + return comparator.compare(e2.getAttestationRank_dictText(), e1.getAttestationRank_dictText()); }); } } + //倒序 private void attestationRankReverse(String orderBy, List list, Collator comparator) { - if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ - Collections.sort(list,(e1, e2)->{ - return comparator.compare(e1.getAttestationRank_dictText(),e2.getAttestationRank_dictText()); + if (OrderEnum.POSITIVE.getValue().equals(orderBy)) { + Collections.sort(list, (e1, e2) -> { + return comparator.compare(e1.getAttestationRank_dictText(), e2.getAttestationRank_dictText()); }); - }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ - Collections.sort(list,(e1,e2)->{ - return comparator.compare(e2.getAttestationRank_dictText(),e1.getAttestationRank_dictText()); + } else if (OrderEnum.REVERSE.getValue().equals(orderBy)) { + Collections.sort(list, (e1, e2) -> { + return comparator.compare(e2.getAttestationRank_dictText(), e1.getAttestationRank_dictText()); }); } } /** * 数据字典数据处理方法 - * @param result 返回值 - * @param cut 中英文切换 + * + * @param result 返回值 + * @param cut 中英文切换 */ - public void dataDictDispose(List result,String cut){ - if(CollectionUtils.isNotEmpty(result)){ + public void dataDictDispose(List result, String cut) { + if (CollectionUtils.isNotEmpty(result)) { List sysDictItems = sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); for (ProjectLawsInventoryEO projectLawsInventoryEO : result) { - if(StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())){ + if (StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())) { projectLawsInventoryEO.setWvtaId(""); } - if(StringUtils.isBlank(projectLawsInventoryEO.getDutyTerritory_dictText())){ + if (StringUtils.isBlank(projectLawsInventoryEO.getDutyTerritory_dictText())) { projectLawsInventoryEO.setDutyTerritory_dictText(""); } //处理适用地区 String region = projectLawsInventoryEO.getRegion(); - if(StringUtils.isNotEmpty(region)){ - String region_dictText = disposeShowDictItemValue(sysDictItems, region,cut,ProjectInventoryFieldEnum.REGION.getValue()); + if (StringUtils.isNotEmpty(region)) { + String region_dictText = disposeShowDictItemValue(sysDictItems, region, cut, ProjectInventoryFieldEnum.REGION.getValue()); projectLawsInventoryEO.setRegion_dictText(region_dictText); } //处理实施类别 String implementType = projectLawsInventoryEO.getImplementType(); - if(StringUtils.isNotEmpty(implementType)){ - String implementType_dictText = disposeShowDictItemValue(sysDictItems, implementType,cut,ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue()); + if (StringUtils.isNotEmpty(implementType)) { + String implementType_dictText = disposeShowDictItemValue(sysDictItems, implementType, cut, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue()); projectLawsInventoryEO.setImplementType_dictText(implementType_dictText); } //处理认证类型 String attestationType = projectLawsInventoryEO.getAttestationType(); - if(StringUtils.isNotEmpty(attestationType)){ - String attestationType_dictText = disposeShowDictItemValue(sysDictItems, attestationType,cut,ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); + if (StringUtils.isNotEmpty(attestationType)) { + String attestationType_dictText = disposeShowDictItemValue(sysDictItems, attestationType, cut, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); projectLawsInventoryEO.setAttestationType_dictText(attestationType_dictText); } //处理认证级别 String attestationRank = projectLawsInventoryEO.getAttestationRank(); - if(StringUtils.isNotEmpty(attestationRank)){ - String attestationRank_dictText = disposeShowDictItemValue(sysDictItems, attestationRank,cut,ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); + if (StringUtils.isNotEmpty(attestationRank)) { + String attestationRank_dictText = disposeShowDictItemValue(sysDictItems, attestationRank, cut, ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); projectLawsInventoryEO.setAttestationRank_dictText(attestationRank_dictText); - }else{ + } else { projectLawsInventoryEO.setAttestationRank_dictText(""); } //处理责任领域 String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); - if(StringUtils.isNotEmpty(dutyTerritory)){ - String dutyTerritory_dictText = disposeShowDictItemValue(sysDictItems, dutyTerritory,cut,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); + if (StringUtils.isNotEmpty(dutyTerritory)) { + String dutyTerritory_dictText = disposeShowDictItemValue(sysDictItems, dutyTerritory, cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); projectLawsInventoryEO.setDutyTerritory_dictText(dutyTerritory_dictText); } //处理设计符合性确认-交付物类型 String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType(); - if(StringUtils.isNotEmpty(designDeliverableType)){ - String designDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, designDeliverableType,cut,ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getValue()); + if (StringUtils.isNotEmpty(designDeliverableType)) { + String designDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, designDeliverableType, cut, ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getValue()); projectLawsInventoryEO.setDesignDeliverableType_dictText(designDeliverableType_dictText); } //处理设计符合性确认-发起人角色 String designInitiator = projectLawsInventoryEO.getDesignInitiator(); - if(StringUtils.isNotEmpty(designInitiator)){ - String designInitiator_dictText = disposeShowDictItemValue(sysDictItems, designInitiator,cut,ProjectInventoryFieldEnum.DESIGN_INITIATOR.getValue()); + if (StringUtils.isNotEmpty(designInitiator)) { + String designInitiator_dictText = disposeShowDictItemValue(sysDictItems, designInitiator, cut, ProjectInventoryFieldEnum.DESIGN_INITIATOR.getValue()); projectLawsInventoryEO.setDesignInitiator_dictText(designInitiator_dictText); } //处理设计符合性确认-责任人角色 String designDuty = projectLawsInventoryEO.getDesignDuty(); - if(StringUtils.isNotEmpty(designDuty)){ - String designDuty_dictText = disposeShowDictItemValue(sysDictItems, designDuty,cut,ProjectInventoryFieldEnum.DESIGN_DUTY.getValue()); + if (StringUtils.isNotEmpty(designDuty)) { + String designDuty_dictText = disposeShowDictItemValue(sysDictItems, designDuty, cut, ProjectInventoryFieldEnum.DESIGN_DUTY.getValue()); projectLawsInventoryEO.setDesignDuty_dictText(designDuty_dictText); } //处理prehomo确认-交付物类型 String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType(); - if(StringUtils.isNotEmpty(prehomoDeliverableType)){ - String prehomoDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, prehomoDeliverableType,cut,ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getValue()); + if (StringUtils.isNotEmpty(prehomoDeliverableType)) { + String prehomoDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, prehomoDeliverableType, cut, ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getValue()); projectLawsInventoryEO.setPrehomoDeliverableType_dictText(prehomoDeliverableType_dictText); } //处理prehomo确认-发起人角色 String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator(); - if(StringUtils.isNotEmpty(prehomoInitiator)){ - String prehomoInitiator_dictText = disposeShowDictItemValue(sysDictItems, prehomoInitiator,cut,ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getValue()); + if (StringUtils.isNotEmpty(prehomoInitiator)) { + String prehomoInitiator_dictText = disposeShowDictItemValue(sysDictItems, prehomoInitiator, cut, ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getValue()); projectLawsInventoryEO.setPrehomoInitiator_dictText(prehomoInitiator_dictText); } //处理prehomo确认-责任人角色 String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty(); - if(StringUtils.isNotEmpty(prehomoDuty)){ - String prehomoDuty_dictText = disposeShowDictItemValue(sysDictItems, prehomoDuty,cut,ProjectInventoryFieldEnum.PREHOMO_DUTY.getValue()); + if (StringUtils.isNotEmpty(prehomoDuty)) { + String prehomoDuty_dictText = disposeShowDictItemValue(sysDictItems, prehomoDuty, cut, ProjectInventoryFieldEnum.PREHOMO_DUTY.getValue()); projectLawsInventoryEO.setPrehomoDuty_dictText(prehomoDuty_dictText); } //处理验证符合性确认-交付物类型 String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType(); - if(StringUtils.isNotEmpty(verifyDeliverableType)){ - String verifyDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, verifyDeliverableType,cut,ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getValue()); + if (StringUtils.isNotEmpty(verifyDeliverableType)) { + String verifyDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, verifyDeliverableType, cut, ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getValue()); projectLawsInventoryEO.setVerifyDeliverableType_dictText(verifyDeliverableType_dictText); } //处理验证符合性确认-发起人角色 String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator(); - if(StringUtils.isNotEmpty(verifyInitiator)){ - String verifyInitiator_dictText = disposeShowDictItemValue(sysDictItems, verifyInitiator,cut,ProjectInventoryFieldEnum.VERIFY_INITIATOR.getValue()); + if (StringUtils.isNotEmpty(verifyInitiator)) { + String verifyInitiator_dictText = disposeShowDictItemValue(sysDictItems, verifyInitiator, cut, ProjectInventoryFieldEnum.VERIFY_INITIATOR.getValue()); projectLawsInventoryEO.setVerifyInitiator_dictText(verifyInitiator_dictText); } //处理验证符合性确认-责任人角色 String verifyDuty = projectLawsInventoryEO.getVerifyDuty(); - if(StringUtils.isNotEmpty(verifyDuty)){ - String verifyDuty_dictText = disposeShowDictItemValue(sysDictItems, verifyDuty,cut,ProjectInventoryFieldEnum.VERIFY_DUTY.getValue()); + if (StringUtils.isNotEmpty(verifyDuty)) { + String verifyDuty_dictText = disposeShowDictItemValue(sysDictItems, verifyDuty, cut, ProjectInventoryFieldEnum.VERIFY_DUTY.getValue()); projectLawsInventoryEO.setVerifyDuty_dictText(verifyDuty_dictText); } } @@ -1957,40 +1967,41 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysDictItems,String fieldValues,String cut,String dicCode){ + public String disposeShowDictItemValue(List sysDictItems, String fieldValues, String cut, String dicCode) { String result = ""; List sysDictItemList = sysDictItems.stream().filter(e -> { boolean flag = false; - if(StringUtils.equals(e.getDictCode(),dicCode)){ + if (StringUtils.equals(e.getDictCode(), dicCode)) { flag = true; } return flag; }).distinct().collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(sysDictItemList)){ - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (CollectionUtils.isNotEmpty(sysDictItemList)) { + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { result = sysDictItemList.stream().filter(e -> { boolean flag = false; List fieldValueStrList = Arrays.asList(fieldValues.split(",")); for (String fieldValueStr : fieldValueStrList) { - if(StringUtils.equals(fieldValueStr,e.getItemValue())){ + if (StringUtils.equals(fieldValueStr, e.getItemValue())) { flag = true; break; } } return flag; }).map(SysDictItem::getItemText).collect(Collectors.joining(",")); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { result = sysDictItemList.stream().filter(e -> { boolean flag = false; List fieldValueStrList = Arrays.asList(fieldValues.split(",")); for (String fieldValueStr : fieldValueStrList) { - if(StringUtils.equals(fieldValueStr,e.getItemValue())){ + if (StringUtils.equals(fieldValueStr, e.getItemValue())) { flag = true; break; } @@ -2004,25 +2015,26 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list,LoginUser currentUser,int isProjectRole,String cut){ - if(CollectionUtils.isNotEmpty(list)){ + public void dataDispose(List list, LoginUser currentUser, int isProjectRole, String cut) { + if (CollectionUtils.isNotEmpty(list)) { //树形结构数据字典(技术领域) List categoryList = sysCategoryService.list(); List userIdList = new ArrayList<>(); List deliverableList = new ArrayList<>(); List correspondingStandardList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : list) { - if(StringUtils.isNotBlank(projectLawsInventoryEO.getCorrespondingStandard())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getCorrespondingStandard())) { correspondingStandardList.addAll(Arrays.asList(projectLawsInventoryEO.getCorrespondingStandard().split(","))); } } List bussDocumentLibraryEOS = new ArrayList<>(); - if(correspondingStandardList.size() != 0){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(BussDocumentLibraryEO::getId,correspondingStandardList); + if (correspondingStandardList.size() != 0) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(BussDocumentLibraryEO::getId, correspondingStandardList); bussDocumentLibraryEOS = iBussDocumentLibraryEOService.list(lambdaQueryWrapper); } @@ -2032,132 +2044,132 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designDeliverableTypeList = Arrays.asList(designDeliverableType.split(",")); String name = getTreeName(cut, categoryList, designDeliverableTypeList); projectLawsInventoryEO.setDesignDeliverableTypeName(name); } //pre交付物类型 - if(StringUtils.isNotBlank(prehomoDeliverableType)){ + if (StringUtils.isNotBlank(prehomoDeliverableType)) { List prehomoDeliverableTypeList = Arrays.asList(prehomoDeliverableType.split(",")); String name = getTreeName(cut, categoryList, prehomoDeliverableTypeList); projectLawsInventoryEO.setPrehomoDeliverableTypeName(name); } //验证交付物类型 - if(StringUtils.isNotBlank(verifyDeliverableType)){ + if (StringUtils.isNotBlank(verifyDeliverableType)) { List verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(",")); String name = getTreeName(cut, categoryList, verifyDeliverableTypeList); projectLawsInventoryEO.setVerifyDeliverableTypeName(name); } StringBuilder sb = new StringBuilder(); - if(StringUtils.isNotBlank(projectLawsInventoryEO.getCorrespondingStandard()) && bussDocumentLibraryEOS.size() != 0){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getCorrespondingStandard()) && bussDocumentLibraryEOS.size() != 0) { for (String correspondingStandard : projectLawsInventoryEO.getCorrespondingStandard().split(",")) { List collect = bussDocumentLibraryEOS.stream().filter(e -> e.getId().equals(correspondingStandard)).collect(Collectors.toList()); - if(collect.size() != 0){ - sb.append(collect.get(0).getSerialNumber()+","); - }else{ - sb.append(correspondingStandard+","); + if (collect.size() != 0) { + sb.append(collect.get(0).getSerialNumber() + ","); + } else { + sb.append(correspondingStandard + ","); } } - if(StringUtils.isNotBlank(sb)){ + if (StringUtils.isNotBlank(sb)) { String substring = sb.substring(0, sb.length() - 1); projectLawsInventoryEO.setCorrespondingStandard(substring); } } //认证工程师id - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())) { userIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); - }else{ + } else { projectLawsInventoryEO.setHomologationEngineerName(""); } //法规工程师id - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())) { userIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); - }else{ + } else { projectLawsInventoryEO.setRegulationOwnerName(""); } //工程接口人id - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) { userIdList.add(projectLawsInventoryEO.getEngineeringInterfacePerson()); - }else{ + } else { projectLawsInventoryEO.setEngineeringInterfacePersonName(""); } //设计符合性确认 //发起人 - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())) { userIdList.add(projectLawsInventoryEO.getDesignInitiatorId()); } //责任人 - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())) { userIdList.add(projectLawsInventoryEO.getDesignDutyId()); } //prehomo确认 //发起人 - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())) { userIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId()); } //责任人 - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())) { userIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); } //验证符合性确认 //发起人 - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())) { userIdList.add(projectLawsInventoryEO.getVerifyInitiatorId()); } //责任人 - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){ + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())) { userIdList.add(projectLawsInventoryEO.getVerifyDutyId()); } //设计符合性确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); } // Prehomo确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); } // 验证符合性确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); } } List sysUsers = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(userIdList)){ + if (CollectionUtils.isNotEmpty(userIdList)) { userIdList = userIdList.stream().distinct().collect(Collectors.toList()); QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); - sysUserQueryWrapper.lambda().in(SysUser::getId,userIdList); + sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList); sysUsers = sysUserMapper.selectList(sysUserQueryWrapper); } //文件 List fileInfos = new ArrayList<>(); - if(deliverableList.size() != 0){ + if (deliverableList.size() != 0) { fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); } for (ProjectLawsInventoryEO projectLawsInventoryEO : list) { //处理人员展示名称 - if(CollectionUtils.isNotEmpty(sysUsers)){ + if (CollectionUtils.isNotEmpty(sysUsers)) { String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId(); - if(StringUtils.isNotEmpty(homologationEngineerId)){ + if (StringUtils.isNotEmpty(homologationEngineerId)) { String homologationEngineerName = sysUsers.stream().filter(e -> homologationEngineerId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setHomologationEngineerName(homologationEngineerName); } String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); - if(StringUtils.isNotEmpty(regulationOwnerId)){ + if (StringUtils.isNotEmpty(regulationOwnerId)) { String regulationOwnerName = sysUsers.stream().filter(e -> regulationOwnerId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setRegulationOwnerName(regulationOwnerName); } String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson(); - if(StringUtils.isNotEmpty(engineeringInterfacePerson)){ + if (StringUtils.isNotEmpty(engineeringInterfacePerson)) { String engineeringInterfacePersonName = sysUsers.stream().filter(e -> engineeringInterfacePerson.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setEngineeringInterfacePersonName(engineeringInterfacePersonName); @@ -2166,32 +2178,32 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designInitiatorId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setDesignInitiatorName(designInitiatorName); } //责任人 String designDutyId = projectLawsInventoryEO.getDesignDutyId(); - if(StringUtils.isNotEmpty(designDutyId)){ + if (StringUtils.isNotEmpty(designDutyId)) { String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setDesignDutyIdName(designDutyName); - }else { + } else { projectLawsInventoryEO.setDesignDutyIdName(""); } //prehomo确认 //发起人 String prehomoInitiatorId = projectLawsInventoryEO.getPrehomoInitiatorId(); - if(StringUtils.isNotEmpty(prehomoInitiatorId)){ + 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)){ + if (StringUtils.isNotEmpty(prehomoDutyId)) { String prehomoDutyName = sysUsers.stream().filter(e -> prehomoDutyId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setPrehomoDutyName(prehomoDutyName); @@ -2200,18 +2212,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl verifyInitiatorId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setVerifyInitiatorName(verifyInitiatorName); } //责任人 String verifyDutyId = projectLawsInventoryEO.getVerifyDutyId(); - if(StringUtils.isNotEmpty(verifyDutyId)){ + if (StringUtils.isNotEmpty(verifyDutyId)) { String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setVerifyDutyIdName(verifyDutyName); - }else { + } else { projectLawsInventoryEO.setVerifyDutyIdName(""); } } @@ -2232,65 +2244,65 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOQueryWrapper = new QueryWrapper<>(); - processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); - processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.YZFHXSCLC.getValue()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue()); List processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper); - if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){ + if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) { projectLawsInventoryEO.setVerifyPId(processInfoDetailEOS.get(0).getActiProcInstId()); } } - if(!StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - ||!StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){ + if (!StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + || !StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())) { QueryWrapper processInfoDetailEOQueryWrapper = new QueryWrapper<>(); - processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); - processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.SJFHXSHLC.getValue()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.SJFHXSHLC.getValue()); List processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper); - if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){ + if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) { projectLawsInventoryEO.setDesignPId(processInfoDetailEOS.get(0).getActiProcInstId()); } } @@ -2390,11 +2402,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { if (CutEnum.CN.getValue().equals(cut)) { sb.append(collect.get(0).getName() + ","); } else { - sb.append(collect.get(0).getEnName()+ ","); + sb.append(collect.get(0).getEnName() + ","); } } } @@ -2405,16 +2417,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl fileInfos, String deliverableTemplate){ + private String getFileName(ProjectLawsInventoryEO projectLawsInventoryEO, List fileInfos, String deliverableTemplate) { StringBuilder sb = new StringBuilder(); for (String s : deliverableTemplate.split(",")) { List collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { sb.append(collect.get(0).getFileName() + ","); } } String sbStr = ""; - if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){ + if (org.apache.commons.lang3.StringUtils.isNotBlank(sb)) { sbStr = sb.substring(0, sb.length() - 1); } return sbStr; @@ -2422,27 +2434,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - int isProjectRole = checkUserRole(projectLibraryId, currentUserId,lawsInventoryId); - if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getHomologationEngineerId,currentUserId); - queryWrapper.lambda().or().eq(ProjectLawsInventoryEO::getRegulationOwnerId,currentUserId); + int isProjectRole = checkUserRole(projectLibraryId, currentUserId, lawsInventoryId); + if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getHomologationEngineerId, currentUserId); + queryWrapper.lambda().or().eq(ProjectLawsInventoryEO::getRegulationOwnerId, currentUserId); } - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,lawsInventoryId); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, lawsInventoryId); Integer projectLawsInventoryCount = super.baseMapper.selectCount(queryWrapper); - if(projectLawsInventoryCount > 0){ + if (projectLawsInventoryCount > 0) { result = true; } - }catch (Exception ex){ + } catch (Exception ex) { log.error("验证项目库-法规清单表数据异常：" + ex.getMessage()); throw new JeroBootException("验证项目库-法规清单表数据异常！"); } @@ -2451,44 +2464,45 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLibraryBaseQueryWrapper = new QueryWrapper<>(); - projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId); - projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer,currentUserId); + projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId); + projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId); Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper); - if(projectLibrayBaseCount > 0){ + if (projectLibrayBaseCount > 0) { result = Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()); - }else { - if(StringUtils.isNotEmpty(lawsInventoryId)){ + } else { + if (StringUtils.isNotEmpty(lawsInventoryId)) { //查询用户是否是法规工程师 QueryWrapper queryWrapperFG = new QueryWrapper<>(); - queryWrapperFG.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId,currentUserId); - queryWrapperFG.lambda().eq(ProjectLawsInventoryEO::getId,lawsInventoryId); + queryWrapperFG.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId, currentUserId); + queryWrapperFG.lambda().eq(ProjectLawsInventoryEO::getId, lawsInventoryId); Integer lawsInventoryCountFG = super.baseMapper.selectCount(queryWrapperFG); QueryWrapper queryWrapperRZ = new QueryWrapper<>(); - queryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getHomologationEngineerId,currentUserId); - queryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getId,lawsInventoryId); + queryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getHomologationEngineerId, currentUserId); + queryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getId, lawsInventoryId); Integer lawsInventoryCountRZ = super.baseMapper.selectCount(queryWrapperRZ); //如果两个工程师都是这个用户 - if(lawsInventoryCountFG > 0 && lawsInventoryCountRZ > 0){ + if (lawsInventoryCountFG > 0 && lawsInventoryCountRZ > 0) { result = Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue()); - }else if(lawsInventoryCountFG > 0){ + } else if (lawsInventoryCountFG > 0) { result = Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - }else if(lawsInventoryCountRZ > 0){ + } else if (lawsInventoryCountRZ > 0) { result = Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); } } } - }catch (Exception ex){ + } catch (Exception ex) { log.error("验证用户在该项目中的角色失败：" + ex.getMessage()); throw new JeroBootException("验证用户在该项目中的角色失败！"); } @@ -2497,6 +2511,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); - projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); - projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper); //项目名称 String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion(); String projectName = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" + projectLibraryBase.getTargetMarket() + "-" + projectVersion; //TODO 切换成枚举，不要在代码里出现魔数 - if(StringUtils.equals(operatorType, OperatorTypeEnum.INVENTORY_AFFIRM.getValue())){ + if (StringUtils.equals(operatorType, OperatorTypeEnum.INVENTORY_AFFIRM.getValue())) { String ids = json.getString("ids"); //验证用户是否是该项目的studio - isStudio(projectLibraryId,cut); + isStudio(projectLibraryId, cut); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //清单确认截止时间 String inventoryAffirmDueDate = json.getString("inventoryAffirmDueDate"); @@ -2548,39 +2563,39 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if(StringUtils.isNotEmpty(ids)){ + if (StringUtils.isNotEmpty(ids)) { queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); } - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); List projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); List userIdList = new ArrayList<>(); List processInfoDetailEOList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { //未发起或拒绝 可以发起清单确认 - boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.NOT_STARTED.getValue()) - ||StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(),InventoryAffirmStatusEnum.REJECTED.getValue())); + boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(), InventoryAffirmStatusEnum.NOT_STARTED.getValue()) + || StringUtils.equals(projectLawsInventoryEO.getInventoryAffirmStatus(), InventoryAffirmStatusEnum.REJECTED.getValue())); //如果该数据的法规工程师、认证工程师都不为空 boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())); - if(checkStatus && checkUser){ + if (checkStatus && checkUser) { projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); projectLawsInventoryEO.setInventoryAffirmDueDate(sdf.parse(inventoryAffirmDueDate)); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProjectLawsInventoryEO::getId,projectLawsInventoryEO.getId()); + updateWrapper.eq(ProjectLawsInventoryEO::getId, projectLawsInventoryEO.getId()); //认证工程师标识 如果认证工程师提交状态为空， 或认证工程师拒绝过，给认证工程师任务，让他处理 boolean homologationEngineerFlag = ( StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus()) - || StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),"1") + || StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(), "1") ); //法规工程师标识 如果法规工程师提交状态为空， 或法规工程师拒绝过，给法规工程师任务，让他处理 boolean regulationOwnerFlag = ( StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus()) - || StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(),"1") + || StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(), "1") ); - if(homologationEngineerFlag){ - updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null); + if (homologationEngineerFlag) { + updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null); userIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); @@ -2594,8 +2609,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = sysUserService.listByIds(userIdList); List thirdIdList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(sysUsers)){ + if (CollectionUtils.isNotEmpty(sysUsers)) { thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); } //消息内容 @@ -2669,7 +2684,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryMap = null; + if (CollectionUtils.isNotEmpty(lawsInventoryList)) { + Map lawsInventoryMap = null; for (Object lawsInventory : lawsInventoryList) { - lawsInventoryMap = JSONObject.parseObject(JSONObject.toJSONString(lawsInventory),Map.class); + lawsInventoryMap = JSONObject.parseObject(JSONObject.toJSONString(lawsInventory), Map.class); int isProjectRole = (int) lawsInventoryMap.get("roleCode"); String id = (String) lawsInventoryMap.get("id"); @@ -2767,27 +2782,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = sysUserService.listByIds(userIdList); List thirdIdList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(sysUsers)){ + if (CollectionUtils.isNotEmpty(sysUsers)) { thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); } //sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername()); @@ -2855,16 +2870,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = sysUserService.listByIds(userIdList); List thirdIdList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(sysUsers)){ + if (CollectionUtils.isNotEmpty(sysUsers)) { thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); } //sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.LIST_CONFIRMATION,studioUserInfo.getUsername()); @@ -2920,12 +2935,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().success(result + "成功！"); } /** * 发送消息 + * * @param msgContent * @param userIdList * @param projectLibraryId */ @Override - public void sendMessage(String msgTitle, String msgContent, List userIdList,String projectLibraryId,Map sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType,String initiator){ + public void sendMessage(String msgTitle, String msgContent, List userIdList, String projectLibraryId, Map sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType, String initiator) { String idTemp = projectLibraryId; List sysUsers = sysUserService.listByIds(userIdList); List thirdIdList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(sysUsers)){ + if (CollectionUtils.isNotEmpty(sysUsers)) { thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); } // //飞书跳转链接 @@ -3023,13 +3039,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType,String initiator) { + private SysAnnouncement getSysAnnouncement(List userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType, String initiator) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setInitiator(initiator); sysAnnouncement.setDelFlag("0"); @@ -3068,6 +3084,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryProjectPerson = new QueryWrapper<>(); - queryProjectPerson.lambda().eq(ProjectRelatedPersonnel::getProjectId,projectLibraryId); + queryProjectPerson.lambda().eq(ProjectRelatedPersonnel::getProjectId, projectLibraryId); List projectRelatedPersonnels = this.projectRelatedPersonnelMapper.selectList(queryProjectPerson); - if(CollectionUtils.isNotEmpty(projectRelatedPersonnels)){ + if (CollectionUtils.isNotEmpty(projectRelatedPersonnels)) { QueryWrapper queryWrapper = new QueryWrapper<>(); /*List inventoryAffirmStatusList = new ArrayList<>(); inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); @@ -3092,20 +3109,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryIdList = Arrays.asList(ids.split(",")); - queryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, projectLawsInventoryIdList); } - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); //查询当前项目下，清单状态为 未发起、拒绝状态的法规清单。 List projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); //项目库信息(获取studio) LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ProjectLibraryBase::getId,projectLibraryId); + wrapper.in(ProjectLibraryBase::getId, projectLibraryId); List projectLibraryBases = projectLibraryBaseMapper.selectList(wrapper); String studioEngineer = ""; - if(projectLibraryBases.size() != 0){ + if (projectLibraryBases.size() != 0) { studioEngineer = projectLibraryBases.get(0).getStudioEngineer(); } @@ -3191,99 +3208,99 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> { boolean flag = false; for (String duty : dutyTerritory.split(",")) { - if(StringUtils.equals(duty,relatedPersonnel.getDutyTerritory())){ + if (StringUtils.equals(duty, relatedPersonnel.getDutyTerritory())) { flag = true; } } return flag; }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(projectRelatedPersonnelTempList)){ + if (CollectionUtils.isNotEmpty(projectRelatedPersonnelTempList)) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); //法规工程师 if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) { - String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer); - if(StringUtils.isNotEmpty(userId)){ + String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setRegulationOwnerId(userId); } - }else { - String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getRegulationOwnerId()); - if(StringUtils.isNotEmpty(userId)){ + } else { + String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getRegulationOwnerId()); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setRegulationOwnerId(userId); - }else { - updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerId,null); + } else { + updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerId, null); } } //认证工程师 if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) { - String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer); - if(StringUtils.isNotEmpty(userId)){ + String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setHomologationEngineerId(userId); } - }else { - String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getHomologationEngineerId()); - if(StringUtils.isNotEmpty(userId)){ + } else { + String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getHomologationEngineerId()); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setHomologationEngineerId(userId); - }else { - updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerId,null); + } else { + updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerId, null); } } //项目接口人 if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) { - String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList,studioEngineer); - if(StringUtils.isNotEmpty(userId)){ + String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList, studioEngineer); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setEngineeringInterfacePerson(userId); } - }else { - String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getEngineeringInterfacePerson()); - if(StringUtils.isNotEmpty(userId)){ + } else { + String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getEngineeringInterfacePerson()); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setEngineeringInterfacePerson(userId); - }else { - updateWrapper.set(ProjectLawsInventoryEO::getEngineeringInterfacePerson,null); + } else { + updateWrapper.set(ProjectLawsInventoryEO::getEngineeringInterfacePerson, null); } } //设计符合性确认 //发起人角色 String designInitiator = projectLawsInventoryEO.getDesignInitiator(); - if(StringUtils.isNotEmpty(designInitiator)){ - if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())){ - String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList,studioEngineer); - if(StringUtils.isNotEmpty(userId)){ + if (StringUtils.isNotEmpty(designInitiator)) { + if (StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())) { + String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList, studioEngineer); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setDesignInitiatorId(userId); } - }else { - String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getDesignInitiatorId()); - if(StringUtils.isNotEmpty(userId)){ + } else { + String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getDesignInitiatorId()); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setDesignInitiatorId(userId); - }else { - updateWrapper.set(ProjectLawsInventoryEO::getDesignInitiatorId,null); + } else { + updateWrapper.set(ProjectLawsInventoryEO::getDesignInitiatorId, null); } } } //责任人角色 String designDuty = projectLawsInventoryEO.getDesignDuty(); - if(StringUtils.isNotEmpty(designDuty)){ - if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())){ - String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList,studioEngineer); - if(StringUtils.isNotEmpty(userId)){ + if (StringUtils.isNotEmpty(designDuty)) { + if (StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())) { + String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList, studioEngineer); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setDesignDutyId(userId); } - }else { - String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getDesignDutyId()); - if(StringUtils.isNotEmpty(userId)){ + } else { + String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getDesignDutyId()); + if (StringUtils.isNotEmpty(userId)) { projectLawsInventoryEO.setDesignDutyId(userId); - }else { - updateWrapper.set(ProjectLawsInventoryEO::getDesignDutyId,null); + } else { + updateWrapper.set(ProjectLawsInventoryEO::getDesignDutyId, null); } } } @@ -3292,36 +3309,36 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().success("带入成功！"); } /** * 获取一个用户的id + * * @param roleCode * @param projectRelatedPersonnelList * @return */ - public String ToGetAUserId(String roleCode,List projectRelatedPersonnelList,String studioEngineer){ + public String ToGetAUserId(String roleCode, List projectRelatedPersonnelList, String studioEngineer) { String resultUserId = ""; //法规工程师 - if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> { boolean flag = false; - if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){ + if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) { flag = true; } return flag; }).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(",")); - if(StringUtils.isNotEmpty(lawEngineer)){ + if (StringUtils.isNotEmpty(lawEngineer)) { String[] lawEngineerArr = lawEngineer.split(","); - if(lawEngineerArr.length == 1){ + if (lawEngineerArr.length == 1) { resultUserId = lawEngineer; } } } //认证工程师 - if(StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> { boolean flag = false; - if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){ + if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) { flag = true; } return flag; }).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(",")); - if(StringUtils.isNotEmpty(certificationEngineer)){ + if (StringUtils.isNotEmpty(certificationEngineer)) { String[] certificationEngineerArr = certificationEngineer.split(","); - if(certificationEngineerArr.length == 1){ + if (certificationEngineerArr.length == 1) { resultUserId = certificationEngineer; } } } //工程接口人 - if(StringUtils.equals(roleCode,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())) { String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> { boolean flag = false; - if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){ + if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) { flag = true; } return flag; }).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(",")); - if(StringUtils.isNotEmpty(engineeringInterfacePerson)){ + if (StringUtils.isNotEmpty(engineeringInterfacePerson)) { String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(","); - if(engineeringInterfacePersonArr.length == 1){ + if (engineeringInterfacePersonArr.length == 1) { resultUserId = engineeringInterfacePerson; } } } //studio - if(StringUtils.equals(roleCode,ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { resultUserId = studioEngineer; } return resultUserId; @@ -3451,90 +3469,91 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processCall(JSONObject jsonObject) { String requestSource = jsonObject.getString("requestSource"); - if(StringUtils.isEmpty(requestSource)){ + if (StringUtils.isEmpty(requestSource)) { throw new JeroBootException("请求来源不能为空！"); } - if(!StringUtils.equals(requestSource,RequestSourceEnum.WORK_FLOW.getValue())){ + if (!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())) { throw new JeroBootException("来源有误，没有权限调用该接口！"); } String operatorType = jsonObject.getString("operatorType"); - if(StringUtils.isEmpty(operatorType)){ + if (StringUtils.isEmpty(operatorType)) { throw new JeroBootException("操作类型不能为空！"); } - if(StringUtils.equals(operatorType,OperatorTypeEnum.UPDATE_STATUS.getValue())){ + if (StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_STATUS.getValue())) { ProjectLawsInventoryEO projectLawsInventoryEO = JSONObject.parseObject(jsonObject.toString(), ProjectLawsInventoryEO.class); this.baseMapper.updateById(projectLawsInventoryEO); } - if(StringUtils.equals(operatorType,OperatorTypeEnum.ADD.getValue())){ + if (StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())) { } - if(StringUtils.equals(operatorType,OperatorTypeEnum.DELETE.getValue())){ + if (StringUtils.equals(operatorType, OperatorTypeEnum.DELETE.getValue())) { } - if(StringUtils.equals(operatorType,OperatorTypeEnum.QUERY.getValue())){ + if (StringUtils.equals(operatorType, OperatorTypeEnum.QUERY.getValue())) { Result objectResult = new Result<>(); try { String projectLawsInventoryId = jsonObject.getString("projectLawsInventoryId"); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,projectLawsInventoryId); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, projectLawsInventoryId); ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(queryWrapper); objectResult.setResult(projectLawsInventoryEO); objectResult.setSuccess(true); - }catch (Exception ex){ + } catch (Exception ex) { objectResult.setSuccess(false); ex.printStackTrace(); log.error("工作流后端查询法规清单失败：" + ex.getMessage()); } return objectResult; } - if(StringUtils.equals(operatorType,OperatorTypeEnum.SEND_MSG.getValue())){ + if (StringUtils.equals(operatorType, OperatorTypeEnum.SEND_MSG.getValue())) { // workFlowSendMsg(jsonObject); - Map prarams = (Map) jsonObject.get("params"); + Map prarams = (Map) jsonObject.get("params"); String templateId = jsonObject.getString("templateId"); String projectLibraryId = (String) prarams.get("projectLibraryId"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - prarams.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - prarams.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + prarams.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + prarams.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); String projectLawsInventoryId = (String) prarams.get("id"); ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId); String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - prarams.put("Initiator",regulationOwnerUserName); + prarams.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(templateId,prarams); + this.sendMessageByTemplateId(templateId, prarams); } } // 将法规工程师的 法规清单确认待办中心任务转为已办 - if(StringUtils.equals(operatorType,OperatorTypeEnum.TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE.getValue())){ + if (StringUtils.equals(operatorType, OperatorTypeEnum.TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE.getValue())) { String projectLawsInventoryId = jsonObject.getString("id"); ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId); - if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - ||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){ + if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) + || StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { // 如果该条法规清单的设计、验证符合性流程都发起了，将法规工程师在待办中心的待办任务转为已办 LambdaUpdateWrapper pidUpdateWrap = new LambdaUpdateWrapper<>(); - pidUpdateWrap.eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue()); - pidUpdateWrap.eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryId); - pidUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue()); + pidUpdateWrap.eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.QDQR.getValue()); + pidUpdateWrap.eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryId); + pidUpdateWrap.set(ProcessInfoDetailEO::getStatus, TaskStatusEnum.HAVE_DONE.getValue()); this.processInfoDetailEOService.update(pidUpdateWrap); } } @@ -3546,7 +3565,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryProjectLawsInventoryInfoById(Map params) { String id = (String) params.get("id"); - if(StringUtils.isEmpty(id)){ + if (StringUtils.isEmpty(id)) { throw new JeroBootException("id不能为空"); } String cut = (String) params.get("cut"); @@ -3556,10 +3575,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList = new ArrayList<>(); ProjectLawsInventoryEO byId = getById(id); projectLawsInventoryEOList.add(byId); - if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + if (CollectionUtils.isNotEmpty(projectLawsInventoryEOList)) { int isProjectRole = checkUserRole(byId.getProjectLibraryId(), currentUser.getId(), id); - dataDispose(projectLawsInventoryEOList,currentUser,isProjectRole,cut); - dataDictDispose(projectLawsInventoryEOList,cut); + dataDispose(projectLawsInventoryEOList, currentUser, isProjectRole, cut); + dataDictDispose(projectLawsInventoryEOList, cut); //result.put("projectLawsInventory",projectLawsInventoryEOList.get(0)); /*if (StringUtils.equals(operatorType, OperatorTypeEnum.TASK_AFFIRM_QUERY.getValue())) { @@ -3588,7 +3607,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); - projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); - projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper); SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); @@ -3710,12 +3730,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) // ); // initiatorLark = initiatorLarkInfo.getUsername(); - } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ + } else if (StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())) { String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); //msgContentEN = sysUser.getUsername() + " has submitted the Pre-Homo confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() @@ -3966,25 +3986,25 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) // ); // initiatorLark = initiatorLarkInfo.getUsername(); - } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ + } else if (StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())) { String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); //msgContentEN = sysUser.getUsername() + " has submitted the validation compliance confirmation " + serialNumber +" in "+ projectNameInfoEO.getProjectName() @@ -3999,25 +4019,25 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) // ); // initiatorLark = initiatorLarkInfo.getUsername(); - }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ + } else if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())) { String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); //msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() @@ -4040,16 +4060,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + " View details" + ""; - }else if(StringUtils.equals(msgType,MsgTypeEnum.DESIGN_START_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_START_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_START_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue()) - ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) - { + } else if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) { hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() @@ -4168,7 +4186,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = sysUserService.listByIds(userIdList); List thirdIdList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(sysUsers)){ + if (CollectionUtils.isNotEmpty(sysUsers)) { thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); } try { @@ -4188,10 +4206,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(","))); + wrapper.in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); List projectLawsInventoryEOList = this.list(wrapper); List projectTaskInventoryEOList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { @@ -4212,10 +4230,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 对应现在的 任务待发起 - if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_STUDIO_COPY.getValue())){ + if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_STUDIO_COPY.getValue())) { projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); - }else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_REGULATION_OWNER_COPY.getValue())){ + } else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_REGULATION_OWNER_COPY.getValue())) { projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); } @@ -4235,11 +4253,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"复制了“"+serialNumber+"”"; - String enContentLog = username+" copied “"+serialNumber+"”"; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); + String serialNumber = projectLawsInventoryEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username + "复制了“" + serialNumber + "”"; + String enContentLog = username + " copied “" + serialNumber + "”"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue()); this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); projectTaskInventoryEOList.forEach(taskInventory -> { this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); @@ -4257,7 +4275,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(projectLawsInventoryEO.getIds().split(",")); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -4271,99 +4289,99 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryList = new ArrayList<>(); //获取批量设置中责任领域 String dutyTerritory = projectLawsInventoryEOList.get(0).getDutyTerritory(); - if(!StringUtils.isEmpty(dutyTerritory)){ - for(ProjectLawsInventoryEO info : infoList) { + if (!StringUtils.isEmpty(dutyTerritory)) { + for (ProjectLawsInventoryEO info : infoList) { info.setDutyTerritory(dutyTerritory); } } - if(!StringUtils.isEmpty(DesdutyId)){ - for(ProjectLawsInventoryEO info : infoList) { + if (!StringUtils.isEmpty(DesdutyId)) { + for (ProjectLawsInventoryEO info : infoList) { info.setDesignDutyId(DesdutyId); } } - if(!StringUtils.isEmpty(VerdutyId)){ - for(ProjectLawsInventoryEO info : infoList) { + if (!StringUtils.isEmpty(VerdutyId)) { + for (ProjectLawsInventoryEO info : infoList) { info.setVerifyDutyId(VerdutyId); } } - if(!StringUtils.isEmpty(dutyTerritory)){ + if (!StringUtils.isEmpty(dutyTerritory)) { dutyTerritoryList = Arrays.asList(dutyTerritory.split(",")); dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList()); - }else { - for(ProjectLawsInventoryEO info : infoList) { + } else { + for (ProjectLawsInventoryEO info : infoList) { List dutyList = new ArrayList<>(); dutyList = Arrays.asList(info.getDutyTerritory().split(",")); dutyTerritoryList.addAll(dutyList); @@ -4413,10 +4431,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("projectLibraryId",projectLibrartId); - params.put("userId",currentUser.getId()); - params.put("modelType",RoleRelModelTypeEnum.LAWS_INVENTORY.getValue()); + Map params = new HashMap<>(); + params.put("projectLibraryId", projectLibrartId); + params.put("userId", currentUser.getId()); + params.put("modelType", RoleRelModelTypeEnum.LAWS_INVENTORY.getValue()); ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params); String roleCode1 = projectLibraryRoleRelEO.getRoleCode(); @@ -4425,7 +4443,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = new ArrayList<>(); - for(ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList){ + for (ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList) { //分别获取当前编辑中的设计符合性和认证符合性责任人 List designDutyIdList = new ArrayList<>(); @@ -4445,33 +4463,33 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl enginnerLawSetList = new ArrayList<>(); List enginnerAttSetList = new ArrayList<>(); //根据相关人员名单获取的工程接口人 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson(); - if(!StringUtils.isEmpty(enginneringInterfacePerson)){ + if (!StringUtils.isEmpty(enginneringInterfacePerson)) { enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList()); allList.addAll(enginnerList); } } //获取相关人员名单中的法规工程师 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String lawEngineer = relatedPersonnel.getLawEngineer(); - if(!StringUtils.isEmpty(lawEngineer)){ + if (!StringUtils.isEmpty(lawEngineer)) { lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList()); allList.addAll(lawEnginnerList); } } //获取相关人员名单中的工程接口-法规工程师设置 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String engineerLawSet = relatedPersonnel.getEngineerLawSet(); - if(!StringUtils.isEmpty(engineerLawSet)){ + if (!StringUtils.isEmpty(engineerLawSet)) { enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList()); allList.addAll(enginnerLawSetList); } } //获取相关人员名单中的工程接口-认证工程师设置 - for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { String engineerAttSet = relatedPersonnel.getEngineerAttSet(); - if(!StringUtils.isEmpty(engineerAttSet)){ + if (!StringUtils.isEmpty(engineerAttSet)) { enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList()); allList.addAll(enginnerAttSetList); } @@ -4480,11 +4498,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl studionList = new ArrayList<>(); List certificationEngineerList = new ArrayList<>(); List projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut); - for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){ + for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) { studionList.add(projectLibraryBase.getStudioEngineer()); String certificationEngineer = projectLibraryBase.getCertificationEngineer(); - if(!StringUtils.isEmpty(certificationEngineer)){ + if (!StringUtils.isEmpty(certificationEngineer)) { certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList()); allList.addAll(certificationEngineerList); } @@ -4501,31 +4519,31 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl0){ - for(String allDuty : allDutyList){ + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { + if (allList.size() > 0) { + for (String allDuty : allDutyList) { String dutyPerson = allDuty; - if(!StringUtils.isEmpty(dutyPerson)){ - if(!allList.contains(dutyPerson)){ - if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineeringInterfacePerson() != null){ - String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson(); + if (!StringUtils.isEmpty(dutyPerson)) { + if (!allList.contains(dutyPerson)) { + if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineeringInterfacePerson() != null) { + String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); - }else { + } else { relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); } - }else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerLawSet() != null){ - String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet(); + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerLawSet() != null) { + String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); relatedPersonnel.setEngineerLawSet(engineerLawSet); - }else { + } else { relatedPersonnel.setEngineerLawSet(dutyPerson); } - }else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerAttSet() !=null){ - String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet(); + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerAttSet() != null) { + String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); relatedPersonnel.setEngineerAttSet(engineerAttSet); - }else { + } else { relatedPersonnel.setEngineerAttSet(dutyPerson); } } @@ -4556,8 +4574,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoListCopy = DeepCopyListUtil.depCopy(infoList); @@ -4567,7 +4585,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl inputList = new ArrayList<>(); ProjectLawsInventoryEO projectLawsInventoryEONew = new ProjectLawsInventoryEO(); - BeanUtils.copyProperties(projectLawsInventoryEO,projectLawsInventoryEONew); + BeanUtils.copyProperties(projectLawsInventoryEO, projectLawsInventoryEONew); inputList.add(projectLawsInventoryEONew); translateData(inputList); ProjectLawsInventoryEO inputInfoEO = inputList.get(0); @@ -4575,7 +4593,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { ProjectLawsInventoryEO info = collect.get(0); ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); StringBuilder contentLogBuilder = new StringBuilder(); @@ -4585,39 +4603,39 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"); + public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder, String fieldName, String oldValue, String newValue) { + return contentLogBuilder.append("\'" + fieldName + "\'由" + oldValue + "改为了" + newValue).append("
"); } - public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ - return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append("
"); + + public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder, String fieldName, String oldValue, String newValue) { + return contentLogBuilder.append("\'" + fieldName + "\' changed from " + oldValue + " to " + newValue).append("
"); } + private void translateData(List infoList) { for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) { //子标题 @@ -4743,19 +4763,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableTypeSet = new HashSet<>(); - List designDeliverableTypeIdList= new ArrayList<>(); + List designDeliverableTypeIdList = new ArrayList<>(); List prehomoDeliverableTypeIdList = new ArrayList<>(); List verifyDeliverableTypeIdList = new ArrayList<>(); if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { @@ -4844,7 +4864,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); if (designList.size() != 0) { designBuilder.append(designList.get(0).getName() + ","); @@ -4861,15 +4881,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); if (prehomoList.size() != 0) { prehomoBuilder.append(prehomoList.get(0).getName() + ","); } } String prehomoName = null; - if (StringUtils.isNotBlank(prehomoBuilder )) { - prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + if (StringUtils.isNotBlank(prehomoBuilder)) { + prehomoName = prehomoBuilder.substring(0, prehomoBuilder.length() - 1); } projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoName); @@ -4879,7 +4899,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); if (verifyList.size() != 0) { @@ -4896,7 +4916,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList= new ArrayList<>(); + List userIdList = new ArrayList<>(); //法规工程师 if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { userIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); @@ -4907,60 +4927,60 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userqueryWrapper = new QueryWrapper<>(); List userList = sysUserService.list(userqueryWrapper.in("id ", userIdList)); //法规工程师 if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setRegulationOwnerName(userName); } @@ -4969,7 +4989,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setHomologationEngineerName(userName); } @@ -4978,7 +4998,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); } @@ -4988,21 +5008,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setDesignInitiatorName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setPrehomoInitiatorName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setVerifyInitiatorName(userName); } @@ -5011,21 +5031,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setDesignDutyIdName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setPrehomoDutyName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setVerifyDutyIdName(userName); } @@ -5036,26 +5056,26 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); //设计符合性确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); - }else { + } else { projectLawsInventoryEO.setDesignDeliverableTemplateName("空"); } // Prehomo确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); - }else { + } else { projectLawsInventoryEO.setPrehomoDeliverableTemplateName("空"); } // 验证符合性确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); - }else { + } else { projectLawsInventoryEO.setVerifyDeliverableTemplateName("空"); } List fileInfos = new ArrayList<>(); - if(deliverableList.size() != 0){ + if (deliverableList.size() != 0) { fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); } //交付物类型模板 - if(fileInfos.size() != 0){ - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ - String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate()); - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + if (fileInfos.size() != 0) { + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { + String fileName = getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); } } - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ - String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate()); - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) { + String fileName = getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getPrehomoDeliverableTemplate()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName); } } - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ - String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate()); - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) { + String fileName = getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getVerifyDeliverableTemplate()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName); } @@ -5135,19 +5155,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableTypeSet = new HashSet<>(); - List designDeliverableTypeIdList= new ArrayList<>(); + List designDeliverableTypeIdList = new ArrayList<>(); List prehomoDeliverableTypeIdList = new ArrayList<>(); List verifyDeliverableTypeIdList = new ArrayList<>(); if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { @@ -5238,7 +5258,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); if (designList.size() != 0) { designBuilder.append(designList.get(0).getEnName() + ","); @@ -5255,15 +5275,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); if (prehomoList.size() != 0) { prehomoBuilder.append(prehomoList.get(0).getEnName() + ","); } } String prehomoEnName = null; - if (StringUtils.isNotBlank(prehomoBuilder )) { - prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + if (StringUtils.isNotBlank(prehomoBuilder)) { + prehomoEnName = prehomoBuilder.substring(0, prehomoBuilder.length() - 1); } projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoEnName); } else { @@ -5272,7 +5292,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); if (verifyList.size() != 0) { @@ -5289,7 +5309,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList= new ArrayList<>(); + List userIdList = new ArrayList<>(); //法规工程师 if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { userIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); @@ -5300,60 +5320,60 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userqueryWrapper = new QueryWrapper<>(); List userList = sysUserService.list(userqueryWrapper.in("id ", userIdList)); //法规工程师 if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setRegulationOwnerName(userName); } @@ -5362,7 +5382,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setHomologationEngineerName(userName); } @@ -5371,7 +5391,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); } @@ -5381,21 +5401,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setDesignInitiatorName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setPrehomoInitiatorName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setVerifyInitiatorName(userName); } @@ -5404,21 +5424,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setDesignDutyIdName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setPrehomoDutyName(userName); } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { String userName = collect.get(0); projectLawsInventoryEO.setVerifyDutyIdName(userName); } @@ -5429,64 +5449,64 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); //设计符合性确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); } // Prehomo确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); } // 验证符合性确认交付物模板 - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) { deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); } List fileInfos = new ArrayList<>(); - if(deliverableList.size() != 0){ + if (deliverableList.size() != 0) { fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); } //交付物类型模板 - if(fileInfos.size() != 0){ - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ - String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate()); - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + if (fileInfos.size() != 0) { + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { + String fileName = getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); } } - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ - String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate()); - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) { + String fileName = getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getPrehomoDeliverableTemplate()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName); } } - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ - String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate()); - if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) { + String fileName = getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getVerifyDeliverableTemplate()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName); } @@ -5495,107 +5515,107 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(titleOne.split(",")); int index = 0; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { index = list.indexOf("备注") + 1; - }else{ + } else { index = list.indexOf("Comments") + 1; } @@ -5673,10 +5693,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 1){ + if (count > 1) { startLine = startLine + line + 1; endLine = startLine + line; - }else{ + } else { startLine = i; endLine = i + line; } @@ -5684,24 +5704,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,request.getParameterMap()); - queryWrapper.in("project_library_id",projectLawsInventoryEO.getProjectLibraryId()); - if(StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){ - queryWrapper.in("id",Arrays.asList(projectLawsInventoryEO.getIds().split(","))); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, request.getParameterMap()); + queryWrapper.in("project_library_id", projectLawsInventoryEO.getProjectLibraryId()); + if (StringUtils.isNotBlank(projectLawsInventoryEO.getIds())) { + queryWrapper.in("id", Arrays.asList(projectLawsInventoryEO.getIds().split(","))); } - queryWrapper.orderByDesc("create_time","serial_number"); + queryWrapper.orderByDesc("create_time", "serial_number"); int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode()); - if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()) + if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()) && isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue()) - && isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())){ + && isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) { LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.and(q ->{ - q.eq("regulation_owner_id",currentUser.getId()). - or().eq("homologation_engineer_id",currentUser.getId()); + queryWrapper.and(q -> { + q.eq("regulation_owner_id", currentUser.getId()). + or().eq("homologation_engineer_id", currentUser.getId()); }); } //导出的数据 @@ -5787,21 +5807,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUserList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(userIdList)){ + if (CollectionUtils.isNotEmpty(userIdList)) { userIdList = userIdList.stream().distinct().collect(Collectors.toList()); QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); sysUserQueryWrapper.select("id,username"); - sysUserQueryWrapper.lambda().in(SysUser::getId,userIdList); + sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList); sysUserList = sysUserMapper.selectList(sysUserQueryWrapper); } //所有用户 // List sysUserList = sysUserService.list(); //数据转换(文件名称,对应标准) - dataTransition(dataList, fileInfos,sysUserList,projectLawsInventoryEO); + dataTransition(dataList, fileInfos, sysUserList, projectLawsInventoryEO); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - this.dataDispose(dataList,currentUser,Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()),projectLawsInventoryEO.getCut()); + this.dataDispose(dataList, currentUser, Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()), projectLawsInventoryEO.getCut()); OutputStream os = null; try { response.setContentType("application/force-download"); @@ -5813,8 +5833,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataListEn = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEOTemp : dataList) { ProjectLawsInventoryEOEn ProjectLawsInventoryEOEn = new ProjectLawsInventoryEOEn(); - BeanUtils.copyProperties(projectLawsInventoryEOTemp,ProjectLawsInventoryEOEn); + BeanUtils.copyProperties(projectLawsInventoryEOTemp, ProjectLawsInventoryEOEn); dataListEn.add(ProjectLawsInventoryEOEn); } //下拉选中英文转换 - transition(dataListEn,projectLawsInventoryEO); + transition(dataListEn, projectLawsInventoryEO); workbook = ExcelExportUtil.exportExcel(exportParams, ProjectLawsInventoryEOEn.class, dataListEn); } @@ -5854,9 +5874,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataListEn,ProjectLawsInventoryEO projectLawsInventoryEOTemp){ + private void transition(List dataListEn, ProjectLawsInventoryEO projectLawsInventoryEOTemp) { //下拉选数据字典 List sysCategoryList = sysCategoryService.list(); @@ -5922,25 +5942,25 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysDictItems, String field,String dictCode) { - if(StringUtils.isBlank(field)){ + private String pull(List sysDictItems, String field, String dictCode) { + if (StringUtils.isBlank(field)) { return null; } StringBuilder sb = new StringBuilder(); for (String s : field.split(",")) { List collect = sysDictItems.stream().filter(e -> dictCode.equals(e.getDictCode()) && s.equals(e.getItemValue())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { sb.append(collect.get(0).getEnName() + ","); } } - if(StringUtils.isNotBlank(sb)){ + if (StringUtils.isNotBlank(sb)) { String substring = sb.substring(0, sb.length() - 1); return substring; } @@ -6065,9 +6085,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 2) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); - }else{ + } else { throw new JeroBootException("There must be only one folder in the compressed package Please upload it again"); } @@ -6108,18 +6128,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); - }else{ + } else { throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again"); } @@ -6132,18 +6152,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { throw new JeroBootException("压缩包内有多个Excel数据源"); - }else{ + } else { throw new JeroBootException("There are multiple Excel data sources in the zip package"); } @@ -6162,9 +6182,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 18){ + } else if (i == 1) { + if (j > 18) { String flag = ""; - if(18 < j && j < 25){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - flag ="设计"; - }else{ - flag ="design "; + if (18 < j && j < 25) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + flag = "设计"; + } else { + flag = "design "; } key = flag + headerCell.getStringCellValue(); } - if(24 < j && j < 31){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - flag ="pre"; - }else{ - flag ="pre "; + if (24 < j && j < 31) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + flag = "pre"; + } else { + flag = "pre "; } key = flag + headerCell.getStringCellValue(); } - if(30 < j && j < 37){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - flag ="验证"; - }else{ - flag ="verify "; + if (30 < j && j < 37) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + flag = "验证"; + } else { + flag = "verify "; } key = flag + headerCell.getStringCellValue(); } headerSb.append(key + ","); } - } else if(i > 1){ + } else if (i > 1) { List headList = Arrays.asList(headerSb.toString().split(",")); - String field =""; + String field = ""; if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { Date d = cell.getDateCellValue(); field = fieldConvert(headList.get(j)); @@ -6256,15 +6276,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 9){ + } else if (i == 1) { + if (j > 9) { String flag = ""; - if(9 < j && j < 15){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - flag ="设计"; - }else{ - flag ="design "; + if (9 < j && j < 15) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + flag = "设计"; + } else { + flag = "design "; } key = flag + headerCell.getStringCellValue(); } @@ -6310,19 +6330,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 2){ + } else if (i > 2) { List headList = Arrays.asList(headerSb.toString().split(",")); - String field =""; + String field = ""; if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) { Date d = cell.getDateCellValue(); field = fieldConvert(headList.get(j)); @@ -6352,13 +6372,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl stringStringMap : dataList) { ProjectLawsInventoryEO projectLawsInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectLawsInventoryEO.class); @@ -6373,7 +6393,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); //普通数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO,categoryList,dataSource); + importDatas(datas, dictItemList, zipEntryName, saveDirectory, projectLawsInventoryEO, categoryList, dataSource); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -6649,11 +6669,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl change(JSONObject parmas) { String ids = parmas.getString("ids"); String projectLibraryId = parmas.getString("projectLibraryId"); - if(StringUtils.isNotEmpty(ids)){ + if (StringUtils.isNotEmpty(ids)) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); List projectLawsInventoryEOS = this.list(queryWrapper); List idList = Arrays.asList(ids.split(",")); @@ -6665,22 +6685,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(ProjectLawsInventoryEO::getId,idList); - updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null); - updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null); - updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag,null); - updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag,null); + updateWrapper.in(ProjectLawsInventoryEO::getId, idList); + updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus, null); + updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null); + updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag, null); + updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag, null); //updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null); //updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null); //updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null); - updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate,null); - updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate,null); - updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); - updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null); + updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null); + updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); super.update(projectLawsInventoryEO, updateWrapper); QueryWrapper processInfoQueryWrap = new QueryWrapper<>(); - processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,idList); + processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, idList); List processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap); List actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> { boolean flag = false; @@ -6773,13 +6793,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList()); String serialNumbers = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); - Map paramsMsg = new HashMap<>(); - paramsMsg.put("contentCn","您好，该法规已被发起人撤回。"); - paramsMsg.put("contentEn","Hello! This regulation has been withdrawn by the initiator."); - paramsMsg.put("projectLibraryId",projectLibraryId); - paramsMsg.put("endTime",endTime); - paramsMsg.put("userIdList",userIdList); - paramsMsg.put("serialNumbers",serialNumbers); + Map paramsMsg = new HashMap<>(); + paramsMsg.put("contentCn", "您好，该法规已被发起人撤回。"); + paramsMsg.put("contentEn", "Hello! This regulation has been withdrawn by the initiator."); + paramsMsg.put("projectLibraryId", projectLibraryId); + paramsMsg.put("endTime", endTime); + paramsMsg.put("userIdList", userIdList); + paramsMsg.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName()); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + paramsMsg.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + paramsMsg.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + paramsMsg.put("Initiator", projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), paramsMsg); } } return Result.OK("变更成功！"); @@ -6828,10 +6848,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl categoryList, String dataSource) { List msgList = new ArrayList<>(); - if(DataSourceEnum.LIST_DATA.getValue().equals(dataSource)){ + if (DataSourceEnum.LIST_DATA.getValue().equals(dataSource)) { //列表数据验证 msgList = dataListVerify(dataList, dictItemList, zipEntryName, projectLawsInventoryEOTemp, categoryList, dataSource); - }else{ + } else { //模板数据验证 msgList = dataTemplateVerify(dataList, dictItemList, zipEntryName, projectLawsInventoryEOTemp, categoryList, dataSource); } @@ -6842,8 +6862,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; } FileUnZip.deleteDir(saveDirectory); - if(StringUtils.isNotBlank(html)){ - html = html.substring(0,html.length()-7); + if (StringUtils.isNotBlank(html)) { + html = html.substring(0, html.length() - 7); } throw new JeroBootException(html); } else { @@ -6867,28 +6887,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); + String serialNumber = dataList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(",")); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String username = sysUser.getUsername(); - String contentLog = username+"向清单中导入了“"+serialNumber+"”"; - String enContentLog = username+" imported “"+serialNumber+"” into the list."; - projectLawsInventoryLogEOService.updateLog(contentLog, dataList.get(0).getProjectLibraryId(),CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(enContentLog, dataList.get(0).getProjectLibraryId(),CutEnum.EN.getValue()); + String contentLog = username + "向清单中导入了“" + serialNumber + "”"; + String enContentLog = username + " imported “" + serialNumber + "” into the list."; + projectLawsInventoryLogEOService.updateLog(contentLog, dataList.get(0).getProjectLibraryId(), CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, dataList.get(0).getProjectLibraryId(), CutEnum.EN.getValue()); } } } /** * 列表数据验证 + * * @param dataList * @param dictItemList * @param zipEntryName @@ -6924,17 +6945,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataListVerify(List dataList, - List dictItemList, - String zipEntryName, - ProjectLawsInventoryEO projectLawsInventoryEOTemp, - List categoryList, - String dataSource) { + List dictItemList, + String zipEntryName, + ProjectLawsInventoryEO projectLawsInventoryEOTemp, + List categoryList, + String dataSource) { String dictId = sysCategoryMapper.getDictId("deliverable_template"); List collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList()); List treeNameList = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList()); - }else{ + } else { treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList()); } int i = 2; @@ -6943,13 +6964,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ + if (StringUtils.isNotBlank(subtitle)) { + if (subtitle.length() > 300) { String message = ""; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { message = errorMsg + "子标题不能超过300个字符, "; - }else{ + } else { message = errorMsg + " Subheadings cannot be checked more than 300 characters, "; } msgList.add(message); } } //WVTA ID - if(StringUtils.isNotBlank(wvtaId)){ - if(wvtaId.length() > 100){ + if (StringUtils.isNotBlank(wvtaId)) { + if (wvtaId.length() > 100) { String message = ""; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { message = errorMsg + "WVTA ID不能超过100个字符, "; - }else{ + } else { message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; } msgList.add(message); } } //备注 remark - if(StringUtils.isNotBlank(remark)){ - if(remark.length() > 1000){ + if (StringUtils.isNotBlank(remark)) { + if (remark.length() > 1000) { String message = ""; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { message = errorMsg + "备注不能超过1000个字符, "; - }else{ + } else { message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); @@ -7087,30 +7108,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList()); List treeNameList = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList()); - }else{ + } else { treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList()); } int i = 3; @@ -7307,13 +7329,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList); //编号验证 - verifySerialNumber(dataList,projectLawsInventoryEOTemp,dataSource); + verifySerialNumber(dataList, projectLawsInventoryEOTemp, dataSource); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { i++; String errorMsg = ""; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { errorMsg = "第" + i + "行："; - }else{ + } else { errorMsg = i + " line："; } //编号 @@ -7377,36 +7399,36 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ + if (StringUtils.isNotBlank(subtitle)) { + if (subtitle.length() > 300) { String message = ""; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { message = errorMsg + "子标题不能超过300个字符, "; - }else{ + } else { message = errorMsg + " Subheadings cannot be checked more than 300 characters, "; } msgList.add(message); } } //WVTA ID - if(StringUtils.isNotBlank(wvtaId)){ - if(wvtaId.length() > 100){ + if (StringUtils.isNotBlank(wvtaId)) { + if (wvtaId.length() > 100) { String message = ""; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { message = errorMsg + "WVTA ID不能超过100个字符, "; - }else{ + } else { message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; } msgList.add(message); } } //备注 remark - if(StringUtils.isNotBlank(remark)){ - if(remark.length() > 1000){ + if (StringUtils.isNotBlank(remark)) { + if (remark.length() > 1000) { String message = ""; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { message = errorMsg + "备注不能超过1000个字符, "; - }else{ + } else { message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); @@ -7414,21 +7436,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); @@ -7457,42 +7479,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl categoryList,List nameList,ProjectLawsInventoryEO projectLawsInventoryEO, - String errorMsg, String value,List msgList, - String nameCn,String nameEn,String dictCode) { + private String tree(List categoryList, List nameList, ProjectLawsInventoryEO projectLawsInventoryEO, + String errorMsg, String value, List msgList, + String nameCn, String nameEn, String dictCode) { if (StringUtils.isNotBlank(value)) { StringBuilder sb = new StringBuilder(); for (String s : value.split(",")) { - if(!nameList.contains(s)){ - sb.append(s+","); + if (!nameList.contains(s)) { + sb.append(s + ","); } } - if(StringUtils.isNotBlank(sb)){ + if (StringUtils.isNotBlank(sb)) { String substring = sb.substring(0, sb.length() - 1); if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { errorMsg += nameCn + "中的" + substring + "与数据字典不匹配, "; @@ -7958,23 +7980,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { collect = categoryList.stream().filter(e -> s.equals(e.getName())).collect(Collectors.toList()); - if(collect.size() != 0){ - sbTemp.append(collect.get(0).getName()+","); + if (collect.size() != 0) { + sbTemp.append(collect.get(0).getName() + ","); } - }else{ + } else { collect = categoryList.stream().filter(e -> s.equals(e.getEnName())).collect(Collectors.toList()); - if(collect.size() != 0){ - sbTemp.append(collect.get(0).getEnName()+","); + if (collect.size() != 0) { + sbTemp.append(collect.get(0).getEnName() + ","); } } } - if(StringUtils.isNotBlank(sbTemp)){ + if (StringUtils.isNotBlank(sbTemp)) { String substring = sbTemp.substring(0, sbTemp.length() - 1); return substring; } @@ -8008,38 +8030,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList, ProjectLawsInventoryEO projectLawsInventoryEOTemp, - String dataSource){ + String dataSource) { //1. 验证标准号在文档库中是否存在 List serialNumberList = dataList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); + wrapper.in(BussDocumentLibraryEO::getSerialNumber, serialNumberList); List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); //文档库中可能存在重复的标准号 List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); - if(serialNumberList.size() != serialNumberListTemp.size()){ + if (serialNumberList.size() != serialNumberListTemp.size()) { //存在文档库没有的数据 List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); - if(serialNumbers.size() > 0){ - if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + if (serialNumbers.size() > 0) { + if (CutEnum.CN.getValue().equals(dataList.get(0).getCut())) { + throw new JeroBootException(StringUtils.join(serialNumbers, ",") + "文档库中不存在,不能添加"); + } else { + throw new JeroBootException(StringUtils.join(serialNumbers, ",") + " does not exist in the document library and cannot be added"); } } } //导入数据为列表导出的数据时,不需要一下验证 - if(!DataSourceEnum.LIST_DATA.getValue().equals(dataSource)){ + if (!DataSourceEnum.LIST_DATA.getValue().equals(dataSource)) { //2. 验证标准号在法规清单中是否添加过 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList).in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEOTemp.getProjectLibraryId()); + lambdaQueryWrapper.in(ProjectLawsInventoryEO::getSerialNumber, serialNumberList).in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEOTemp.getProjectLibraryId()); List projectLawsInventoryEOList = this.list(lambdaQueryWrapper); List serialNumberTempList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); - if(projectLawsInventoryEOList.size() > 0){ - if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); + if (projectLawsInventoryEOList.size() > 0) { + if (CutEnum.CN.getValue().equals(dataList.get(0).getCut())) { + throw new JeroBootException(StringUtils.join(serialNumberTempList, ",") + "已存在,不能重复添加"); + } else { + throw new JeroBootException(StringUtils.join(serialNumberTempList, ",") + " already exists and cannot be added again"); } } //3. 通过编号将导入的数据与文档库进行关联 @@ -8053,7 +8075,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = bussDocumentLibraryEOList.stream() @@ -8067,77 +8089,77 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, String regulationOwnerId, List> mapList, - String nameCn,String nameEn, + String nameCn, String nameEn, String fieldNumber) { //单选 - if(regulationOwnerId.contains(",")){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (regulationOwnerId.contains(",")) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { errorMsg += nameCn + "导入只能填写一个用户名, "; - }else{ - errorMsg += "Only one user name can be entered for"+ nameEn +"import, "; + } else { + errorMsg += "Only one user name can be entered for" + nameEn + "import, "; } msgList.add(errorMsg); } - if(mapList.size() != 0){ + if (mapList.size() != 0) { int count = 0; for (Map stringStringMap : mapList) { String name = stringStringMap.get("name"); - if(regulationOwnerId.equals(name)){ - count ++; - if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)){ + if (regulationOwnerId.equals(name)) { + count++; + if (ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setRegulationOwnerId(stringStringMap.get("value")); - }else if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setHomologationEngineerId(stringStringMap.get("value")); - }else if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setEngineeringInterfacePerson(stringStringMap.get("value")); - }else if(ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setDesignInitiatorId(stringStringMap.get("value")); - }else if(ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setDesignDutyId(stringStringMap.get("value")); - }else if(ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setPrehomoInitiatorId(stringStringMap.get("value")); - }else if(ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setPrehomoDutyId(stringStringMap.get("value")); - }else if(ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setVerifyInitiatorId(stringStringMap.get("value")); - }else if(ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setVerifyDutyId(stringStringMap.get("value")); } break; } } - if(count == 0){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配， "; - }else{ - errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list, "; + if (count == 0) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + regulationOwnerId + "与相关人员名单中责任领域下的人员不匹配， "; + } else { + errorMsg += nameEn + regulationOwnerId + "does not match a person under the Responsible Field in the relevant person list, "; } msgList.add(errorMsg); } - }else{ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配， "; - }else{ - errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list, "; + } else { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + regulationOwnerId + "与相关人员名单中责任领域下的人员不匹配， "; + } else { + errorMsg += nameEn + regulationOwnerId + "does not match a person under the Responsible Field in the relevant person list, "; } msgList.add(errorMsg); } } private boolean dateVerify(ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg, - Date field,List msgList, - String nameCn,String nameEn) { + Date field, List msgList, + String nameCn, String nameEn) { //判断格式是否正确 boolean flag = true; - if(ObjectUtils.isNotEmpty(field)){ + if (ObjectUtils.isNotEmpty(field)) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String format = sdf.format(field); if (!DateUtils.isValidDate(format)) { flag = false; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { errorMsg += nameCn + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日"; - }else{ + } else { errorMsg += nameEn + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日"; } msgList.add(errorMsg); @@ -8147,82 +8169,82 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, String serialNumber,String nameCn,String nameEn) { + List msgList, String serialNumber, String nameCn, String nameEn) { int errorCount = 0; - if(StringUtils.isBlank(serialNumber)){ - errorCount ++; - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (StringUtils.isBlank(serialNumber)) { + errorCount++; + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { errorMsg += nameCn + "为必填项,不能为空, "; - }else{ + } else { errorMsg += nameEn + "This parameter is mandatory and cannot be empty, "; } msgList.add(errorMsg); } - if(errorCount == 0){ + if (errorCount == 0) { return true; - }else{ + } else { return false; } } private String pullMore(List dictItemList, ProjectLawsInventoryEO projectLawsInventoryEO, - String errorMsg, String value,List msgList, - String nameCn,String nameEn,String dictCode) { + String errorMsg, String value, List msgList, + String nameCn, String nameEn, String dictCode) { List valueList = new ArrayList<>(); if (StringUtils.isNotBlank(value)) { List list = Arrays.asList(value.split(",")); List sysDictItemList = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && list.contains(e.getItemText())).collect(Collectors.toList()); - }else{ - sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && list.contains(e.getEnName())).collect(Collectors.toList()); + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && list.contains(e.getItemText())).collect(Collectors.toList()); + } else { + sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && list.contains(e.getEnName())).collect(Collectors.toList()); } - if(list.size() == sysDictItemList.size()){ + if (list.size() == sysDictItemList.size()) { valueList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList()); - }else{ + } else { //数据中有与数据字典不匹配的值 List finalValueList = valueList; List diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList()); if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { - errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配, "; + errorMsg += nameCn + "中的" + StringUtils.join(diffList, ",") + "与数据字典不匹配, "; } else { - errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary, "; + errorMsg += nameEn + " " + StringUtils.join(diffList, ",") + " does not match the data dictionary, "; } msgList.add(errorMsg); } } - return StringUtils.join(valueList,","); + return StringUtils.join(valueList, ","); } private String pullSingle(List dictItemList, ProjectLawsInventoryEO projectLawsInventoryEO, - String errorMsg, String value,List msgList, - String nameCn,String nameEn,String dictCode) { - if(StringUtils.isNotBlank(value)){ - if(value.contains(",")){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + String errorMsg, String value, List msgList, + String nameCn, String nameEn, String dictCode) { + if (StringUtils.isNotBlank(value)) { + if (value.contains(",")) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { errorMsg += nameCn + " 为单选项, "; - }else{ + } else { errorMsg += nameEn + " Is multiple choice, "; } msgList.add(errorMsg); - }else{ + } else { List sysDictItemList = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && value.equals(e.getItemText())).collect(Collectors.toList()); - }else{ - sysDictItemList = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && value.equals(e.getEnName())).collect(Collectors.toList()); + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && value.equals(e.getItemText())).collect(Collectors.toList()); + } else { + sysDictItemList = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && value.equals(e.getEnName())).collect(Collectors.toList()); } if (sysDictItemList.size() == 0) { - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { errorMsg += nameCn + "中的" + value + "与数据字典不匹配, "; - }else{ - errorMsg += nameEn +" "+ value + " does not match the data dictionary, "; + } else { + errorMsg += nameEn + " " + value + " does not match the data dictionary, "; } msgList.add(errorMsg); - }else{ + } else { return sysDictItemList.get(0).getItemValue(); } } @@ -8231,17 +8253,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, - String nameCn,String nameEn,String dataSource) { + String errorMsg, String designDeliverableTemplate, List msgList, + String nameCn, String nameEn, String dataSource) { String value = ""; if (StringUtils.isNotBlank(designDeliverableTemplate)) { StringBuilder sb = new StringBuilder(); for (String fileName : designDeliverableTemplate.split(",")) { List nowFileList = new ArrayList<>(); - if(DataSourceEnum.LIST_DATA.getValue().equals(dataSource)){ - nowFileList = FileUnZip.readFileByFilenameDataList(zipEntryName, fileName,projectLawsInventoryEO.getCut(),errorMsg,msgList,nameCn,nameEn,projectLawsInventoryEO); - }else{ - nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,projectLawsInventoryEO.getCut(),errorMsg,msgList,nameCn,nameEn); + if (DataSourceEnum.LIST_DATA.getValue().equals(dataSource)) { + nowFileList = FileUnZip.readFileByFilenameDataList(zipEntryName, fileName, projectLawsInventoryEO.getCut(), errorMsg, msgList, nameCn, nameEn, projectLawsInventoryEO); + } else { + nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName, projectLawsInventoryEO.getCut(), errorMsg, msgList, nameCn, nameEn); } if (nowFileList.size() == 0) { // if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ @@ -8256,12 +8278,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl prehomo = new ArrayList<>(); List verify = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { design.add(projectLawsInventoryEO.getDesignDeliverableTemplate()); } - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())) { prehomo.add(projectLawsInventoryEO.getPrehomoDeliverableTemplate()); } - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())) { verify.add(projectLawsInventoryEO.getVerifyDeliverableTemplate()); } } - if(design.size() != 0){ + if (design.size() != 0) { fileIdList.addAll(design); } - if(prehomo.size() != 0){ + if (prehomo.size() != 0) { fileIdList.addAll(prehomo); } - if(verify.size() != 0){ + if (verify.size() != 0) { fileIdList.addAll(verify); } //查询所有的文件 List fileInfos = new ArrayList<>(); - if(fileIdList.size() != 0){ + if (fileIdList.size() != 0) { fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ",")); } return fileInfos; } + @NotNull private StringBuilder getStringBuilder(ProjectLawsInventoryEO projectLawsInventoryEO, List sysCategoryList, String technologyTerritory) { StringBuilder sb = new StringBuilder(); for (String s : technologyTerritory.split(",")) { List collect = sysCategoryList.stream() .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); - if(collect.size() != 0){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - sb.append(collect.get(0).getName()+","); - }else{ - sb.append(collect.get(0).getEnName()+","); + if (collect.size() != 0) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + sb.append(collect.get(0).getName() + ","); + } else { + sb.append(collect.get(0).getEnName() + ","); } } } @@ -8474,6 +8576,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setRegulationOwnerName(collect.get(0).getUsername()); } } //认证工程师 homologationEngineerId - if(StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setHomologationEngineerName(collect.get(0).getUsername()); } } //工程接口人 engineeringInterfacePerson - if(StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setEngineeringInterfacePersonName(collect.get(0).getUsername()); } } //设计符合性确认发起人designInitiatorId - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setDesignInitiatorName(collect.get(0).getUsername()); } } //设计符合性确认责任人designDutyId - if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setDesignDutyIdName(collect.get(0).getUsername()); } } //PreHomo确认发起人prehomoInitiatorId - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setPrehomoInitiatorName(collect.get(0).getUsername()); } } //PreHomo确认责任人prehomoDutyId - if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setPrehomoDutyName(collect.get(0).getUsername()); } } //验证符合性确认发起人verifyInitiatorId - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setVerifyInitiatorName(collect.get(0).getUsername()); } } //验证符合性确认责任人verifyDutyId - if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())){ + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { List collect = sysUserList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { projectLawsInventoryEO.setVerifyDutyIdName(collect.get(0).getUsername()); } } @@ -8605,36 +8708,36 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList()); - if(collect.size() != 0){ - sb.append(collect.get(0).getFileName()+","); + if (collect.size() != 0) { + sb.append(collect.get(0).getFileName() + ","); } } String substring = ""; - if(StringUtils.isNotBlank(sb)){ + if (StringUtils.isNotBlank(sb)) { substring = sb.substring(0, sb.length() - 1); } return substring; } - private void exportFile(List dataList,List fileInfos) throws IOException { - if(fileInfos.size() != 0){ + private void exportFile(List dataList, List fileInfos) throws IOException { + if (fileInfos.size() != 0) { for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { String designDeliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate(); String prehomoDeliverableTemplate = projectLawsInventoryEO.getPrehomoDeliverableTemplate(); String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate(); String serialNumber = projectLawsInventoryEO.getSerialNumber(); - if(StringUtils.isBlank(serialNumber)){ + if (StringUtils.isBlank(serialNumber)) { continue; } List designFileList = new ArrayList<>(); List prehomoFileList = new ArrayList<>(); List verifyFileList = new ArrayList<>(); List oSSFileList = new ArrayList<>(); - if(StringUtils.isNotBlank(designDeliverableTemplate)){ + if (StringUtils.isNotBlank(designDeliverableTemplate)) { designFileList = fileInfos.stream().filter(e -> designDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); oSSFileList.addAll(designFileList); } - if(StringUtils.isNotBlank(prehomoDeliverableTemplate)){ + if (StringUtils.isNotBlank(prehomoDeliverableTemplate)) { prehomoFileList = fileInfos.stream().filter(e -> prehomoDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); oSSFileList.addAll(prehomoFileList); } - if(StringUtils.isNotBlank(verifyDeliverableTemplate)){ + if (StringUtils.isNotBlank(verifyDeliverableTemplate)) { verifyFileList = fileInfos.stream().filter(e -> verifyDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); oSSFileList.addAll(verifyFileList); } - if(oSSFileList.size() != 0){ - if(serialNumber.contains("/")){ - serialNumber = serialNumber.replaceAll("/","-"); + if (oSSFileList.size() != 0) { + if (serialNumber.contains("/")) { + serialNumber = serialNumber.replaceAll("/", "-"); } String fileNowPath = uploadpath + "/tempZip/" + serialNumber; File file = new File(fileNowPath); @@ -8700,10 +8804,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoDiff, String contentLog,Map infoDiffEn, String enContentLog, String projectLibraryId) { + public void setContentLog(Map infoDiff, String contentLog, Map infoDiffEn, String enContentLog, String projectLibraryId) { //设置维护清单的修改消息 - if(MapUtils.isNotEmpty(infoDiff)) { + if (MapUtils.isNotEmpty(infoDiff)) { if (infoDiff.size() > 1) { //子标题 if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) { List list = Arrays.asList(infoDiff.get("subtitle").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("subtitle"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("subtitle"))) { List listEn = Arrays.asList(infoDiffEn.get("subtitle").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.SUBTITLE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } - } + } //WVTA ID if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; - } - if(StringUtils.isNotBlank(infoDiffEn.get("wvtaId"))){ + contentLog += "'" + ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } + if (StringUtils.isNotBlank(infoDiffEn.get("wvtaId"))) { List listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.WVTA_ID.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } - } + } //实施类别 if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { List list = Arrays.asList(infoDiff.get("implementType").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; - } - if(StringUtils.isNotBlank(infoDiffEn.get("implementType"))){ + contentLog += "'" + ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } + if (StringUtils.isNotBlank(infoDiffEn.get("implementType"))) { List listEn = Arrays.asList(infoDiffEn.get("implementType").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } - } + } //在产车实施日期 if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) { List list = Arrays.asList(infoDiff.get("implementTimeString").split(",")); - if(list.size() > 1){ - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; - } - if(StringUtils.isNotBlank(infoDiffEn.get("implementTimeString"))){ + if (list.size() > 1) { + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += "'" + ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } + if (StringUtils.isNotBlank(infoDiffEn.get("implementTimeString"))) { List listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8815,17 +8920,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) { List listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8834,17 +8939,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationType").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("attestationType"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("attestationType"))) { List listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8853,17 +8958,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationRank").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("attestationRank"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("attestationRank"))) { List listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8872,17 +8977,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("dutyTerritory"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("dutyTerritory"))) { List listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8891,17 +8996,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("regulationOwnerName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("regulationOwnerName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("regulationOwnerName"))) { List listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8909,17 +9014,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("homologationEngineerName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("homologationEngineerName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("homologationEngineerName"))) { List listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8927,17 +9032,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("engineeringInterfacePersonName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("engineeringInterfacePersonName"))) { List listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8946,17 +9051,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("region").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("region"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("region"))) { List listEn = Arrays.asList(infoDiffEn.get("region").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.REGION.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8965,17 +9070,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("remark").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("remark"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("remark"))) { List listEn = Arrays.asList(infoDiffEn.get("remark").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.REMARK.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -8984,17 +9089,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTypeName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTypeName"))) { List listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9002,17 +9107,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTemplateName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTemplateName"))) { List listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9020,17 +9125,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designInitiatorName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("designInitiatorName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("designInitiatorName"))) { List listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9038,17 +9143,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDutyName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("designDutyName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("designDutyName"))) { List listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9056,17 +9161,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDueDateString").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("designDueDateString"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("designDueDateString"))) { List listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9074,17 +9179,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTypeName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTypeName"))) { List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9092,17 +9197,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTemplateName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTemplateName"))) { List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9110,17 +9215,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("prehomoInitiatorName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("prehomoInitiatorName"))) { List listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9128,17 +9233,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDutyName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDutyName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("prehomoDutyName"))) { List listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9146,17 +9251,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDueDateString"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("prehomoDueDateString"))) { List listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9165,17 +9270,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTypeName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTypeName"))) { List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9183,17 +9288,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTemplateName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTemplateName"))) { List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9201,17 +9306,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("verifyInitiatorName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("verifyInitiatorName"))) { List listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9219,17 +9324,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDutyName").split(",")); - if(list.size() > 1){ + if (list.size() > 1) { String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + contentLog += "'" + ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } - if(StringUtils.isNotBlank(infoDiffEn.get("verifyDutyName"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("verifyDutyName"))) { List listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } @@ -9242,30 +9347,31 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; } - if(StringUtils.isNotBlank(infoDiffEn.get("verifyDueDateString"))){ + if (StringUtils.isNotBlank(infoDiffEn.get("verifyDueDateString"))) { List listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(",")); - if(listEn.size() > 1){ + if (listEn.size() > 1) { String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + enContentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() + "' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } } } - contentLog = contentLog.substring(0, contentLog.length()-1); - enContentLog =enContentLog.substring(0, enContentLog.length()-1); - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); + contentLog = contentLog.substring(0, contentLog.length() - 1); + enContentLog = enContentLog.substring(0, enContentLog.length() - 1); + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue()); } } } + //表格高度 private static int high = 25; //表格宽度 private static int widthPercentage = 100; @Override - public void downloadReport(Map params,HttpServletRequest req, HttpServletResponse resp) throws DocumentException{ + public void downloadReport(Map params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException { String filename = "法规清单报告"; File file = null; @@ -9277,7 +9383,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryQueryWrapper = new QueryWrapper<>(); - lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); + lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, id); ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(lawsInventoryQueryWrapper); - params.put("projectLawsInventoryEO",projectLawsInventoryEO); + params.put("projectLawsInventoryEO", projectLawsInventoryEO); QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); - taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,id); + taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, id); ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper); - params.put("projectTaskInventoryEO",projectTaskInventoryEO); + params.put("projectTaskInventoryEO", projectTaskInventoryEO); QueryWrapper libraryBaseQueryWrapper = new QueryWrapper<>(); - libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLawsInventoryEO.getProjectLibraryId()); + libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()); ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); - params.put("projectLibraryBase",projectLibraryBase); + params.put("projectLibraryBase", projectLibraryBase); QueryWrapper projectNameQueryWrapper = new QueryWrapper<>(); - projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper); - params.put("projectNameInfoEO",projectNameInfoEO); + params.put("projectNameInfoEO", projectNameInfoEO); //设置ProgramInformation内容 - setProgramInformation(tableBasic,document,f8,params); + setProgramInformation(tableBasic, document, f8, params); //设置ComplianceAttachments 验证符合性流程里最后通过审批的 “ 工程确认 ” 中的附件 内容 - setComplianceAttachments(new PdfPTable(2),document,f8); + setComplianceAttachments(new PdfPTable(2), document, f8); //设置ComplianceResult 内容 - setComplianceResult(new PdfPTable(2),document,f8,params); + setComplianceResult(new PdfPTable(2), document, f8, params); //审核历史表头 String[] auditHistoryHead = new String[]{"Result", "Opinion", "Node", "Operator", "Datetime"}; //设置DesignComplianceCheckApprovals （设计符合性确认的审批历史数据，没有就空着） 内容 - setDesignComplianceCheckApprovals(new PdfPTable(auditHistoryHead.length),document,f8,auditHistoryHead,params); + setDesignComplianceCheckApprovals(new PdfPTable(auditHistoryHead.length), document, f8, auditHistoryHead, params); //设置ValidationComplianceCheckApprovals （验证符合性确认的审批历史数据，没有就空着） 内容 - setValidationComplianceCheckApprovals(new PdfPTable(auditHistoryHead.length),document,f8,auditHistoryHead,params); + setValidationComplianceCheckApprovals(new PdfPTable(auditHistoryHead.length), document, f8, auditHistoryHead, params); document.close(); @@ -9392,46 +9498,46 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params) throws DocumentException{ + public void setProgramInformation(PdfPTable tableBase, Document document, Font fontSize, Map params) throws DocumentException { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String cut = (String) params.get("cut"); @@ -9466,17 +9572,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region"); List marketList = new ArrayList<>(); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { marketList = regionDictList.stream().filter(e -> StringUtils.equals(e.getItemValue(), projectLibraryBase.getTargetMarket())).map(SysDictItem::getItemText).distinct().collect(Collectors.toList()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { marketList = regionDictList.stream().filter(e -> StringUtils.equals(e.getItemValue(), projectLibraryBase.getTargetMarket())).map(SysDictItem::getEnName).distinct().collect(Collectors.toList()); } String market = ""; - if(CollectionUtils.isNotEmpty(marketList)){ + if (CollectionUtils.isNotEmpty(marketList)) { market = marketList.get(0); } @@ -9526,7 +9632,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); String dutyTerritoryName = ""; - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { dutyTerritoryName = dutyTerritoryDictItemList.stream() .filter(e -> finalDutyTerritory.contains(e.getItemValue())) .map(SysDictItem::getItemText) .collect(Collectors.joining(",")); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { dutyTerritoryName = dutyTerritoryDictItemList.stream() .filter(e -> finalDutyTerritory.contains(e.getItemValue())) .map(SysDictItem::getEnName) @@ -9558,7 +9664,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryStudioUserWrapper = new QueryWrapper<>(); - queryStudioUserWrapper.lambda().eq(SysUser::getId,studioEngineer); + queryStudioUserWrapper.lambda().eq(SysUser::getId, studioEngineer); SysUser studioUserInfo = sysUserMapper.selectOne(queryStudioUserWrapper); PdfPCell cell62 = pdfTableStyle(studioUserInfo.getUsername(), fontSize, 50, true, true); tableBase.addCell(cell62); @@ -9567,7 +9673,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryEngineeringInterfaceUserWrapper = new QueryWrapper<>(); - queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId,engineeringInterfacePerson); + queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId, engineeringInterfacePerson); SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper); PdfPCell cell64 = pdfTableStyle(engineeringInterfaceInfo.getUsername(), fontSize, 50, true, true); tableBase.addCell(cell64); @@ -9577,7 +9683,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryHomologationEngineerUserWrapper = new QueryWrapper<>(); - queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId,homologationEngineerId); + queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId, homologationEngineerId); SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper); PdfPCell cell72 = pdfTableStyle(homologationEngineerInfo.getUsername(), fontSize, 50, true, true); tableBase.addCell(cell72); @@ -9585,7 +9691,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryRegulationOwnerUserWrapper = new QueryWrapper<>(); - queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId,regulationOwnerId); + queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId, regulationOwnerId); SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper); PdfPCell cell74 = pdfTableStyle(regulationOwnerInfo.getUsername(), fontSize, 50, true, true); tableBase.addCell(cell74); @@ -9604,7 +9710,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params) throws DocumentException{ + public void setComplianceResult(PdfPTable tableBase, Document document, Font fontSize, Map params) throws DocumentException { String cut = (String) params.get("cut"); //法规id String id = (String) params.get("id"); QueryWrapper lawsInventoryQueryWrapper = new QueryWrapper<>(); - lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); + lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, id); ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(lawsInventoryQueryWrapper); // 单元格宽度 - float[] cellsWidth = { 0.45f, 0.55f}; + float[] cellsWidth = {0.45f, 0.55f}; try { tableBase.setWidths(cellsWidth); - }catch (Exception ex){ + } catch (Exception ex) { ex.printStackTrace(); } @@ -9708,7 +9814,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params) throws DocumentException{ + public void setDesignComplianceCheckApprovals(PdfPTable tableBase, Document document, Font fontSize, String[] auditHistoryHead, Map params) throws DocumentException { tableBase.setTotalWidth(500f);//表格的总宽度 tableBase.setWidthPercentage(100);// 表格的宽度百分比 @@ -9725,34 +9831,34 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params) throws DocumentException{ - List> list = new ArrayList<>(); + public void setValidationComplianceCheckApprovals(PdfPTable tableBase, Document document, Font fontSize, String[] auditHistoryHead, Map params) throws DocumentException { + List> list = new ArrayList<>(); - Map map1 = new HashMap<>(); - map1.put("Result",""); - map1.put("Opinion","Opinion 1"); - map1.put("Node","Node 1"); - map1.put("Operator","Operator 1"); - map1.put("Datetime","Datetime 1"); + Map map1 = new HashMap<>(); + map1.put("Result", ""); + map1.put("Opinion", "Opinion 1"); + map1.put("Node", "Node 1"); + map1.put("Operator", "Operator 1"); + map1.put("Datetime", "Datetime 1"); list.add(map1); - Map map2 = new HashMap<>(); - map2.put("Result","Result 2 "); - map2.put("Opinion","Opinion 2"); - map2.put("Node",""); - map2.put("Operator","Operator 2"); - map2.put("Datetime","Datetime 2"); + Map map2 = new HashMap<>(); + map2.put("Result", "Result 2 "); + map2.put("Opinion", "Opinion 2"); + map2.put("Node", ""); + map2.put("Operator", "Operator 2"); + map2.put("Datetime", "Datetime 2"); list.add(map2); - Map map3 = new HashMap<>(); - map3.put("Result","Result 3 "); - map3.put("Opinion","Opinion 3"); - map3.put("Node","Node 3"); - map3.put("Operator","Operator 3"); - map3.put("Datetime","Datetime 3"); + Map map3 = new HashMap<>(); + map3.put("Result", "Result 3 "); + map3.put("Opinion", "Opinion 3"); + map3.put("Node", "Node 3"); + map3.put("Operator", "Operator 3"); + map3.put("Datetime", "Datetime 3"); list.add(map3); tableBase.setTotalWidth(500f);//表格的总宽度 @@ -9770,21 +9876,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl map : list) { - tableBase.addCell(new Paragraph(map.get("Result").toString(),fontSize)); - tableBase.addCell(new Paragraph(map.get("Opinion").toString(),fontSize)); - tableBase.addCell(new Paragraph(map.get("Node").toString(),fontSize)); - tableBase.addCell(new Paragraph(map.get("Operator").toString(),fontSize)); - tableBase.addCell(new Paragraph(map.get("Datetime").toString(),fontSize)); + for (Map map : list) { + tableBase.addCell(new Paragraph(map.get("Result").toString(), fontSize)); + tableBase.addCell(new Paragraph(map.get("Opinion").toString(), fontSize)); + tableBase.addCell(new Paragraph(map.get("Node").toString(), fontSize)); + tableBase.addCell(new Paragraph(map.get("Operator").toString(), fontSize)); + tableBase.addCell(new Paragraph(map.get("Datetime").toString(), fontSize)); } document.add(tableBase); } /** * 下载docx报告 + * * @param params * @param req * @param resp @@ -9798,7 +9905,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryQueryWrapper = new QueryWrapper<>(); - lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); + lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId, id); ProjectLawsInventoryEO projectLawsInventory = this.baseMapper.selectOne(lawsInventoryQueryWrapper); List projectLawsInventoryEOList = new ArrayList<>(); projectLawsInventoryEOList.add(projectLawsInventory); @@ -9818,7 +9925,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,id); @@ -9826,14 +9933,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl libraryBaseQueryWrapper = new QueryWrapper<>(); - libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLawsInventoryEO.getProjectLibraryId()); + libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()); ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); - params.put("projectLibraryBase",projectLibraryBase); + params.put("projectLibraryBase", projectLibraryBase); QueryWrapper projectNameQueryWrapper = new QueryWrapper<>(); - projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper); - params.put("projectNameInfoEO",projectNameInfoEO); + params.put("projectNameInfoEO", projectNameInfoEO); final Map dataMap = new HashMap<>(); @@ -9842,14 +9949,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region"); String market = ""; - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { market = regionDictList.stream() .filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue())) .map(SysDictItem::getItemText) .collect(Collectors.joining(",")); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { market = regionDictList.stream() .filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue())) .map(SysDictItem::getEnName) @@ -9882,7 +9989,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); String dutyTerritoryName = ""; - if(StringUtils.isNotEmpty(finalDutyTerritory)){ - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.isNotEmpty(finalDutyTerritory)) { + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { dutyTerritoryName = dutyTerritoryDictItemList.stream() .filter(e -> finalDutyTerritory.contains(e.getItemValue())) .map(SysDictItem::getItemText) .collect(Collectors.joining(",")); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { dutyTerritoryName = dutyTerritoryDictItemList.stream() .filter(e -> finalDutyTerritory.contains(e.getItemValue())) .map(SysDictItem::getEnName) @@ -9908,15 +10015,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryStudioUserWrapper = new QueryWrapper<>(); - queryStudioUserWrapper.lambda().eq(SysUser::getId,studioEngineer); + queryStudioUserWrapper.lambda().eq(SysUser::getId, studioEngineer); SysUser studioUserInfo = sysUserMapper.selectOne(queryStudioUserWrapper); dataMap.put("STUDIO", StringUtils.isNotEmpty(studioUserInfo.getUsername()) ? studioUserInfo.getUsername() : ""); String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson(); String engineeringInterfaceName = ""; - if(StringUtils.isNotEmpty(engineeringInterfacePerson)){ + if (StringUtils.isNotEmpty(engineeringInterfacePerson)) { QueryWrapper queryEngineeringInterfaceUserWrapper = new QueryWrapper<>(); - queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId,engineeringInterfacePerson); + queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId, engineeringInterfacePerson); SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper); engineeringInterfaceName = engineeringInterfaceInfo.getUsername(); } @@ -9925,9 +10032,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryHomologationEngineerUserWrapper = new QueryWrapper<>(); - queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId,homologationEngineerId); + queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId, homologationEngineerId); SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper); homologationEngineerName = homologationEngineerInfo.getUsername(); } @@ -9935,9 +10042,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryRegulationOwnerUserWrapper = new QueryWrapper<>(); - queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId,regulationOwnerId); + queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId, regulationOwnerId); SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper); regulationOwnerName = regulationOwnerInfo.getUsername(); } @@ -9955,7 +10062,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params,String pId){ - try{ + public void setTableContent(int tableIndex, WordprocessingMLPackage wordMLPackage, Map params, String pId) { + try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List> dataList = new ArrayList<>(); + List> dataList = new ArrayList<>(); // 设置数据 - if(StringUtils.isNotEmpty(pId)){ - if(tableIndex == 1){ + if (StringUtils.isNotEmpty(pId)) { + if (tableIndex == 1) { /*QueryWrapper taskFeedbackQueryWrapper = new QueryWrapper<>(); taskFeedbackQueryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,pId); List projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(taskFeedbackQueryWrapper); @@ -10073,15 +10181,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processHistoryEOList = processHistoryEOService.queryList(params); - if(CollectionUtils.isNotEmpty(processHistoryEOList)){ + if (CollectionUtils.isNotEmpty(processHistoryEOList)) { List fileIdList = processHistoryEOList.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.toList()); - String fileId = StringUtils.join(fileIdList,","); + String fileId = StringUtils.join(fileIdList, ","); List fileList = iOSSFileService.getFileInfos(fileId); - if(CollectionUtils.isNotEmpty(fileList)){ + if (CollectionUtils.isNotEmpty(fileList)) { fileList.forEach(file -> { - Map fileMap = new HashMap<>(); + Map fileMap = new HashMap<>(); fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); /*fileMap.put("item.fileName", file.getFileName()); @@ -10090,18 +10198,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processHistoryEOList = processHistoryEOService.queryList(params); - if(CollectionUtils.isNotEmpty(processHistoryEOList)){ + if (CollectionUtils.isNotEmpty(processHistoryEOList)) { processHistoryEOList.forEach(processHistory -> { String createTime = sdf.format(processHistory.getCreateTime()); - Map designMap = new HashMap<>(); + Map designMap = new HashMap<>(); designMap.put("DESIGN_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); designMap.put("DESIGN_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); designMap.put("DESIGN_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); - designMap.put("DESIGN_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); + designMap.put("DESIGN_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() : ""); designMap.put("DESIGN_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : ""); /*designMap.put("design.result", processHistory.getReviewResult()); @@ -10112,18 +10220,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processHistoryEOList = processHistoryEOService.queryList(params); - if(CollectionUtils.isNotEmpty(processHistoryEOList)){ + if (CollectionUtils.isNotEmpty(processHistoryEOList)) { processHistoryEOList.forEach(processHistory -> { String createTime = sdf.format(processHistory.getCreateTime()); - Map verifyMap = new HashMap<>(); + Map verifyMap = new HashMap<>(); verifyMap.put("VERIFY_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); verifyMap.put("VERIFY_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); verifyMap.put("VERIFY_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); - verifyMap.put("VERIFY_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); + verifyMap.put("VERIFY_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() : ""); verifyMap.put("VERIFY_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : ""); /*verifyMap.put("verify.result", processHistory.getReviewResult()); @@ -10152,18 +10260,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryIdList = Arrays.asList(ids.split(",")); QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); - lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); + lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getId, projectLawsInventoryIdList); List projectLawsInventoryEOList = this.baseMapper.selectList(lawsInventoryEOQueryWrapper); // 催办类型 可以只催设计符合性 也可以只催验证符合性 String expeditingType = json.getString("expeditingType"); - if(StringUtils.contains(expeditingType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_EXPEDITING.getValue())){ + if (StringUtils.contains(expeditingType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_EXPEDITING.getValue())) { // 只有studio催办的时候，才会给法规工程师发消息 - if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_STUDIO_EXPEDITING.getValue())){ + if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_STUDIO_EXPEDITING.getValue())) { // 设计符合性 清单待校核状态数据催办。 this.designExpeditingToBeChecked(projectLibraryId, projectLawsInventoryEOList); // 设计符合性 结果待审查状态数据催办。 @@ -10204,9 +10313,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 催办验证符合性流程状态为 结果待提交的 责任人 List toBeSubmitLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())) { flag = true; } return flag; @@ -10449,46 +10559,46 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> verifyDutyMap : verifyDutyGroupMap.entrySet()) { String verifyDutyId = verifyDutyMap.getKey(); List lawsInventoryEOList = verifyDutyMap.getValue(); - if(StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate(); String endTime = ""; - if(verifyDueDate != null){ + if (verifyDueDate != null) { endTime = DateUtils.formatDate(verifyDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(verifyDutyId.split(",")); // 给设计符合性流程责任人发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请尽快查看处理此项任务，谢谢！"); - params.put("contentEn","Hello! Please check and address the task ASAP. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！"); + params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params); } } } @@ -10496,14 +10606,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 催办验证符合性流程状态为 清单待确认的 责任人 List toBeConfirmedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { flag = true; } return flag; @@ -10513,46 +10624,46 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> verifyDutyMap : verifyDutyGroupMap.entrySet()) { String verifyDutyId = verifyDutyMap.getKey(); List lawsInventoryEOList = verifyDutyMap.getValue(); - if(StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(verifyDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate(); String endTime = ""; - if(verifyDueDate != null){ + if (verifyDueDate != null) { endTime = DateUtils.formatDate(verifyDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(verifyDutyId.split(",")); // 给设计符合性流程责任人发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请及时查看确认以下任务要求，谢谢！"); - params.put("contentEn","Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请及时查看确认以下任务要求，谢谢！"); + params.put("contentEn", "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); } } } @@ -10560,63 +10671,64 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 如果验证符合性流程状态为 结果待审查，催办时就需要给这一条数据的法规工程师发消息 List toBeReviewedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())) { flag = true; } return flag; }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(toBeReviewedLawsInventoryList)){ + if (CollectionUtils.isNotEmpty(toBeReviewedLawsInventoryList)) { Map> regulationOwnerGroupMap = toBeReviewedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId)); for (Map.Entry> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) { String regulationOwnerId = regulationOwnerMap.getKey(); List lawsInventoryEOList = regulationOwnerMap.getValue(); - if(StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate(); String endTime = ""; - if(verifyDueDate != null){ + if (verifyDueDate != null) { endTime = DateUtils.formatDate(verifyDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(regulationOwnerId.split(",")); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请尽快查看处理此项任务，谢谢！"); - params.put("contentEn","Hello! Please check and address the task ASAP. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！"); + params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(), params); } } } @@ -10624,57 +10736,58 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 如果验证符合性流程状态为 清单待校核，催办时就需要给这一条数据的法规工程师发消息 List toBeCheckedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())) { flag = true; } return flag; }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(toBeCheckedLawsInventoryList)){ + if (CollectionUtils.isNotEmpty(toBeCheckedLawsInventoryList)) { Map> regulationOwnerGroupMap = toBeCheckedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId)); for (Map.Entry> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) { String regulationOwnerId = regulationOwnerMap.getKey(); List lawsInventoryEOList = regulationOwnerMap.getValue(); - if(StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByInventoryAffirmDueDate(lawsInventoryEOList); Date inventoryAffirmDueDate = lawsInventoryEOList.get(0).getInventoryAffirmDueDate(); String endTime = ""; - if(inventoryAffirmDueDate != null){ + if (inventoryAffirmDueDate != null) { endTime = DateUtils.formatDate(inventoryAffirmDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(regulationOwnerId.split(",")); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请及时校核法规清单内容并发起符合性流程，谢谢！"); - params.put("contentEn","Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请及时校核法规清单内容并发起符合性流程，谢谢！"); + params.put("contentEn", "Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator", projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params); } } } @@ -10682,14 +10795,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 催办设计符合性流程状态为 结果待提交的 责任人 List toBeSubmitLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())) { flag = true; } return flag; @@ -10699,46 +10813,46 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> designDutyMap : designDutyGroupMap.entrySet()) { String designDutyId = designDutyMap.getKey(); List lawsInventoryEOList = designDutyMap.getValue(); - if(StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate(); String endTime = ""; - if(designDueDate != null){ + if (designDueDate != null) { endTime = DateUtils.formatDate(designDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(designDutyId.split(",")); // 给设计符合性流程责任人发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请尽快查看处理此项任务，谢谢！"); - params.put("contentEn","Hello! Please check and address the task ASAP. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！"); + params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params); } } } @@ -10746,14 +10860,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 催办设计符合性流程状态为 清单待确认的 责任人 List toBeConfirmedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) { flag = true; } return flag; @@ -10763,46 +10878,46 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> designDutyMap : designDutyGroupMap.entrySet()) { String designDutyId = designDutyMap.getKey(); List lawsInventoryEOList = designDutyMap.getValue(); - if(StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(designDutyId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByDesignDueDate(lawsInventoryEOList); Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate(); String endTime = ""; - if(designDueDate != null){ + if (designDueDate != null) { endTime = DateUtils.formatDate(designDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(designDutyId.split(",")); // 给设计符合性流程责任人发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请及时查看确认以下任务要求，谢谢！"); - params.put("contentEn","Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请及时查看确认以下任务要求，谢谢！"); + params.put("contentEn", "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId(); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); } } } @@ -10810,63 +10925,64 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 如果设计符合性流程状态为 结果待审查，催办时就需要给这一条数据的法规工程师发消息 List toBeReviewedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())) { flag = true; } return flag; }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(toBeReviewedLawsInventoryList)){ + if (CollectionUtils.isNotEmpty(toBeReviewedLawsInventoryList)) { Map> regulationOwnerGroupMap = toBeReviewedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId)); for (Map.Entry> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) { String regulationOwnerId = regulationOwnerMap.getKey(); List lawsInventoryEOList = regulationOwnerMap.getValue(); - if(StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByDesignDueDate(lawsInventoryEOList); Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate(); String endTime = ""; - if(designDueDate != null){ + if (designDueDate != null) { endTime = DateUtils.formatDate(designDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(regulationOwnerId.split(",")); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请尽快查看处理此项任务，谢谢！"); - params.put("contentEn","Hello! Please check and address the task ASAP. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请尽快查看处理此项任务，谢谢！"); + params.put("contentEn", "Hello! Please check and address the task ASAP. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取待办中心 - 飞书跳转链接 - Map todoCenterParams = new HashMap<>(); - todoCenterParams.put("projectNameCn",PRN_CN); - todoCenterParams.put("projectNameEn",PRN_EN); + Map todoCenterParams = new HashMap<>(); + todoCenterParams.put("projectNameCn", PRN_CN); + todoCenterParams.put("projectNameEn", PRN_EN); Map hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); - params.put("Initiator",regulationOwnerUserName); + params.put("Initiator", regulationOwnerUserName); - this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(), params); } } } @@ -10874,57 +10990,58 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList) { // 如果设计符合性流程状态为 清单待校核，催办时就需要给这一条数据的法规工程师发消息 List toBeCheckedLawsInventoryList = projectLawsInventoryEOList.stream().filter(lawsInventory -> { - boolean flag =false; - if (StringUtils.equals(lawsInventory.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){ + boolean flag = false; + if (StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())) { flag = true; } return flag; }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(toBeCheckedLawsInventoryList)){ + if (CollectionUtils.isNotEmpty(toBeCheckedLawsInventoryList)) { Map> regulationOwnerGroupMap = toBeCheckedLawsInventoryList.stream().collect(Collectors.groupingBy(ProjectLawsInventoryEO::getRegulationOwnerId)); for (Map.Entry> regulationOwnerMap : regulationOwnerGroupMap.entrySet()) { String regulationOwnerId = regulationOwnerMap.getKey(); List lawsInventoryEOList = regulationOwnerMap.getValue(); - if(StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)){ + if (StringUtils.isEmpty(regulationOwnerId) || CollectionUtils.isEmpty(lawsInventoryEOList)) { continue; } this.lawsInventoryEOListSortByInventoryAffirmDueDate(lawsInventoryEOList); Date inventoryAffirmDueDate = lawsInventoryEOList.get(0).getInventoryAffirmDueDate(); String endTime = ""; - if(inventoryAffirmDueDate != null){ + if (inventoryAffirmDueDate != null) { endTime = DateUtils.formatDate(inventoryAffirmDueDate); } String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); List userIdList = Arrays.asList(regulationOwnerId.split(",")); // 给法规工程师发消息 - Map params = new HashMap<>(); - params.put("contentCn","您好，请及时校核法规清单内容并发起符合性流程，谢谢！"); - params.put("contentEn","Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!"); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请及时校核法规清单内容并发起符合性流程，谢谢！"); + params.put("contentEn", "Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!"); params.put("projectLibraryId", projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator", projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params); } } } @@ -10932,21 +11049,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getRoleByUserId(String projectLibraryId,String cut) { + public List getRoleByUserId(String projectLibraryId, String cut) { List sysRoles = new LinkedList<>(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //项目详情中取R&H Studio和认证工程师 - List projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId,null); + List projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId, null); String certificationEngineerName = ""; - if(projectLibraryBases.size() != 0){ + if (projectLibraryBases.size() != 0) { certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName(); String studioEngineerName = projectLibraryBases.get(0).getStudioEngineerName(); - if(StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())){ + if (StringUtils.isNotBlank(studioEngineerName) && studioEngineerName.equals(loginUser.getUsername())) { SysRole sysRole = new SysRole(); sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getCode()); } @@ -10954,12 +11071,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl querylawEngineerCountWrap = new QueryWrapper<>(); - querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId,loginUser.getId()); + querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); + querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId, loginUser.getId()); Integer lawCount = this.baseMapper.selectCount(querylawEngineerCountWrap); - if(lawCount > 0){ + if (lawCount > 0) { SysRole sysRole = new SysRole(); sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode()); } sysRoles.add(sysRole); @@ -11062,15 +11179,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryEipCountWrap = new QueryWrapper<>(); - queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson,loginUser.getId()); + queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); + queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson, loginUser.getId()); Integer eipCount = this.baseMapper.selectCount(queryEipCountWrap); - if(eipCount > 0){ + if (eipCount > 0) { SysRole sysRole = new SysRole(); sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode()); } sysRoles.add(sysRole); @@ -11078,33 +11195,31 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryDutyPersonCountWrap = new QueryWrapper<>(); - queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); queryDutyPersonCountWrap.and(query -> { - query.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId,loginUser.getId()); - query.or().lambda().eq(ProjectLawsInventoryEO::getVerifyDutyId,loginUser.getId()); + query.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId, loginUser.getId()); + query.or().lambda().eq(ProjectLawsInventoryEO::getVerifyDutyId, loginUser.getId()); }); Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap); - if(dutyPersonCount > 0){ + if (dutyPersonCount > 0) { SysRole sysRole = new SysRole(); sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getName()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getCode()); } sysRoles.add(sysRole); } - - List roleList = sysRoleMapper.getRoleByUserId(loginUser.getId()); //studio角色,法规工程师/认证工程师,领导角色,管理员角色,Viewer if (roleList.size() != 0) { List manager = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List admin = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List Viewer = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { if (manager.size() != 0) { manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getValue()); sysRoles.addAll(manager); @@ -11117,7 +11232,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnelList,String studioEngineer,String engineersId){ + public String ToGetAUserId(String roleCode, List projectRelatedPersonnelList, String studioEngineer, String engineersId) { String resultUserId = ""; //法规工程师 - if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> { boolean flag = false; - if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){ + if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) { flag = true; } return flag; }).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(",")); - if(StringUtils.isNotEmpty(lawEngineer)){ - if(!StringUtils.contains(lawEngineer,engineersId)){ + if (StringUtils.isNotEmpty(lawEngineer)) { + if (!StringUtils.contains(lawEngineer, engineersId)) { String[] lawEngineerArr = lawEngineer.split(","); - if(lawEngineerArr.length == 1){ + if (lawEngineerArr.length == 1) { resultUserId = lawEngineer; } - }else { + } else { resultUserId = engineersId; } } } //认证工程师 - if(StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> { boolean flag = false; - if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){ + if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) { flag = true; } return flag; }).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(",")); - if(StringUtils.isNotEmpty(certificationEngineer)){ - if(!StringUtils.contains(certificationEngineer,engineersId)){ + if (StringUtils.isNotEmpty(certificationEngineer)) { + if (!StringUtils.contains(certificationEngineer, engineersId)) { String[] certificationEngineerArr = certificationEngineer.split(","); - if(certificationEngineerArr.length == 1){ + if (certificationEngineerArr.length == 1) { resultUserId = certificationEngineer; } - }else { + } else { resultUserId = engineersId; } } } //工程接口人 - if(StringUtils.equals(roleCode,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())) { String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> { boolean flag = false; - if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){ + if (StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())) { flag = true; } return flag; }).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(",")); - if(StringUtils.isNotEmpty(engineeringInterfacePerson)){ - if(!StringUtils.contains(engineeringInterfacePerson,engineersId)){ + if (StringUtils.isNotEmpty(engineeringInterfacePerson)) { + if (!StringUtils.contains(engineeringInterfacePerson, engineersId)) { String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(","); - if(engineeringInterfacePersonArr.length == 1){ + if (engineeringInterfacePersonArr.length == 1) { resultUserId = engineeringInterfacePerson; } - }else { + } else { resultUserId = engineersId; } } } //studio - if(StringUtils.equals(roleCode,ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ + if (StringUtils.equals(roleCode, ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { resultUserId = studioEngineer; } return resultUserId; @@ -11224,12 +11339,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl removeWrapper = new QueryWrapper<>(); - removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); + removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId, projectLawsInventoryId); this.conditionAssessmentEOService.remove(removeWrapper); ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO(); @@ -11241,23 +11357,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoQueryWrap = new QueryWrapper<>(); - processInfoQueryWrap.lambda().eq(ProcessInfoEO::getProjectLibraryId,projectLibraryId); - processInfoQueryWrap.lambda().eq(ProcessInfoEO::getFlowType,FlowTypeEnum.QDQR.getValue()); + processInfoQueryWrap.lambda().eq(ProcessInfoEO::getProjectLibraryId, projectLibraryId); + processInfoQueryWrap.lambda().eq(ProcessInfoEO::getFlowType, FlowTypeEnum.QDQR.getValue()); List processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap); - if(CollectionUtils.isNotEmpty(processInfoEOList)){ + if (CollectionUtils.isNotEmpty(processInfoEOList)) { id = processInfoEOList.get(0).getId(); //删除之前创建的数据 this.processInfoEOService.remove(processInfoQueryWrap); - }else { + } else { id = UUID.randomUUID().toString().replace("-", ""); } @@ -11275,19 +11392,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOList, Date endTime){ + public void addProcessInfoDetail(String processInfoId, List processInfoDetailEOList, Date endTime) { processInfoDetailEOList.forEach(detail -> { detail.setProcessInfoId(processInfoId); detail.setFlowType(FlowTypeEnum.QDQR.getValue()); QueryWrapper deleteDetailWrap = new QueryWrapper<>(); - deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,detail.getProjectLawsInventoryId()); - deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getUserId,detail.getUserId()); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, detail.getProjectLawsInventoryId()); + deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getUserId, detail.getUserId()); this.processInfoDetailEOService.remove(deleteDetailWrap); }); @@ -11302,18 +11420,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl detailQueryWrapper = new QueryWrapper<>(); - detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projeceLawsInventoryId); - detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,currentUser.getId()); - detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue()); + detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projeceLawsInventoryId); + detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getUserId, currentUser.getId()); + detailQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.QDQR.getValue()); List detailEOList = this.processInfoDetailEOService.list(detailQueryWrapper); - if(CollectionUtils.isNotEmpty(detailEOList)){ + if (CollectionUtils.isNotEmpty(detailEOList)) { String processInfoId = detailEOList.get(0).getProcessInfoId(); detailEOList.forEach(detail -> { @@ -11324,11 +11443,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoId); - queryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue()); + queryWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, processInfoId); + queryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue()); int count = this.processInfoDetailEOService.count(queryWrapper); //如果没有待办任务 - if(count == 0){ + if (count == 0) { ProcessInfoEO processInfoEO = new ProcessInfoEO(); processInfoEO.setStatus(TodoCenterStatusEnum.COMPLETED.getValue()); processInfoEO.setId(processInfoId); @@ -11339,6 +11458,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); - projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); - projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper); //项目名称 @@ -11437,7 +11557,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateFlowInfoByProjectLibraryIds(String projectLibraryIds) { - if(StringUtils.isEmpty(projectLibraryIds)){ + if (StringUtils.isEmpty(projectLibraryIds)) { throw new JeroBootException("项目库id不能为空"); } List projectLibraryIdList = Arrays.asList(projectLibraryIds.split(",")); QueryWrapper lawsInventoryQueryWrap = new QueryWrapper<>(); - lawsInventoryQueryWrap.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryIdList); + lawsInventoryQueryWrap.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryIdList); List projectLawsInventoryEOList = this.baseMapper.selectList(lawsInventoryQueryWrap); projectLawsInventoryEOList.forEach(lawsInventoryEO -> { @@ -11548,11 +11668,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if(StringUtils.isEmpty(ids)){ + if (StringUtils.isEmpty(ids)) { throw new JeroBootException("至少选择一条数据进行操作！"); } - queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); List projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); List userIdList = new ArrayList<>(); @@ -11560,20 +11680,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("contentCn","您好，请及时校核法规清单内容并发起符合性流程，谢谢！"); - params.put("contentEn","Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!"); - params.put("projectLibraryId",projectLibraryId); - params.put("endTime",inventoryAffirmDueDate); - params.put("userIdList",userIdList); + Map params = new HashMap<>(); + params.put("contentCn", "您好，请及时校核法规清单内容并发起符合性流程，谢谢！"); + params.put("contentEn", "Please check the content of the regulation list and initiate the compliance process in a timely manner. Thank you!"); + params.put("projectLibraryId", projectLibraryId); + params.put("endTime", inventoryAffirmDueDate); + params.put("userIdList", userIdList); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator", projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(), params); } return Result.OK("发起清单确认成功！"); @@ -11633,24 +11753,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if(StringUtils.isEmpty(ids)){ - throw new JeroBootException("至少选择一条数据进行操作！"); - } - queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + if (StringUtils.isEmpty(ids)) { + throw new JeroBootException("至少选择一条数据进行操作！"); + } + queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); List projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); projectLawsInventoryEOS = projectLawsInventoryEOS.stream().filter(lawsInventory -> { boolean flag = false; boolean toBeCheckedFlag = ( StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - ||StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) ); boolean dutyPersonRejectedFlag = ( StringUtils.equals(lawsInventory.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - ||StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) + || StringUtils.equals(lawsInventory.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); - if(toBeCheckedFlag || dutyPersonRejectedFlag){ + if (toBeCheckedFlag || dutyPersonRejectedFlag) { flag = true; } return flag; @@ -11658,9 +11778,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pidQueryWrap = new QueryWrapper<>(); - pidQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,ids); + pidQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId, ids); List pidList = this.processInfoDetailEOService.list(pidQueryWrap); - if(CollectionUtils.isNotEmpty(pidList)){ + if (CollectionUtils.isNotEmpty(pidList)) { pidList.forEach(pid -> { pid.setStatus(TaskStatusEnum.HAVE_DONE.getValue()); }); @@ -11671,17 +11791,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("contentCn","您好，该任务已被发起人撤回。"); - params.put("contentEn","Hello! This regulation has been withdrawn by the initiator."); - params.put("projectLibraryId",projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + Map params = new HashMap<>(); + params.put("contentCn", "您好，该任务已被发起人撤回。"); + params.put("contentEn", "Hello! This regulation has been withdrawn by the initiator."); + params.put("projectLibraryId", projectLibraryId); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); - if(ObjectUtils.isNotEmpty(projectLibraryBase)){ + if (ObjectUtils.isNotEmpty(projectLibraryBase)) { String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator", projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), params); } return Result.OK("撤回成功！"); @@ -11723,7 +11843,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if(StringUtils.isEmpty(ids)){ + if (StringUtils.isEmpty(ids)) { throw new JeroBootException("至少选择一条数据进行操作！"); } queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); List projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { - if(StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){ + if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())) { projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()); } - if(StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())){ + if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) + || StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())) { projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()); } } @@ -11757,44 +11877,44 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(studioUserInfo.getId().split(",")); String serialNumbers = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); // 给studio发消息 - Map params = new HashMap<>(); - String contentCn = "您好，该任务被"+ currentUser.getUsername() +"退回，请及时查看处理。"; - String contentEn = "Hello! This task is rejected by "+ currentUser.getUsername() +". Please check and address it in a timely manner."; - params.put("contentCn",contentCn); - params.put("contentEn",contentEn); - params.put("projectLibraryId",projectLibraryId); - params.put("endTime",endTime); - params.put("userIdList",userIdList); - params.put("serialNumbers",serialNumbers); + Map params = new HashMap<>(); + String contentCn = "您好，该任务被" + currentUser.getUsername() + "退回，请及时查看处理。"; + String contentEn = "Hello! This task is rejected by " + currentUser.getUsername() + ". Please check and address it in a timely manner."; + params.put("contentCn", contentCn); + params.put("contentEn", contentEn); + params.put("projectLibraryId", projectLibraryId); + params.put("endTime", endTime); + params.put("userIdList", userIdList); + params.put("serialNumbers", serialNumbers); // 获取法规清单 - 飞书跳转链接 - Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); - params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN")); - params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN")); - params.put("Initiator",projectLibraryBase.getStudioEngineerName()); + Map hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); + params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN")); + params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN")); + params.put("Initiator", projectLibraryBase.getStudioEngineerName()); - this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params); + this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(), params); } return Result.OK("退回成功！"); } @Override - public String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List projectLawsInventoryEOList,List categoryList) { + public String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType, List projectLawsInventoryEOList, List categoryList) { String result = ""; for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) { - if(StringUtils.equals(projectLawsInventoryId,lawsInventory.getId())){ - if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + if (StringUtils.equals(projectLawsInventoryId, lawsInventory.getId())) { + if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) { List designDeliverableTypeList = Arrays.asList(lawsInventory.getDesignDeliverableType().split(",")); result = this.getTreeName(cut, categoryList, designDeliverableTypeList); - }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + } else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) { lawsInventory.getVerifyDeliverableType(); List verifyDeliverableTypeList = Arrays.asList(lawsInventory.getVerifyDeliverableType().split(",")); result = this.getTreeName(cut, categoryList, verifyDeliverableTypeList); @@ -11805,12 +11925,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList, List sysDictItems,String dicCode) { + public String getDutyTerritoryNameById(String projectLawsInventoryId, String cut, List projectLawsInventoryEOList, List sysDictItems, String dicCode) { String result = ""; for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) { - if(StringUtils.equals(projectLawsInventoryId,lawsInventory.getId())){ + if (StringUtils.equals(projectLawsInventoryId, lawsInventory.getId())) { String dutyTerritory = lawsInventory.getDutyTerritory(); - result = disposeShowDictItemValue(sysDictItems, dutyTerritory,cut,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); + result = disposeShowDictItemValue(sysDictItems, dutyTerritory, cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); break; } } @@ -11822,7 +11942,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl templateVariableMap = new HashMap<>(); - templateVariableMap.put("contentCn",contentCn); - templateVariableMap.put("contentEn",contentEn); - templateVariableMap.put("projectNameCn",PRN_CN); - templateVariableMap.put("projectNameEn",PRN_EN); - templateVariableMap.put("Initiator",Initiator); - templateVariableMap.put("studioEngineerName",projectLibraryBase.getStudioEngineerName()); - templateVariableMap.put("endTime",endTime); - templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); - templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); - templateVariableMap.put("operateUserName",ObjectUtils.isNotEmpty(currentUser) ? currentUser.getUsername() : projectLibraryBase.getStudioEngineerName()); - templateVariableMap.put("standName",serialNumbers); - templateVariableMap.put("flowTypeCn",flowTypeCn); - templateVariableMap.put("flowTypeEn",flowTypeEn); + Map templateVariableMap = new HashMap<>(); + templateVariableMap.put("contentCn", contentCn); + templateVariableMap.put("contentEn", contentEn); + templateVariableMap.put("projectNameCn", PRN_CN); + templateVariableMap.put("projectNameEn", PRN_EN); + templateVariableMap.put("Initiator", Initiator); + templateVariableMap.put("studioEngineerName", projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("endTime", endTime); + templateVariableMap.put("viewBtnUrlCn", hrefFeishu_CN); + templateVariableMap.put("viewBtnUrlEn", hrefFeishu_EN); + templateVariableMap.put("operateUserName", ObjectUtils.isNotEmpty(currentUser) ? currentUser.getUsername() : projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("standName", serialNumbers); + templateVariableMap.put("flowTypeCn", flowTypeCn); + templateVariableMap.put("flowTypeEn", flowTypeEn); - larkMesJson.put("templateVariableMap",templateVariableMap); + larkMesJson.put("templateVariableMap", templateVariableMap); this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); } } @@ -11883,8 +12003,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen) { - Map result = new HashMap<>(); + public Map getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN, String roleOpen) { + Map result = new HashMap<>(); String hrefFeishu_CN = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() @@ -11901,20 +12021,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getToDoCenterLinkHrefFeishu(String projectLibraryId, Map todoCenterParams) { - String projectNameCn = (String) todoCenterParams.get("projectNameCn"); - String projectNameEn = (String) todoCenterParams.get("projectNameEn"); + public Map getToDoCenterLinkHrefFeishu(String projectLibraryId, Map todoCenterParams) { + String projectNameCn = (String) todoCenterParams.get("projectNameCn"); + String projectNameEn = (String) todoCenterParams.get("projectNameEn"); // ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId); // String projectNameCn = projectLibraryBase.getProjectName(); - Map result = new HashMap<>(); + Map result = new HashMap<>(); String hrefFeishu_CN = backUrl + JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameCn; @@ -11923,8 +12043,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) { - if(p1.getInventoryAffirmDueDate() != null && p2.getInventoryAffirmDueDate() != null){ + if (p1.getInventoryAffirmDueDate() != null && p2.getInventoryAffirmDueDate() != null) { return p1.getInventoryAffirmDueDate().compareTo(p2.getInventoryAffirmDueDate()); } return 1; @@ -11946,7 +12066,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) { - if(p1.getDesignDueDate() != null && p2.getDesignDueDate() != null){ + if (p1.getDesignDueDate() != null && p2.getDesignDueDate() != null) { return p1.getDesignDueDate().compareTo(p2.getDesignDueDate()); } return 1; @@ -11959,7 +12079,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectLawsInventoryEO p1, ProjectLawsInventoryEO p2) { - if(p1.getDesignDueDate() != null && p2.getDesignDueDate() != null){ + if (p1.getDesignDueDate() != null && p2.getDesignDueDate() != null) { return p1.getDesignDueDate().compareTo(p2.getDesignDueDate()); } return 1; @@ -11968,26 +12088,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper) { + public void createQueryPermission(int isProjectRole, LoginUser currentUser, QueryWrapper queryWrapper) { // 如果是法规工程师，只能看到法规工程师是自己的数据 - if(isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId,currentUser.getId()); + if (isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId, currentUser.getId()); } // 如果是责任人，只能看到设计符合性或验证符合型 责任人是自己的数据。 - if(isProjectRole == Integer.parseInt(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue())){ + if (isProjectRole == Integer.parseInt(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue())) { queryWrapper.and(query -> { - query.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId,currentUser.getId()); - query.or().lambda().eq(ProjectLawsInventoryEO::getVerifyDutyId,currentUser.getId()); + query.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId, currentUser.getId()); + query.or().lambda().eq(ProjectLawsInventoryEO::getVerifyDutyId, currentUser.getId()); }); } // 如果是工程接口人，只能看到工程接口人是自己的数据。 - if(isProjectRole == Integer.parseInt(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue())){ - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson,currentUser.getId()); + if (isProjectRole == Integer.parseInt(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue())) { + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson, currentUser.getId()); } } /** * 系统内所有用户验证 + * * @param projectLawsInventoryEO * @param errorMsg * @param msgList @@ -11998,47 +12119,47 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, - String userName, - List sysUserList, - String nameCn,String nameEn, - String fieldNumber) { + String errorMsg, List msgList, + String userName, + List sysUserList, + String nameCn, String nameEn, + String fieldNumber) { //单选 - if(userName.contains(",")){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + if (userName.contains(",")) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { errorMsg += nameCn + "导入只能填写一个用户名, "; - }else{ - errorMsg += "Only one user name can be entered for"+ nameEn +"import, "; + } else { + errorMsg += "Only one user name can be entered for" + nameEn + "import, "; } msgList.add(errorMsg); } - if(sysUserList.size() != 0){ + if (sysUserList.size() != 0) { int count = 0; for (SysUser sysUser : sysUserList) { - if(StringUtils.equals(userName,sysUser.getUsername())){ - count ++; - if(ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) { + if (StringUtils.equals(userName, sysUser.getUsername())) { + count++; + if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setDesignDutyId(sysUser.getId()); - }else if(ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)){ + } else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) { projectLawsInventoryEO.setVerifyDutyId(sysUser.getId()); } break; } } - if(count == 0){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - errorMsg += nameCn+userName+"在系统中不存在， "; - }else{ - errorMsg += nameEn+userName+"Does not exist in the system, "; + if (count == 0) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + userName + "在系统中不存在， "; + } else { + errorMsg += nameEn + userName + "Does not exist in the system, "; } msgList.add(errorMsg); } - }else{ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - errorMsg += nameCn+userName+"在系统中不存在， "; - }else{ - errorMsg += nameEn+userName+"Does not exist in the system, "; + } else { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + userName + "在系统中不存在， "; + } else { + errorMsg += nameEn + userName + "Does not exist in the system, "; } msgList.add(errorMsg); } @@ -12049,11 +12170,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl resetFlowTemp(JSONObject parmas) { String ids = parmas.getString("ids"); String projectLibraryId = parmas.getString("projectLibraryId"); - if(StringUtils.isNotEmpty(ids)){ + if (StringUtils.isNotEmpty(ids)) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); - queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId); List projectLawsInventoryEOS = this.list(queryWrapper); List idList = Arrays.asList(ids.split(",")); @@ -12065,19 +12186,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(ProjectLawsInventoryEO::getId,idList); - updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null); - updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null); - updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag,null); - updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag,null); - updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate,null); - updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate,null); - updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); - updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + updateWrapper.in(ProjectLawsInventoryEO::getId, idList); + updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus, null); + updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null); + updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag, null); + updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag, null); + updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null); + updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null); + updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); super.update(projectLawsInventoryEO, updateWrapper); QueryWrapper processInfoQueryWrap = new QueryWrapper<>(); - processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,idList); + processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, idList); List processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap); List actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> { boolean flag = false; @@ -12089,13 +12210,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateFlowStatusBatch(JSONObject json) { String flowStatus = json.getString("flowStatus"); JSONArray lawsInventoryArray = json.getJSONArray("lawsInventoryArray"); - if(CollectionUtils.isNotEmpty(lawsInventoryArray)){ - List> lawsInventoryMapList = new ArrayList<>(); - Map lawsInventoryMap = null; + if (CollectionUtils.isNotEmpty(lawsInventoryArray)) { + List> lawsInventoryMapList = new ArrayList<>(); + Map lawsInventoryMap = null; for (Object lawsInventory : lawsInventoryArray) { - lawsInventoryMap = JSONObject.parseObject(JSONObject.toJSONString(lawsInventory),Map.class); + lawsInventoryMap = JSONObject.parseObject(JSONObject.toJSONString(lawsInventory), Map.class); lawsInventoryMapList.add(lawsInventoryMap); } List lawsInventoryIdList = lawsInventoryMapList.stream().map(e -> (String) e.get("id")).distinct().collect(Collectors.toList()); QueryWrapper pliQueryWrap = new QueryWrapper<>(); - pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,lawsInventoryIdList); + pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId, lawsInventoryIdList); List pliEoList = this.list(pliQueryWrap); - if(CollectionUtils.isNotEmpty(pliEoList) && CollectionUtils.isNotEmpty(lawsInventoryMapList)){ + if (CollectionUtils.isNotEmpty(pliEoList) && CollectionUtils.isNotEmpty(lawsInventoryMapList)) { for (Map map : lawsInventoryMapList) { String id = (String) map.get("id"); String operateType = (String) map.get("operateType"); pliEoList.forEach(pliEo -> { - if (StringUtils.equals(id,pliEo.getId())) { - if(StringUtils.contains(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_UPDATE_FLOW_STATUS.getValue())){ + if (StringUtils.equals(id, pliEo.getId())) { + if (StringUtils.contains(operateType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_UPDATE_FLOW_STATUS.getValue())) { pliEo.setDesignFlowStatus(flowStatus); } - if(StringUtils.contains(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS.getValue())){ + if (StringUtils.contains(operateType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS.getValue())) { pliEo.setVerifyFlowStatus(flowStatus); } } @@ -12147,24 +12268,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl citePliQueryWrap = new QueryWrapper<>(); - citePliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,citeProjectLibraryId); - if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ - citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getDesignFlowStatus,complianceFlowStatusList); - } else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ - citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getVerifyFlowStatus,complianceFlowStatusList); + citePliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, citeProjectLibraryId); + if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) { + citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getDesignFlowStatus, complianceFlowStatusList); + } else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) { + citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getVerifyFlowStatus, complianceFlowStatusList); } List citePliEoList = this.list(citePliQueryWrap); - if(CollectionUtils.isNotEmpty(citePliEoList)){ + if (CollectionUtils.isNotEmpty(citePliEoList)) { List citePliEoListTemp = citePliEoList.stream().filter(citePliEo -> { - boolean serialNumberFlag = (StringUtils.equals(serialNumber,citePliEo.getSerialNumber())); + boolean serialNumberFlag = (StringUtils.equals(serialNumber, citePliEo.getSerialNumber())); boolean dutyTerritoryFlag = Arrays.equals(dutyTerritory.split(","), citePliEo.getDutyTerritory().split(",")); boolean deliverableTypeFlag = false; - if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE.getValue())){ + if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE.getValue())) { String designDeliverableType = json.getString("designDeliverableType"); deliverableTypeFlag = Arrays.equals(designDeliverableType.split(","), citePliEo.getDesignDeliverableType().split(",")); - }else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE.getValue())){ + } else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE.getValue())) { String verifyDeliverableType = json.getString("verifyDeliverableType"); deliverableTypeFlag = Arrays.equals(verifyDeliverableType.split(","), citePliEo.getVerifyDeliverableType().split(",")); } @@ -12200,31 +12321,31 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl citePiQueryWrap = new QueryWrapper<>(); - citePiQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId,citePliEoId); - citePiQueryWrap.lambda().eq(ProcessInfoEO::getFlowType,flowType); + citePiQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId, citePliEoId); + citePiQueryWrap.lambda().eq(ProcessInfoEO::getFlowType, flowType); citePiQueryWrap.orderByDesc("create_time"); List citePiEoList = this.processInfoEOService.list(citePiQueryWrap); - if(CollectionUtils.isNotEmpty(citePiEoList)){ + if (CollectionUtils.isNotEmpty(citePiEoList)) { ProcessInfoEO citePiEo = citePiEoList.get(0); String citePiEoActiProcInstId = citePiEo.getActiProcInstId(); List taskDefinitionKeyList = new ArrayList<>(); - if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())) { taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue()); taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue()); - } else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + } else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())) { taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue()); taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue()); } QueryWrapper citePhQueryWrap = new QueryWrapper<>(); - citePhQueryWrap.lambda().eq(ProcessHistoryEO::getActiProcInstId,citePiEoActiProcInstId); - citePhQueryWrap.lambda().in(ProcessHistoryEO::getTaskDefinitionKey,taskDefinitionKeyList); + citePhQueryWrap.lambda().eq(ProcessHistoryEO::getActiProcInstId, citePiEoActiProcInstId); + citePhQueryWrap.lambda().in(ProcessHistoryEO::getTaskDefinitionKey, taskDefinitionKeyList); citePhQueryWrap.orderByDesc("create_time"); List citePhEoList = this.processHistoryEOService.list(citePhQueryWrap); if (CollectionUtils.isNotEmpty(citePhEoList)) { @@ -12233,28 +12354,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl compulsoryTransfer(JSONObject json) { String projectLibraryId = json.getString("projectLibraryId"); String ids = json.getString("ids"); - if(StringUtils.isEmpty(ids)){ + if (StringUtils.isEmpty(ids)) { throw new JeroBootException("请选择数据进行强制转办操作！"); } List projectLawsInventoryIdList = Arrays.asList(ids.split(",")); @@ -12263,14 +12384,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pliQueryWrap = new QueryWrapper<>(); - pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId, projectLawsInventoryIdList); List pliEoList = this.list(pliQueryWrap); - if(CollectionUtils.isNotEmpty(pliEoList)){ + if (CollectionUtils.isNotEmpty(pliEoList)) { QueryWrapper piQueryWrap = new QueryWrapper<>(); - piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList); + piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryIdList); List piEoList = this.processInfoEOService.list(piQueryWrap); - if(CollectionUtils.isNotEmpty(piEoList)){ + if (CollectionUtils.isNotEmpty(piEoList)) { if (StringUtils.isNotEmpty(designTransferUserId)) { pliEoList.forEach(pliEo -> { pliEo.setDesignDutyId(designTransferUserId); @@ -12278,12 +12399,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { pliEo.setVerifyDutyId(verifyTransferUserId); }); // 验证符合性相关待办任务强制转办 - this.verifyCompulsoryTransfer(projectLibraryId,verifyTransferUserId, pliEoList, piEoList); + this.verifyCompulsoryTransfer(projectLibraryId, verifyTransferUserId, pliEoList, piEoList); } this.updateBatchById(pliEoList); @@ -12294,6 +12415,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designPiEoList = piEoList.stream().filter(piEo -> { boolean flag = false; - if(StringUtils.equals(piEo.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){ + if (StringUtils.equals(piEo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue())) { flag = true; } return flag; @@ -12317,13 +12439,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl actiProcInstIdList = designPiEoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList()); QueryWrapper pidQueryWrap = new QueryWrapper<>(); - pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId,actiProcInstIdList); - pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue()); - pidQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKeyList); + pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId, actiProcInstIdList); + pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue()); + pidQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey, taskDefinitionKeyList); List pidEoList = this.processInfoDetailEOService.list(pidQueryWrap); - if(CollectionUtils.isNotEmpty(pidEoList)){ - pidEoList.forEach(pidEo ->{ + if (CollectionUtils.isNotEmpty(pidEoList)) { + pidEoList.forEach(pidEo -> { pidEo.setUserId(designTransferUserId); }); String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(",")); @@ -12340,7 +12462,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("userIdList",Arrays.asList(designTransferUserId.split(","))); + Map params = new HashMap<>(); + params.put("userIdList", Arrays.asList(designTransferUserId.split(","))); params.put("projectLibraryId", projectLibraryId); params.put("endTime", endTime); params.put("serialNumbers", pliEoTemp.getSerialNumber()); params.put("contentCn", contentCn); params.put("contentEn", contentEn); - params.put("id",projectLawsInventoryId); + params.put("id", projectLawsInventoryId); JSONObject sendMsgJson = new JSONObject(); - sendMsgJson.put("requestSource",RequestSourceEnum.WORK_FLOW.getValue()); - sendMsgJson.put("operatorType",OperatorTypeEnum.SEND_MSG.getValue()); + sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue()); + sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue()); sendMsgJson.put("templateId", templateId); sendMsgJson.put("params", params); this.processCall(sendMsgJson); @@ -12398,6 +12520,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl verifyPiEoList = piEoList.stream().filter(piEo -> { boolean flag = false; - if(StringUtils.equals(piEo.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){ + if (StringUtils.equals(piEo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())) { flag = true; } return flag; @@ -12422,17 +12545,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl actiProcInstIdList = verifyPiEoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList()); QueryWrapper pidQueryWrap = new QueryWrapper<>(); - pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId,actiProcInstIdList); - pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue()); - pidQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKeyList); + pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId, actiProcInstIdList); + pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue()); + pidQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey, taskDefinitionKeyList); List pidEoList = this.processInfoDetailEOService.list(pidQueryWrap); - if(CollectionUtils.isNotEmpty(pidEoList)){ - pidEoList.forEach(pidEo ->{ + if (CollectionUtils.isNotEmpty(pidEoList)) { + pidEoList.forEach(pidEo -> { pidEo.setUserId(verifyTransferUserId); }); String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(",")); - Result changeAssigneeBatchResult = this.workFlowFeignClient.changeAssigneeBatch(taskIds,verifyTransferUserId); + Result changeAssigneeBatchResult = this.workFlowFeignClient.changeAssigneeBatch(taskIds, verifyTransferUserId); if (changeAssigneeBatchResult.isSuccess()) { this.processInfoDetailEOService.updateBatchById(pidEoList); @@ -12445,7 +12568,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); - params.put("userIdList",Arrays.asList(verifyTransferUserId.split(","))); + Map params = new HashMap<>(); + params.put("userIdList", Arrays.asList(verifyTransferUserId.split(","))); params.put("projectLibraryId", projectLibraryId); params.put("endTime", endTime); params.put("serialNumbers", pliEoTemp.getSerialNumber()); params.put("contentCn", contentCn); params.put("contentEn", contentEn); - params.put("id",projectLawsInventoryId); + params.put("id", projectLawsInventoryId); JSONObject sendMsgJson = new JSONObject(); - sendMsgJson.put("requestSource",RequestSourceEnum.WORK_FLOW.getValue()); - sendMsgJson.put("operatorType",OperatorTypeEnum.SEND_MSG.getValue()); + sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue()); + sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue()); sendMsgJson.put("templateId", templateId); sendMsgJson.put("params", params); this.processCall(sendMsgJson); @@ -12500,4 +12623,53 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl>> queryDutyPersonByProjectId(Map params) { + Map>> result = new HashMap<>(); + String projectLibraryId = (String) params.get("projectLibraryId"); + if(StringUtils.isNotEmpty(projectLibraryId)){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + List pliList = this.list(queryWrapper); + List designDutyList = new ArrayList<>(); + List verifyDutyList = new ArrayList<>(); + for (ProjectLawsInventoryEO pli: pliList) { + if(StringUtils.isNotEmpty(pli.getDesignDutyId())){ + designDutyList.add(pli.getDesignDutyId()); + } + if(StringUtils.isNotEmpty(pli.getVerifyDutyId())){ + verifyDutyList.add(pli.getVerifyDutyId()); + } + } + if(CollectionUtils.isNotEmpty(designDutyList)){ + List> resList = new ArrayList<>(); + List userList = this.sysUserService.querySysUserListByIdList(designDutyList); + if(CollectionUtils.isNotEmpty(userList)){ + for (SysUser user : userList) { + Map userMap = new HashMap<>(); + userMap.put("id",user.getId()); + userMap.put("userName",user.getUsername()); + resList.add(userMap); + } + } + result.put("designDutyList",resList); + } + + if(CollectionUtils.isNotEmpty(verifyDutyList)){ + List> resList = new ArrayList<>(); + List userList = this.sysUserService.querySysUserListByIdList(verifyDutyList); + if(CollectionUtils.isNotEmpty(userList)){ + for (SysUser user : userList) { + Map userMap = new HashMap<>(); + userMap.put("id",user.getId()); + userMap.put("userName",user.getUsername()); + resList.add(userMap); + } + } + result.put("verifyDutyList",resList); + } + } + return result; + } +} \ No newline at end of file