From 203a3e76425a3a467d5f7be7a32c12a242c92e8a Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 27 May 2022 14:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95log?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysCategoryServiceImpl.java | 14 +- .../impl/DummyInventoryBaseEOServiceImpl.java | 350 ++++++++++++++---- .../impl/DummyInventoryInfoEOServiceImpl.java | 92 +++-- .../modules/dummy/util/DeepCopyListUtil.java | 29 ++ 4 files changed, 377 insertions(+), 108 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/DeepCopyListUtil.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 1a4378af4..aa7d80250 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -355,9 +355,7 @@ public class SysCategoryServiceImpl extends ServiceImpl e.setSortOrder(e.getSortOrder() + 1)); @@ -400,14 +398,14 @@ public class SysCategoryServiceImpl extends ServiceImpl 1) { + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); - break; - }else{ - break; + if(geOrderNumList.size()!=(i+1)) { + break; + } } } 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 2f03fd3de..7ff33c661 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 @@ -446,7 +446,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { Set technologyTerritorySet = new HashSet<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { @@ -545,14 +545,22 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getValue()); - String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setAttestationType(attestationTypeName); - }else { + List attestationTypeList = Arrays.asList(dummyInventoryInfoEO.getAttestationType().split(",")); + StringBuilder attestationTypeBuilder = new StringBuilder(); + for (String midAttestationType : attestationTypeList) { + String dutyTerritoryName = attestationType.stream().filter(e -> e.getItemValue().equals(midAttestationType)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + attestationTypeBuilder.append(dutyTerritoryName).append(","); + } + dummyInventoryInfoEO.setAttestationType(attestationTypeBuilder.substring(0, attestationTypeBuilder.toString().length() - 1)); + } + else { dummyInventoryInfoEO.setAttestationType("空"); } + //认证级别 if (StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue()); @@ -652,6 +660,212 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { + Set technologyTerritorySet = new HashSet<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { + //子标题 + if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { + dummyInventoryInfoEO.setSubtitle("null"); + } + //WVTA ID + if (StringUtils.isBlank(dummyInventoryInfoEO.getWvtaId())) { + dummyInventoryInfoEO.setWvtaId("null"); + } + //备注 + if (StringUtils.isBlank(dummyInventoryInfoEO.getRemark())) { + dummyInventoryInfoEO.setRemark("null"); + } + //适用增补件 + if (StringUtils.isBlank(dummyInventoryInfoEO.getApplicableSupplement())) { + dummyInventoryInfoEO.setApplicableSupplement("null"); + } + //技术领域 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { + List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); + technologyTerritorySet.addAll(list); + } + //树形结构数据字典(技术领域) + List categoryList = new ArrayList<>(); + if (technologyTerritorySet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, technologyTerritorySet); + categoryList = sysCategoryService.list(wrapper); + } + //技术领域 + if (categoryList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { + List technologyTerritoryList = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); + StringBuilder sb = new StringBuilder(); + for (String technologyTerritory : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); + if (collect.size() != 0) { + sb.append(collect.get(0).getEnName() + ","); + } + } + String technologyTerritoryName = null; + if (StringUtils.isNotBlank(sb)) { + technologyTerritoryName = sb.substring(0, sb.length() - 1); + } + dummyInventoryInfoEO.setTechnologyTerritoryName(technologyTerritoryName); + }else{ + dummyInventoryInfoEO.setTechnologyTerritoryName("null"); + } + + //适用范围 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())) { + List shi4Yong4Fan4Wei2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getValue()); + List shi4Yong4Fan4Wei2List = Arrays.asList(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2().split(",")); + StringBuilder shi4Yong4Fan4Wei2Builder = new StringBuilder(); + for (String midshi4Yong4Fan4Wei2 : shi4Yong4Fan4Wei2List) { + String shi4Yong4Fan4Wei2EnName = shi4Yong4Fan4Wei2.stream().filter(e -> e.getItemValue().equals(midshi4Yong4Fan4Wei2)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + shi4Yong4Fan4Wei2Builder.append(shi4Yong4Fan4Wei2EnName).append(","); + } + dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(shi4Yong4Fan4Wei2Builder.substring(0, shi4Yong4Fan4Wei2Builder.toString().length() - 1)); + }else{ + dummyInventoryInfoEO.setShi4Yong4Fan4Wei2("null"); + } + //适用地区 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())) { + List region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.REGION.getValue()); + List regionList = Arrays.asList(dummyInventoryInfoEO.getRegion().split(",")); + StringBuilder regionBuilder = new StringBuilder(); + for (String midRegion : regionList) { + String regionEnName = region.stream().filter(e -> e.getItemValue().equals(midRegion)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + regionBuilder.append(regionEnName).append(","); + } + dummyInventoryInfoEO.setRegion(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); + }else { + dummyInventoryInfoEO.setRegion("null"); + } + //责任领域 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { + List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue()); + List dutyTerritoryList = Arrays.asList(dummyInventoryInfoEO.getDutyTerritory().split(",")); + StringBuilder dutyTerritoryBuilder = new StringBuilder(); + for (String midDutyTerritory : dutyTerritoryList) { + String dutyTerritoryEnName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dutyTerritoryBuilder.append(dutyTerritoryEnName).append(","); + } + dummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1)); + } + else { + dummyInventoryInfoEO.setDutyTerritory("null"); + } + //实施类别 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { + List implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getValue()); + String implementTypeEnName = implementType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setImplementType(implementTypeEnName); + }else { + dummyInventoryInfoEO.setImplementType("null"); + } + //认证类型 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { + List attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getValue()); + String attestationTypeEnName = attestationType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setAttestationType(attestationTypeEnName); + }else { + dummyInventoryInfoEO.setAttestationType("null"); + } + //认证级别 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { + List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue()); + String attestationRankEnName = attestationRank.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setAttestationRank(attestationRankEnName); + }else { + dummyInventoryInfoEO.setAttestationRank("null"); + } + //新车型实施日期 + if (dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String(dateString); + }else { + dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String("null"); + } + //在产车实施日期 + if (dummyInventoryInfoEO.getImplementTime() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(dummyInventoryInfoEO.getImplementTime()); + dummyInventoryInfoEO.setImplementTimeString(dateString); + }else { + dummyInventoryInfoEO.setImplementTimeString("null"); + } + + //交付物类型 + List deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); + //设计符合性确认-交付物类型 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { + String designDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeEnName); + }else { + dummyInventoryInfoEO.setDesignDeliverableType("null"); + } + //prehomo确认-交付物类型 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + String prehomoDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeEnName); + }else { + dummyInventoryInfoEO.setPrehomoDeliverableType("null"); + } + //验证符合性确认-交付物类型 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + String verifyDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeEnName); + }else { + dummyInventoryInfoEO.setVerifyDeliverableType("null"); + } + + //发起人 + List fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue()); + //设计符合性确认-发起人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignInitiator())) { + String designInitiatorEnName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignInitiator())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignInitiator(designInitiatorEnName); + }else { + dummyInventoryInfoEO.setDesignInitiator("null"); + } + //prehomo确认-发起人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoInitiator())) { + String prehomoInitiatorEnName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoInitiator())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoInitiator(prehomoInitiatorEnName); + }else { + dummyInventoryInfoEO.setPrehomoInitiator("null"); + } + //验证符合性确认-发起人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyInitiator())) { + String verifyInitiatorEnName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyInitiator())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyInitiator(verifyInitiatorEnName); + }else { + dummyInventoryInfoEO.setVerifyInitiator("null"); + } + + //责任人 + List ze2_ren4_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ZE2_REN2_REN2.getValue()); + //设计符合性确认-责任人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDuty())) { + String designDutyEnName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDuty())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignDuty(designDutyEnName); + }else { + dummyInventoryInfoEO.setDesignDuty("null"); + } + //prehomo确认-责任人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDuty())) { + String prehomoDutyEnName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDuty())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoDuty(prehomoDutyEnName); + }else { + dummyInventoryInfoEO.setPrehomoDuty("null"); + } + //验证符合性确认-责任人 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDuty())) { + String verifyDutyEnName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDuty())).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyDuty(verifyDutyEnName); + }else { + dummyInventoryInfoEO.setVerifyDuty("null"); + } + + } + } //发送消息 private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList, String addSerialNumber,String deleteSerialNumber,String state,String cut) { @@ -701,7 +915,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl nameList = Arrays.asList(baseDiff.get("name").split(",")); @@ -731,23 +945,35 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoDiff : infoDiffList) { if (infoDiff.size() > 1) { - int infoDiffRow = 1; contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; + contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog); + } + } + } + return contentInfo; + } + + public String setInfoDiffListContent(String contentInfo, List> infoDiffList,String contentLog){ + //设置维护清单的修改消息 + if(CollectionUtils.isNotEmpty(infoDiffList)) { + for (Map infoDiff : infoDiffList) { + if (infoDiff.size() > 1) { + + // contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; //标题 if (StringUtils.isNotBlank(infoDiff.get("title"))) { List list = Arrays.asList(infoDiff.get("title").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { - contentInfo += "(" + infoDiffRow + "). Title has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; + contentInfo += DummyInventoryBaseFieldEnum.TITLE.getEnName() +" has been changed from " + infoDiffOld + " to " + infoDiffNew + ","; + }else{ - contentLog += DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += DummyInventoryBaseFieldEnum.TITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; } } //子标题 @@ -756,8 +982,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); + List infoEOListCopy = new ArrayList<>(); + infoEOListCopy.add(dummyInventoryInfoEOCopy); + //查询数据库里原来的数据 QueryWrapper queryWrapper = new QueryWrapper<>(); List dataList = list(queryWrapper.eq("id", dummyInventoryInfoEO.getId())); + List dataListCopy = DeepCopyListUtil.depCopy(dataList); saveOrUpdate(dummyInventoryInfoEO); - //翻译 + //翻译-中文 dummyInventoryBaseEOService.disposeData(infoEOList); dummyInventoryBaseEOService.disposeData(dataList); + //翻译-英文 + dummyInventoryBaseEOService.disposeDataToEn(infoEOListCopy); + dummyInventoryBaseEOService.disposeDataToEn(dataListCopy); + //比对不同字段 Map infoDiff = ListDiff.compareObject(dataList.get(0),dummyInventoryInfoEO); + Map infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),dummyInventoryInfoEOCopy); //设置更新log List> infoDiffList = new ArrayList<>(); infoDiffList.add(infoDiff); - contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog); - enContentLog=contentLog.replace("由"," changed from ") - .replace("改为"," to "); + List> infoDiffListEn = new ArrayList<>(); + infoDiffListEn.add(infoDiffEn); +// contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog); +// enContentLog=dummyInventoryBaseEOService.setContentInfo(enContentLog,null,infoDiffListEn,null,null,null); + + contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog); + enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null); + dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); } @@ -368,12 +385,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoListCopy = DeepCopyListUtil.depCopy(infoList); //根据id查询数据库中完整信息,翻译 -// List idList = Arrays.asList(dummyInventoryInfoEO.getIds().split(",")); -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// List infoList = list(queryWrapper.in("id", idList)); -// String projectId = infoList.get(0).getDummyInventoryBaseId(); dummyInventoryBaseEOService.disposeData(infoList); + dummyInventoryBaseEOService.disposeDataToEn(infoListCopy); //翻译传入的数据 List inputList = new ArrayList<>(); @@ -383,78 +398,79 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl id.equals(e.getId())).collect(Collectors.toList()).get(0); + DummyInventoryInfoEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); contentLogBuilder.append(info.getSerialNumber() + ":"); - enContentLogBuilder.append(info.getSerialNumber() + ":"); + enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO(); dummyInventoryInfoEOTemp.setId(id); //实施类别 implementType if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { - if (StringUtils.isBlank(info.getImplementType())){ + /*if (StringUtils.isBlank(info.getImplementType())){ info.setImplementType("空"); - } - if (!info.getImplementType().equals(inputInfoEO.getImplementType())) { + }*/ + if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); - setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), info.getImplementType(), inputInfoEO.getImplementType()); + setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType()); } } //认证类型 attestationType if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { - if (StringUtils.isBlank(info.getAttestationType())){ + /*if (StringUtils.isBlank(info.getAttestationType())){ info.setAttestationType("空"); - } - if (!info.getAttestationType().equals(inputInfoEO.getAttestationType())) { + }*/ + if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), info.getAttestationType(), inputInfoEO.getAttestationType()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType()); } } //认证级别 attestationRank if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { - if (StringUtils.isBlank(info.getAttestationRank())){ + /*if (StringUtils.isBlank(info.getAttestationRank())){ info.setAttestationRank("空"); - } - if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank())){ + }*/ + if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank()); } } //责任领域 dutyTerritory if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { - if (StringUtils.isBlank(info.getDutyTerritory())){ + /*if (StringUtils.isBlank(info.getDutyTerritory())){ info.setDutyTerritory("空"); - } - if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){ + }*/ + if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory()) && !inputInfoEO.getDutyTerritory().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory()); } } //适用范围 shi4Yong4Fan4Wei2 if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){ - if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){ + /*if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){ info.setShi4Yong4Fan4Wei2("空"); - } - if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2())) { + }*/ + if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2()) && !inputInfoEO.getShi4Yong4Fan4Wei2().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),infoCopy.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); } } //技术领域 technologyTerritory if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){ - if (StringUtils.isBlank(info.getTechnologyTerritoryName())){ + /*if (StringUtils.isBlank(info.getTechnologyTerritoryName())){ info.setTechnologyTerritoryName("空"); - } - if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName())) { + }*/ + if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName()) && !inputInfoEO.getTechnologyTerritoryName().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),infoCopy.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); } } //适用地区 region if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){ - if (StringUtils.isBlank(info.getRegion())){ + /*if (StringUtils.isBlank(info.getRegion())){ info.setRegion("空"); - } - if (!info.getRegion().equals(inputInfoEO.getRegion())) { + }*/ + if (!info.getRegion().equals(inputInfoEO.getRegion()) && !inputInfoEO.getRegion().equals("空")){ setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),info.getRegion(),inputInfoEO.getRegion()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),infoCopy.getRegion(),inputInfoEO.getRegion()); } } //新车实施日期 @@ -485,7 +501,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl List depCopy(List srcList) { + ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); + try { + ObjectOutputStream out = new ObjectOutputStream(byteOut); + out.writeObject(srcList); + + ByteArrayInputStream byteIn = new ByteArrayInputStream(byteOut.toByteArray()); + ObjectInputStream inStream = new ObjectInputStream(byteIn); + List destList = (List) inStream.readObject(); + return destList; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + +}