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 d087c27aa..096561fef 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 @@ -197,7 +197,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl connectLambdaQueryWrapper = new LambdaQueryWrapper<>(); connectLambdaQueryWrapper.in(DummyContentChangeEO::getConnectId,ids); - iDummyContentChangeEOService.remove(connectLambdaQueryWrapper); + iDummyContentChangeEOService.remove(connectLambdaQueryWrapper); LambdaQueryWrapperpidQueryWrapper = new LambdaQueryWrapper<>(); pidQueryWrapper.in(DummyContentChangeEO::getParentId,ids); iDummyContentChangeEOService.remove(pidQueryWrapper); @@ -316,10 +316,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl baseWrapper=new UpdateWrapper<>(); - baseWrapper.set("update_by",sysUser.getUsername()) - .set("update_time",now) - .set("state",dummyInventoryBaseEO.getState()) - .eq("id",dummyInventoryBaseEO.getId()); + baseWrapper.set("state",dummyInventoryBaseEO.getState()); + + if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState())){ + baseWrapper.set("update_by",sysUser.getUsername()) + .set("update_time",now); + } + baseWrapper.eq("id",dummyInventoryBaseEO.getId()); dummyInventoryBaseEOMapper.update(null,baseWrapper); // this.updateById(dummyInventoryBaseEO); //不管有没有维护清单,都返回操作成功 @@ -415,7 +418,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl updateLogList = dummyLogEOService.list(logEOQueryWrapper); if(CollectionUtils.isNotEmpty(updateLogList)){ - contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining(",")); + contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining("

")); } } @@ -1111,8 +1114,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; + contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "
"; //拼接维护清单的消息 contentInfo = setContentInfo(contentInfo, baseDiff,contentLog); contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog); @@ -1156,7 +1159,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl nameList = Arrays.asList(baseDiff.get("name").split(",")); String baseDiffOldName = nameList.get(0); String baseDiffNewName = nameList.get(1); - contentInfo += row + ". The name of virtual list has been changed from " + baseDiffOldName + " to " + baseDiffNewName + ".\r\n"; + contentInfo += row + ". The name of virtual list has been changed from " + baseDiffOldName + " to " + baseDiffNewName + ".
"; row++; } //适用说明 @@ -1164,7 +1167,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl useExplainList = Arrays.asList(baseDiff.get("useExplain").split(",")); String baseDiffOldUseExplain = useExplainList.get(0); String baseDiffNewUseExplain = useExplainList.get(1); - contentInfo += row + ". The applicable instructions of virtual list has been changed from " + baseDiffOldUseExplain + " to " + baseDiffNewUseExplain + ".\r\n"; + contentInfo += row + ". The applicable instructions of virtual list has been changed from " + baseDiffOldUseExplain + " to " + baseDiffNewUseExplain + ".
"; row++; } } @@ -1186,10 +1189,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1199,10 +1202,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //WVTA ID @@ -1211,10 +1214,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //适用范围applyScope 多选 @@ -1223,10 +1226,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1236,10 +1239,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1249,10 +1252,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1262,10 +1265,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1275,10 +1278,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1288,10 +1291,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1301,10 +1304,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1314,10 +1317,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1327,10 +1330,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1340,10 +1343,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //备注 @@ -1352,10 +1355,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1365,10 +1368,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //设计符合性确认-交付物模板 @@ -1377,10 +1380,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //设计符合性确认-发起人 @@ -1389,10 +1392,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //设计符合性确认-责任人 @@ -1401,10 +1404,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //prehomo确认-交付物类型 @@ -1413,10 +1416,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //prehomo确认-交付物模板 @@ -1425,10 +1428,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //prehomo确认-发起人 @@ -1437,10 +1440,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //prehomo确认-责任人 @@ -1449,10 +1452,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //验证符合性确认-交付物类型 @@ -1461,10 +1464,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //验证符合性确认-交付物模板 @@ -1473,10 +1476,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; }else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //验证符合性确认-发起人 @@ -1485,10 +1488,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } //验证符合性确认-责任人 @@ -1497,10 +1500,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; } else{ - contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; } } @@ -1510,7 +1513,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; + String enContentLog = username+" edited the “" + dummyInventoryInfoEO.getSerialNumber() + "” in the list:
"; List infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); @@ -366,7 +366,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); String contentLog = username+"复制了“"+serialNumber+"”"; - String enContentLog = username+" copied “"+serialNumber+"”"; + String enContentLog = username+" copied “"+serialNumber+"”."; dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } @@ -473,9 +473,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoListCopy = DeepCopyListUtil.depCopy(infoList); @@ -572,13 +572,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl"); } public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ - return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append(","); + return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append("
"); } /** * 模板下载 diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..4ef126a74 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "laws-weilai", + "lockfileVersion": 2, + "requires": true, + "packages": {} +}