From e909ba16760795e94a10a2d5c81f8f32e70af2c5 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 18 May 2022 17:24:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=9B=B4?= =?UTF-8?q?=E6=96=B0log=E7=BC=96=E8=BE=91+=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95log=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 19 +- .../ProjectRelatedPersonnelController.java | 2 +- .../entity/ProjectLawsInventoryEO.java | 4 + .../enums/ProjectInventoryFieldEnum.java | 29 +- .../ProjectLawsInventoryEOServiceImpl.java | 497 +++++++++++++++++- 5 files changed, 522 insertions(+), 29 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 3742beaa3..d91355e15 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -428,6 +428,22 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { Set technologyTerritorySet = new HashSet<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { + //子标题 + if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { + dummyInventoryInfoEO.setSubtitle("空"); + } + //WVTA ID + if (StringUtils.isBlank(dummyInventoryInfoEO.getWvtaId())) { + dummyInventoryInfoEO.setWvtaId("空"); + } + //备注 + if (StringUtils.isBlank(dummyInventoryInfoEO.getRemark())) { + dummyInventoryInfoEO.setRemark("空"); + } + //适用增补件 + if (StringUtils.isBlank(dummyInventoryInfoEO.getApplicableSupplement())) { + dummyInventoryInfoEO.setApplicableSupplement("空"); + } //技术领域 if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); @@ -540,7 +556,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); //设计符合性确认-交付物类型 @@ -1030,7 +1045,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); + infoEOList.add(projectLawsInventoryEO); + //查询数据库里原来的数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + List dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId())); + + //保存 saveOrUpdate(projectLawsInventoryEO); + + //翻译 + translateData(infoEOList); + translateData(dataList); + //比对不同字段 + Map infoDiff = ListDiff.compareObject(dataList.get(0),projectLawsInventoryEO); + + //设置更新log + contentLog = setContentLog(infoDiff,contentLog); + projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId()); }else { throw new JeroBootException("该用户没有权限操作该数据！"); } @@ -1354,14 +1377,34 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoList) { for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) { + //子标题 + if (StringUtils.isBlank(projectLawsInventoryEO.getSubtitle())) { + projectLawsInventoryEO.setSubtitle("空"); + } + //WVTA ID + if (StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())) { + projectLawsInventoryEO.setWvtaId("空"); + } + //备注 + if (StringUtils.isBlank(projectLawsInventoryEO.getRemark())) { + projectLawsInventoryEO.setRemark("空"); + } + //实施类别 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())) { + List implementType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue()); + String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setImplementType(implementTypeName); + } else { + projectLawsInventoryEO.setImplementType("空"); + } + + //在产车实施日期 + if (projectLawsInventoryEO.getImplementTime() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(projectLawsInventoryEO.getImplementTime()); + projectLawsInventoryEO.setImplementTimeString(dateString); + }else { + projectLawsInventoryEO.setImplementTimeString("空"); + } + + //新车型实施日期 + if (projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String(dateString); + }else { + projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String("空"); + } + + //认证类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())) { + List attestationType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); + String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setAttestationType(attestationTypeName); + } else { + projectLawsInventoryEO.setAttestationType("空"); + } + + //认证级别 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) { + List attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); + String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setAttestationRank(attestationRankName); + } else { + projectLawsInventoryEO.setAttestationRank("空"); + } + //责任领域 if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) { List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); @@ -1424,30 +1524,157 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl implementType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue()); - String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setImplementType(implementTypeName); - } else { - projectLawsInventoryEO.setImplementType("空"); + + //适用地区 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegion())) { + List region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.REGION.getValue()); + List regionList = Arrays.asList(projectLawsInventoryEO.getRegion().split(",")); + StringBuilder regionBuilder = new StringBuilder(); + for (String midRegion : regionList) { + String regionName = region.stream().filter(e -> e.getItemValue().equals(midRegion)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + regionBuilder.append(regionName).append(","); + } + projectLawsInventoryEO.setRegion(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); + }else { + projectLawsInventoryEO.setRegion("空"); } - //认证类型 - if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())) { - List attestationType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); - String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setAttestationType(attestationTypeName); - } else { - projectLawsInventoryEO.setAttestationType("空"); + + //交付物类型 + List deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); + //设计符合性确认-交付物类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { + String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName); + }else { + projectLawsInventoryEO.setDesignDeliverableType("空"); } - //认证级别 - if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) { - List attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); - String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setAttestationRank(attestationRankName); - } else { - projectLawsInventoryEO.setAttestationRank("空"); + //prehomo确认-交付物类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); + }else { + projectLawsInventoryEO.setPrehomoDeliverableType("空"); } + //验证符合性确认-交付物类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName); + }else { + projectLawsInventoryEO.setVerifyDeliverableType("空"); + } + + + List userIdList= new ArrayList<>(); + //法规工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { + userIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); + } else { + projectLawsInventoryEO.setRegulationOwnerName("空"); + } + + //认证工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { + userIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); + }else { + projectLawsInventoryEO.setHomologationEngineerName("空"); + } + + //工程接口人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { + userIdList.add(projectLawsInventoryEO.getEngineeringInterfacePerson()); + }else { + projectLawsInventoryEO.setEngineeringInterfacePersonName("空"); + } + + //发起人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { + userIdList.add(projectLawsInventoryEO.getDesignInitiatorId()); + }else { + projectLawsInventoryEO.setDesignInitiatorName("空"); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { + userIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId()); + }else { + projectLawsInventoryEO.setPrehomoInitiatorName("空"); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { + userIdList.add(projectLawsInventoryEO.getVerifyInitiatorId()); + }else { + projectLawsInventoryEO.setVerifyInitiatorName("空"); + } + + //责任人 + if (StringUtils.isBlank(projectLawsInventoryEO.getDesignDutyId())) { + userIdList.add(projectLawsInventoryEO.getDesignDutyId()); + }else { + projectLawsInventoryEO.setDesignDutyName("空"); + } + if (StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDutyId())) { + userIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); + }else { + projectLawsInventoryEO.setPrehomoDutyName("空"); + } + if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDutyId())) { + userIdList.add(projectLawsInventoryEO.getVerifyDutyId()); + }else { + projectLawsInventoryEO.setVerifyDutyName("空"); + } + + userIdList = userIdList.stream().distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + List userList = sysUserService.list(userqueryWrapper.in("id ", userIdList)); + + //法规工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setRegulationOwnerName(userName); + } + + //认证工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setHomologationEngineerName(userName); + } + + //工程接口人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); + } + + + //发起人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setDesignInitiatorName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setPrehomoInitiatorName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setVerifyInitiatorName(userName); + } + + //责任人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setDesignDutyName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setPrehomoDutyName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setVerifyDutyName(userName); + } + } + + + //截止时间 //设计符合性确认-截止时间 designDueDate if (projectLawsInventoryEO.getDesignDueDate() != null) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); @@ -1465,7 +1692,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoDiff,String contentLog) { + + //设置维护清单的修改消息 + if(MapUtils.isNotEmpty(infoDiff)) { + if (infoDiff.size() > 1) { + //子标题 + if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) { + List list = Arrays.asList(infoDiff.get("subtitle").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //WVTA ID + if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { + List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.WVTA_ID.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //实施类别 + if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { + List list = Arrays.asList(infoDiff.get("implementType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //在产车实施日期 + if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) { + List list = Arrays.asList(infoDiff.get("implementTimeString").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //新车型实施日期 + if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) { + List list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //认证类型 + if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { + List list = Arrays.asList(infoDiff.get("attestationType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //认证级别 + if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) { + List list = Arrays.asList(infoDiff.get("attestationRank").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //责任领域 + if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) { + List list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //regulationOwnerName;//法规工程师名称 + if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) { + List list = Arrays.asList(infoDiff.get("regulationOwnerName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //homologationEngineerName;//认证工程师名称 + if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) { + List list = Arrays.asList(infoDiff.get("homologationEngineerName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //engineeringInterfacePersonName;//工程接口人名称 + if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) { + List list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //适用地区region 多选 + if (StringUtils.isNotBlank(infoDiff.get("region"))) { + List list = Arrays.asList(infoDiff.get("region").split("\\|")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.REGION.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //备注 + if (StringUtils.isNotBlank(infoDiff.get("remark"))) { + List list = Arrays.asList(infoDiff.get("remark").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.REMARK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //设计符合性确认-交付物类型 + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //设计符合性确认-交付物模板 + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //设计符合性确认-发起人 + if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) { + List list = Arrays.asList(infoDiff.get("designInitiatorName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //设计符合性确认-责任人 + if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) { + List list = Arrays.asList(infoDiff.get("designDutyName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //设计符合性确认-截止时间designDueDateString; + if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) { + List list = Arrays.asList(infoDiff.get("designDueDateString").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //prehomo确认-交付物类型 + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //prehomo确认-交付物模板 + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //prehomo确认-发起人 + if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) { + List list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //prehomo确认-责任人 + if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) { + List list = Arrays.asList(infoDiff.get("prehomoDutyName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //prehomo确认-截止时间prehomoDueDateString; + if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) { + List list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + + //验证符合性确认-交付物类型 + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //验证符合性确认-交付物模板 + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //验证符合性确认-发起人 + if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) { + List list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //验证符合性确认-责任人 + if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) { + List list = Arrays.asList(infoDiff.get("verifyDutyName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + //验证符合性确认-截止时间verifyDueDateString + if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) { + List list = Arrays.asList(infoDiff.get("verifyDueDateString").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + } + } + } + + contentLog = contentLog.substring(0, contentLog.length()-1); + return contentLog; + } }