虚拟清单-更新log

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseDictCodeEnum.java

@@ -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;
-    }
-}

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;
+    }
+}

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.*;
-import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
+import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum;
-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.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.*;
-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.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<DummyInventoryB
     private SysDictItemMapper sysDictItemMapper;
     @Autowired
     private DummyContentChangeEOMapper dummyContentChangeEOMapper;
+    @Autowired
+    private IDummyLogEOService dummyLogEOService;
     /**
      * 保存
      *
@@ -389,8 +385,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     //向订阅该领域管理的人发消息和飞书
                     sendMsg(baseDiff, dummyContentChangeEOBaseList.get(0).getConnectId(), infoDiffList, addSerialNumber, deleteSerialNumber,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
 
-                    //更新log
+
-                    // updateLog(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList, cut);
 
                     Date now=new Date();
                     LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -426,6 +421,21 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
         }
     }
 
+    /**
+     * 设置更新log
+     *
+     */
+    private void updateLog(String contentLog,String baseId) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (StringUtils.isNotBlank(contentLog)) {
+            DummyLogEO dummyLogEO = new DummyLogEO();
+            dummyLogEO.setDummyInventoryBaseId(baseId);
+            dummyLogEO.setLogContent(contentLog);
+            dummyLogEO.setCreateBy(sysUser.getUsername());
+            dummyLogEOService.add(dummyLogEO);
+        }
+    }
+
     public void disposeData(List<DummyInventoryInfoEO> records) {
         Set<String> technologyTerritorySet = new HashSet<>();
         for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
@@ -464,7 +474,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
             //适用范围
             if (StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())) {
-                List<SysDictItem> shi4Yong4Fan4Wei2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.SHI4_YONG4_FAN4_WEI2.getValue());
+                List<SysDictItem> shi4Yong4Fan4Wei2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getValue());
                 List<String> shi4Yong4Fan4Wei2List = Arrays.asList(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2().split(","));
                 StringBuilder shi4Yong4Fan4Wei2Builder = new StringBuilder();
                 for (String midshi4Yong4Fan4Wei2 : shi4Yong4Fan4Wei2List) {
@@ -475,7 +485,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             }
             //适用地区
             if (StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())) {
-                List<SysDictItem> region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.REGION.getValue());
+                List<SysDictItem> region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.REGION.getValue());
                 List<String> regionList = Arrays.asList(dummyInventoryInfoEO.getRegion().split(","));
                 StringBuilder regionBuilder = new StringBuilder();
                 for (String midRegion : regionList) {
@@ -486,7 +496,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             }
             //责任领域
             if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) {
-                List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.DUTY_TERRITORY.getValue());
+                List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue());
                 List<String> dutyTerritoryList = Arrays.asList(dummyInventoryInfoEO.getDutyTerritory().split(","));
                 StringBuilder dutyTerritoryBuilder = new StringBuilder();
                 for (String midDutyTerritory : dutyTerritoryList) {
@@ -497,24 +507,24 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             }
             //实施类别
             if (StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) {
-                List<SysDictItem> implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.IMPLEMENT_TYPE.getValue());
+                List<SysDictItem> 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<SysDictItem> attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_TYPE.getValue());
+                List<SysDictItem> 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<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_RANK.getValue());
+                List<SysDictItem> 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<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.DELIVERABLE_TEMPLATE.getValue());
+            List<SysDictItem> 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<DummyInventoryB
             }
 
             //发起人
-            List<SysDictItem> fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.FA1_QI3_REN2.getValue());
+            List<SysDictItem> 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<DummyInventoryB
             }
 
             //责任人
-            List<SysDictItem> ze2_ren4_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ZE2_REN2_REN2.getValue());
+            List<SysDictItem> 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<DummyInventoryB
                     content = "The " + baseName + " virtual list you subscribed to has been updated.";
                     contentInfo = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n";
                     //拼接维护清单的消息
-                    contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber);
+                    contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,idTemp);
 
                 }else{//撤回的消息
                     content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
@@ -623,8 +633,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     }
     //拼接维护清单的消息
     public String setContentInfo(String contentInfo, Map<String, String> baseDiff, List<Map<String, String>> 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<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Technology territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //新车型实施日期
                     if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1"))) {
@@ -679,6 +693,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). The implementation date of new model has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //在产车实施日期
                     if (StringUtils.isNotBlank(infoDiff.get("implementTime"))) {
@@ -687,6 +704,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Implement time has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //WVTA ID
                     if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
@@ -695,6 +715,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). WVTA ID has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //子标题
                     if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) {
@@ -703,6 +726,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Subtitle has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //实施类别
                     if (StringUtils.isNotBlank(infoDiff.get("implementType"))) {
@@ -711,6 +737,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Implement type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //认证类型
                     if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
@@ -719,6 +748,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Attestation type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //认证级别
                     if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) {
@@ -727,6 +759,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Attestation rank has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //责任领域
                     if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
@@ -735,6 +770,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Duty territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //备注
                     if (StringUtils.isNotBlank(infoDiff.get("remark"))) {
@@ -743,6 +781,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);
                         contentInfo += "(" + infoDiffRow + "). Remark has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.REMARK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //设计符合性确认-交付物类型
                     if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) {
@@ -751,6 +792,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Design deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //设计符合性确认-交付物模板
                     if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) {
@@ -759,6 +803,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Design deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //设计符合性确认-发起人
                     if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) {
@@ -767,6 +814,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Design initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //设计符合性确认-责任人
                     if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) {
@@ -775,6 +825,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Design duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //prehomo确认-交付物类型
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) {
@@ -783,6 +836,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Prehomo deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //prehomo确认-交付物模板
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) {
@@ -791,6 +847,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Prehomo deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //prehomo确认-发起人
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) {
@@ -799,6 +858,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Prehomo initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //prehomo确认-责任人
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) {
@@ -807,6 +869,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Prehomo duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //验证符合性确认-交付物类型
                     if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) {
@@ -815,6 +880,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Verify deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //验证符合性确认-交付物模板
                     if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) {
@@ -823,6 +891,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Verify deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //验证符合性确认-发起人
                     if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) {
@@ -831,6 +902,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Verify initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     //验证符合性确认-责任人
                     if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) {
@@ -839,6 +913,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffNew = list.get(1);//需要翻译
                         contentInfo += "(" + infoDiffRow + "). Verify duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                         infoDiffRow++;
+                        //更新log
+                        contentLog = DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew;
+                        updateLog(contentLog,idTemp);
                     }
                     row++;
                 }