diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseDictCodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseDictCodeEnum.java deleted file mode 100644 index 2f6c51366..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseDictCodeEnum.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.jero.modules.dummy.enums; - - -public enum DummyInventoryBaseDictCodeEnum { - DUTY_TERRITORY("责任领域","duty_territory"), - IMPLEMENT_TYPE("实施类别","implement_type"), - ATTESTATION_TYPE("认证类型","attestation_type"), - ATTESTATION_RANK("认证级别","attestation_rank"), - DELIVERABLE_TEMPLATE("交付物类型","deliverable_template"), - FA1_QI3_REN2("发起人","fa1_qi3_ren2"), - ZE2_REN2_REN2("责任人","ze2_ren4_ren2"), - SHI4_YONG4_FAN4_WEI2("适用范围","apply_scope"), - REGION("适用地区","region"), - - ; - - - String name; - String value; - - private DummyInventoryBaseDictCodeEnum(String name, String value) { - this.name = name; - this.value = value; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java new file mode 100644 index 000000000..dd8df35cf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java @@ -0,0 +1,60 @@ +package com.jero.modules.dummy.enums; + + +public enum DummyInventoryBaseFieldEnum { + TECHNOLOGY_TERRITORY("技术领域","technology_territory"), + DUTY_TERRITORY("责任领域","duty_territory"), + IMPLEMENT_TYPE("实施类别","implement_type"), + ATTESTATION_TYPE("认证类型","attestation_type"), + ATTESTATION_RANK("认证级别","attestation_rank"), + DELIVERABLE_TEMPLATE("交付物类型","deliverable_template"), + FA1_QI3_REN2("发起人","fa1_qi3_ren2"), + ZE2_REN2_REN2("责任人","ze2_ren4_ren2"), + SHI4_YONG4_FAN4_WEI2("适用范围","apply_scope"), + REGION("适用地区","region"), + XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期","xin1_che1_xing2_shi2_shi1_ri4_qi1"), + IMPLEMENT_TIME("在产车实施日期","implement_time"), + WVTA_ID("WVTA ID","wvta_id"), + SUBTITLE("子标题","subtitle"), + REMARK("备注","remark"), + DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型","deliverable_template"), + DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板","design_deliverable_template"), + DESIGN_INITIATOR("设计符合性确认-发起人","fa1_qi3_ren2"), + DESIGN_DUTY("设计符合性确认-责任人","ze2_ren4_ren2"), + + PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型","deliverable_template"), + PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板","prehomo_deliverable_template"), + PREHOMO_INITIATOR("prehomo确认-发起人","fa1_qi3_ren2"), + PREHOMO_DUTY("prehomo确认-责任人","ze2_ren4_ren2"), + + VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型","deliverable_template"), + VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板","verify_deliverable_template"), + VERIFY_INITIATOR("验证符合性确认-发起人","fa1_qi3_ren2"), + VERIFY_DUTY("验证符合性确认-责任人","ze2_ren4_ren2"), + ; + + + String name; + String value; + + private DummyInventoryBaseFieldEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} 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 c6ddb3d27..2977294a0 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 @@ -13,19 +13,13 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.domain.service.DomainUserRelService; -import com.jero.modules.dummy.entity.DummyContentChangeEO; -import com.jero.modules.dummy.entity.DummyInventoryBaseEO; -import com.jero.modules.dummy.entity.DummyInventoryInfoEO; -import com.jero.modules.dummy.entity.DummyReadEO; -import com.jero.modules.dummy.enums.DummyInventoryBaseDictCodeEnum; +import com.jero.modules.dummy.entity.*; +import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.enums.InventoryStateEnum; import com.jero.modules.dummy.enums.ReadFlagEnum; import com.jero.modules.dummy.mapper.DummyContentChangeEOMapper; import com.jero.modules.dummy.mapper.DummyInventoryBaseEOMapper; -import com.jero.modules.dummy.service.IDummyContentChangeEOService; -import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; -import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; -import com.jero.modules.dummy.service.IDummyReadEOService; +import com.jero.modules.dummy.service.*; import com.jero.modules.dummy.util.ListDiff; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.system.entity.SysAnnouncement; @@ -84,6 +78,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { Set technologyTerritorySet = new HashSet<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { @@ -464,7 +474,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl shi4Yong4Fan4Wei2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.SHI4_YONG4_FAN4_WEI2.getValue()); + 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) { @@ -475,7 +485,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.REGION.getValue()); + List region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.REGION.getValue()); List regionList = Arrays.asList(dummyInventoryInfoEO.getRegion().split(",")); StringBuilder regionBuilder = new StringBuilder(); for (String midRegion : regionList) { @@ -486,7 +496,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.DUTY_TERRITORY.getValue()); + List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue()); List dutyTerritoryList = Arrays.asList(dummyInventoryInfoEO.getDutyTerritory().split(",")); StringBuilder dutyTerritoryBuilder = new StringBuilder(); for (String midDutyTerritory : dutyTerritoryList) { @@ -497,24 +507,24 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.IMPLEMENT_TYPE.getValue()); + List implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getValue()); String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); dummyInventoryInfoEO.setImplementType(implementTypeName); } //认证级别 if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { - List attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_TYPE.getValue()); + List 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); } //认证级别 if (StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { - List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_RANK.getValue()); + List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue()); String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); dummyInventoryInfoEO.setAttestationRank(attestationRankName); } //交付物类型 - List deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.DELIVERABLE_TEMPLATE.getValue()); + List deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); //设计符合性确认-交付物类型 if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); @@ -532,7 +542,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.FA1_QI3_REN2.getValue()); + List fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue()); //设计符合性确认-发起人 if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignInitiator())) { String designInitiatorName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignInitiator())).map(f -> f.getItemText()).collect(Collectors.joining(",")); @@ -550,7 +560,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl ze2_ren4_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ZE2_REN2_REN2.getValue()); + List ze2_ren4_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ZE2_REN2_REN2.getValue()); //设计符合性确认-责任人 if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDuty())) { String designDutyName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDuty())).map(f -> f.getItemText()).collect(Collectors.joining(",")); @@ -593,7 +603,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl baseDiff, List> infoDiffList - , String addSerialNumber, String deleteSerialNumber) { + , String addSerialNumber, String deleteSerialNumber,String idTemp) { int row = 1; + String contentLog = null; //设置虚拟清单列表的修改消息 if(MapUtils.isNotEmpty(baseDiff)) { //虚拟清单名称 @@ -671,6 +682,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl