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-05-30 11:31:16 +08:00
parent dcd334f5e8
commit 22a7491add
5 changed files with 173 additions and 58 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/entity/DummyInventoryInfoEO.java
+3 -3
View File
@@ -174,7 +174,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**设计符合性确认-交付物类型*/ /**设计符合性确认-交付物类型*/
@Excel(name = "设计-交付物类型", width = 15,dicCode ="deliverable_template") @Excel(name = "设计-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型") @ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template") // @Dict(dicCode ="deliverable_template")
private java.lang.String designDeliverableType; private java.lang.String designDeliverableType;
@TableField(exist = false) @TableField(exist = false)
@@ -204,7 +204,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**prehomo确认-交付物类型*/ /**prehomo确认-交付物类型*/
@Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "prehomo确认-交付物类型") @ApiModelProperty(value = "prehomo确认-交付物类型")
@Dict(dicCode ="deliverable_template") // @Dict(dicCode ="deliverable_template")
private java.lang.String prehomoDeliverableType; private java.lang.String prehomoDeliverableType;
@TableField(exist = false) @TableField(exist = false)
private java.lang.String prehomoDeliverableTypeName; private java.lang.String prehomoDeliverableTypeName;
@@ -233,7 +233,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**验证符合性确认-交付物类型*/ /**验证符合性确认-交付物类型*/
@Excel(name = "验证-交付物类型", width = 15,dicCode ="deliverable_template") @Excel(name = "验证-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型") @ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template") // @Dict(dicCode ="deliverable_template")
private java.lang.String verifyDeliverableType; private java.lang.String verifyDeliverableType;
@TableField(exist = false) @TableField(exist = false)
private java.lang.String verifyDeliverableTypeName; private java.lang.String verifyDeliverableTypeName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java
+1 -1
View File
@@ -17,7 +17,7 @@ public enum DummyInventoryBaseFieldEnum {
APPLICABLE_SUPPLEMENT("适用增补件", "applicable_supplement","Applicable Supplement"), APPLICABLE_SUPPLEMENT("适用增补件", "applicable_supplement","Applicable Supplement"),
REMARK("备注", "remark","Comments"), REMARK("备注", "remark","Comments"),
DELIVERABLE_TEMPLATE("交付物类型", "deliverable_template","Type of deliverables"), DELIVERABLE_TEMPLATE("交付物类型", "jiao1_fu4_wu4_lei4_xing2","Type of deliverables"),
FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"), FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"),
ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"), ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+158 -46
View File
@@ -426,8 +426,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(",")); String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
iDummyContentChangeEOService.saveBatch(list); iDummyContentChangeEOService.saveBatch(list);
sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut()); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
// private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList, // private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
// String addSerialNumber,String deleteSerialNumber,String state,String cut) { // String addSerialNumber,String deleteSerialNumber,String state,String cut) {
}else { }else {
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("维护清单为空,发布失败"); throw new JeroBootException("维护清单为空,发布失败");
@@ -448,7 +448,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
//翻译成中文名 //翻译成中文名
public void disposeData(List<DummyInventoryInfoEO> records) { public void disposeData(List<DummyInventoryInfoEO> records) {
Set<String> technologyTerritorySet = new HashSet<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
//子标题 //子标题
if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) {
@@ -467,6 +467,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyInventoryInfoEO.setApplicableSupplement("空"); dummyInventoryInfoEO.setApplicableSupplement("空");
} }
//技术领域 //技术领域
Set<String> technologyTerritorySet = new HashSet<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) {
List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(","));
technologyTerritorySet.addAll(list); technologyTerritorySet.addAll(list);
@@ -587,29 +588,85 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
//交付物类型 //交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); Set<String> deliverableTypeSet = new HashSet<>();
//设计符合性确认-交付物类型 List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(","));
dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeName); deliverableTypeSet.addAll(designDeliverableTypeIdList);
}else { }
dummyInventoryInfoEO.setDesignDeliverableType("空"); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getName() + ",");
}
}
String designName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designName = designBuilder.substring(0, designBuilder.length() - 1);
}
dummyInventoryInfoEO.setDesignDeliverableTypeName(designName);
} else {
dummyInventoryInfoEO.setDesignDeliverableTypeName("空");
} }
//prehomo确认-交付物类型 //prehomo确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); StringBuilder prehomoBuilder = new StringBuilder();
dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); for(String id : prehomoDeliverableTypeIdList){
}else { List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
dummyInventoryInfoEO.setPrehomoDeliverableType("空"); if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getName() + ",");
}
}
String prehomoName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoName);
} else {
dummyInventoryInfoEO.setPrehomoDeliverableTypeName("空");
} }
//验证符合性确认-交付物类型 //验证符合性确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); StringBuilder verifyBuilder = new StringBuilder();
dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeName); for(String id : verifyDeliverableTypeIdList){
}else { List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
dummyInventoryInfoEO.setVerifyDeliverableType("空");
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getName() + ",");
}
}
String verifyName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyName);
} else {
dummyInventoryInfoEO.setVerifyDeliverableTypeName("空");
} }
//发起人 //发起人
List<SysDictItem> fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue()); List<SysDictItem> fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue());
//设计符合性确认-发起人 //设计符合性确认-发起人
@@ -662,7 +719,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
//翻译成英文名 //翻译成英文名
public void disposeDataToEn(List<DummyInventoryInfoEO> records) { public void disposeDataToEn(List<DummyInventoryInfoEO> records) {
Set<String> technologyTerritorySet = new HashSet<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
//子标题 //子标题
if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) {
@@ -681,6 +738,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyInventoryInfoEO.setApplicableSupplement("null"); dummyInventoryInfoEO.setApplicableSupplement("null");
} }
//技术领域 //技术领域
Set<String> technologyTerritorySet = new HashSet<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) {
List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(","));
technologyTerritorySet.addAll(list); technologyTerritorySet.addAll(list);
@@ -799,27 +857,81 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
//交付物类型 //交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); Set<String> deliverableTypeSet = new HashSet<>();
//设计符合性确认-交付物类型 List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
String designDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(","));
dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeEnName); deliverableTypeSet.addAll(designDeliverableTypeIdList);
}else { }
dummyInventoryInfoEO.setDesignDeliverableType("null"); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getEnName() + ",");
}
}
String designEnName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designEnName = designBuilder.substring(0, designBuilder.length() - 1);
}
dummyInventoryInfoEO.setDesignDeliverableTypeName(designEnName);
} else {
dummyInventoryInfoEO.setDesignDeliverableTypeName("null");
} }
//prehomo确认-交付物类型 //prehomo确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); StringBuilder prehomoBuilder = new StringBuilder();
dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeEnName); for(String id : prehomoDeliverableTypeIdList){
}else { List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
dummyInventoryInfoEO.setPrehomoDeliverableType("null"); if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getEnName() + ",");
}
}
String prehomoEnName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoEnName);
} else {
dummyInventoryInfoEO.setPrehomoDeliverableTypeName("null");
} }
//验证符合性确认-交付物类型 //验证符合性确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); StringBuilder verifyBuilder = new StringBuilder();
dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeEnName); for(String id : verifyDeliverableTypeIdList){
}else { List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
dummyInventoryInfoEO.setVerifyDeliverableType("null");
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getEnName() + ",");
}
}
String verifyEnName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyEnName);
} else {
dummyInventoryInfoEO.setVerifyDeliverableTypeName("null");
} }
//发起人 //发起人
@@ -956,7 +1068,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
for (Map<String, String> infoDiff : infoDiffList) { for (Map<String, String> infoDiff : infoDiffList) {
if (infoDiff.size() > 1) { if (infoDiff.size() > 1) {
contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog); contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog);
} }
} }
} }
@@ -974,10 +1086,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) { 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 + ",";
}else{ }else{
contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
} }
} }
@@ -1148,10 +1260,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
//设计符合性确认-交付物类型 //设计符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) { if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = "list.get(1)"; String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) { 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 + ",";
@@ -1196,8 +1308,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
} }
//prehomo确认-交付物类型 //prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) { if (StringUtils.isBlank(contentLog)) {
@@ -1244,8 +1356,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
} }
//验证符合性确认-交付物类型 //验证符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) { if (StringUtils.isBlank(contentLog)) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+6 -6
View File
@@ -206,14 +206,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
infoDiffList.add(infoDiff); infoDiffList.add(infoDiff);
List<Map<String,String>> infoDiffListEn = new ArrayList<>(); List<Map<String,String>> infoDiffListEn = new ArrayList<>();
infoDiffListEn.add(infoDiffEn); infoDiffListEn.add(infoDiffEn);
if(infoDiff.size()>1) {
contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog);
enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null);
contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog); dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null); dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
}
dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
} }
/** /**
* 通过id删除 * 通过id删除
* *
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java
+5 -2
View File
@@ -29,7 +29,8 @@ public class ListDiff <T> {
&& !f.getName().equals("implementTime") && !f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1") && !f.getName().equals("implementTime") && !f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1")
&& !f.getName().equals("implementTime") && !f.getName().equals("inventoryAffirmStatusName") && !f.getName().equals("implementTime") && !f.getName().equals("inventoryAffirmStatusName")
&& !f.getName().equals("taskAffirmStatusName") && !f.getName().equals("roleCode") && !f.getName().equals("taskAffirmStatusName") && !f.getName().equals("roleCode")
&& !f.getName().equals("roleName") && !f.getName().equals("roleName") && !f.getName().equals("verifyDeliverableType")&& !f.getName().equals("designDeliverableType")
&& !f.getName().equals("prehomoDeliverableType")
){ ){
StringBuilder v1String= new StringBuilder(String.valueOf(v1)); StringBuilder v1String= new StringBuilder(String.valueOf(v1));
@@ -42,7 +43,9 @@ public class ListDiff <T> {
// } // }
if(f.getName().contains("erritory") || f.getName().contains("emplate") if(f.getName().contains("erritory") || f.getName().contains("emplate")
|| f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region") || f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region")
|| f.getName().equals("applyScope")){ || f.getName().equals("applyScope") || f.getName().contains("DeliverableType")
){
result.put(f.getName(), v1String.append("|").append(v2String).toString()); result.put(f.getName(), v1String.append("|").append(v2String).toString());
}else { }else {
// //