WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

虚拟清单log+发布信息内容修改

Browse Source
This commit is contained in:
xiejunyu
2022-06-14 17:18:57 +08:00
parent 3697d22e6f
commit aa55484b8f
3 changed files with 93 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+66 -63
View File
@@ -197,7 +197,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//关联删除虚拟清单保存的变动信息
LambdaQueryWrapper<DummyContentChangeEO> connectLambdaQueryWrapper = new LambdaQueryWrapper<>();
connectLambdaQueryWrapper.in(DummyContentChangeEO::getConnectId,ids);
iDummyContentChangeEOService.remove(connectLambdaQueryWrapper);
iDummyContentChangeEOService.remove(connectLambdaQueryWrapper);
LambdaQueryWrapper<DummyContentChangeEO>pidQueryWrapper = new LambdaQueryWrapper<>();
pidQueryWrapper.in(DummyContentChangeEO::getParentId,ids);
iDummyContentChangeEOService.remove(pidQueryWrapper);
@@ -316,10 +316,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
Date now = new Date();
UpdateWrapper<DummyInventoryBaseEO> 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<DummyInventoryB
.eq("is_en_log",CutEnum.EN.getValue());
List<DummyLogEO> 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("</br></br>"));
}
}
@@ -1111,8 +1114,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
if(InventoryStateEnum.ISSUE.getValue().equals(state)) {
//The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx
content = "The " + baseName + " virtual list you subscribed to has been updated.";
contentInfo = "The " + hrefUrl + " virtual list you subscribed to has been updated as follows : " + "\r\n";
contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n";
contentInfo = "The " + hrefUrl + " virtual list you subscribed to has been updated as follows : " + "</br>";
contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "</br>";
//拼接维护清单的消息
contentInfo = setContentInfo(contentInfo, baseDiff,contentLog);
contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog);
@@ -1156,7 +1159,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
List<String> 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 + ".</br>";
row++;
}
//适用说明
@@ -1164,7 +1167,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
List<String> 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 + ".</br>";
row++;
}
}
@@ -1186,10 +1189,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1199,10 +1202,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//WVTA ID
@@ -1211,10 +1214,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//适用范围applyScope 多选
@@ -1223,10 +1226,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1236,10 +1239,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}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 + "</br>";
}
}
@@ -1249,10 +1252,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1262,10 +1265,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1275,10 +1278,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1288,10 +1291,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1301,10 +1304,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1314,10 +1317,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1327,10 +1330,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1340,10 +1343,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//备注
@@ -1352,10 +1355,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1365,10 +1368,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//设计符合性确认-交付物模板
@@ -1377,10 +1380,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//设计符合性确认-发起人
@@ -1389,10 +1392,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//设计符合性确认-责任人
@@ -1401,10 +1404,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//prehomo确认-交付物类型
@@ -1413,10 +1416,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//prehomo确认-交付物模板
@@ -1425,10 +1428,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//prehomo确认-发起人
@@ -1437,10 +1440,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//prehomo确认-责任人
@@ -1449,10 +1452,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//验证符合性确认-交付物类型
@@ -1461,10 +1464,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//验证符合性确认-交付物模板
@@ -1473,10 +1476,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//验证符合性确认-发起人
@@ -1485,10 +1488,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
//验证符合性确认-责任人
@@ -1497,10 +1500,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
} else{
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
}
@@ -1510,7 +1513,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
if(StringUtils.isNotBlank(contentLog)) {
contentInfo = contentLog;
}
contentInfo = contentInfo.substring(0, contentInfo.length() - 1);
// contentInfo = contentInfo.substring(0, contentInfo.length() - 1);
return contentInfo;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+21 -13
View File
@@ -197,8 +197,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”:";
String enContentLog = username+" edited the “" + dummyInventoryInfoEO.getSerialNumber() + "” in the list:";
String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”:</br>";
String enContentLog = username+" edited the “" + dummyInventoryInfoEO.getSerialNumber() + "” in the list:</br>";
List<DummyInventoryInfoEO> infoEOList = new ArrayList<>();
infoEOList.add(dummyInventoryInfoEO);
@@ -366,7 +366,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.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<DummyInventoryI
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String contentLog = username+"批量设置了“";
String contentLog = username+"批量设置了:“";
StringBuilder contentLogBuilder = new StringBuilder(contentLog);
String enContentLog = username+" batch set “";
String enContentLog = username+" batch set :“";
StringBuilder enContentLogBuilder = new StringBuilder(enContentLog);
List<DummyInventoryInfoEO> infoListCopy = DeepCopyListUtil.depCopy(infoList);
@@ -572,13 +572,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
}
}
}
String contentIndexStart = contentLogBuilder.substring(0,contentLogBuilder.indexOf(":"));
String content= contentLogBuilder.substring(contentIndexStart.length()+1,contentLogBuilder.length());
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
contentLog += "”";
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1);
enContentLog += "”";
dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
String enContentIndexStart = enContentLogBuilder.substring(0,enContentLogBuilder.indexOf(":"));
String enContent= enContentLogBuilder.substring(enContentIndexStart.length()+1,enContentLogBuilder.length());
if(StringUtils.isNotBlank(content)){
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 5) + "”";
dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
}
if(StringUtils.isNotBlank(enContent)){
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 5) + "”";
dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
}
}
}else{
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
@@ -600,10 +608,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
}
}
public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){
return contentLogBuilder.append("\'"+ fieldName + "\'由" + oldValue + "改为了" + newValue).append(",");
return contentLogBuilder.append("\'"+ fieldName + "\'由" + oldValue + "改为了" + newValue).append("</br>");
}
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("</br>");
}
/**
* 模板下载
package-lock.json
Generated
+6
View File
@@ -0,0 +1,6 @@
{
"name": "laws-weilai",
"lockfileVersion": 2,
"requires": true,
"packages": {}
}