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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhn
2022-05-30 14:30:21 +08:00
parent d271d6a602 615397b32a
commit 457d0f13bb
2 changed files with 295 additions and 50 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
+55 -1
View File
@@ -28,6 +28,8 @@ import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
import com.jero.modules.dummy.service.IDummyReadEOService; import com.jero.modules.dummy.service.IDummyReadEOService;
import com.jero.modules.dummy.util.ListDiff; import com.jero.modules.dummy.util.ListDiff;
import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysAnnouncement;
import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysDictItem;
@@ -85,7 +87,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
private SysDictItemMapper sysDictItemMapper; private SysDictItemMapper sysDictItemMapper;
@Autowired @Autowired
private DummyContentChangeEOMapper dummyContentChangeEOMapper; private DummyContentChangeEOMapper dummyContentChangeEOMapper;
@Autowired
private IOSSFileService iOSSFileService;
/** /**
* 保存 * 保存
* *
@@ -714,9 +717,60 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}else { }else {
dummyInventoryInfoEO.setVerifyDuty("空"); dummyInventoryInfoEO.setVerifyDuty("空");
} }
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
} }
} }
private String getFileName(List<OSSFile> fileInfos, String deliverableTemplate){
StringBuilder sb = new StringBuilder();
for (String s : deliverableTemplate.split(",")) {
List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList());
sb.append(collect.get(0).getFileName() + ",");
}
String sbStr = "";
if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){
sbStr = sb.substring(0, sb.length() - 1);
}
return sbStr;
}
//翻译成英文名 //翻译成英文名
public void disposeDataToEn(List<DummyInventoryInfoEO> records) { public void disposeDataToEn(List<DummyInventoryInfoEO> records) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+240 -49
View File
@@ -1736,9 +1736,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
} }
// projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
} }
// this.updateBatchById(projectLawsInventoryEOList);
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1); contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1); enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1);
@@ -1841,27 +1839,83 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
//交付物类型 //交付物类型
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(projectLawsInventoryEO.getDesignDeliverableType())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(","));
projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName); deliverableTypeSet.addAll(designDeliverableTypeIdList);
}else { }
projectLawsInventoryEO.setDesignDeliverableType("空"); if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.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(projectLawsInventoryEO.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);
}
projectLawsInventoryEO.setDesignDeliverableTypeName(designName);
} else {
projectLawsInventoryEO.setDesignDeliverableTypeName("空");
} }
//prehomo确认-交付物类型 //prehomo确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); StringBuilder prehomoBuilder = new StringBuilder();
projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); for(String id : prehomoDeliverableTypeIdList){
}else { List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
projectLawsInventoryEO.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);
}
projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoName);
} else {
projectLawsInventoryEO.setPrehomoDeliverableTypeName("空");
} }
//验证符合性确认-交付物类型 //验证符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); StringBuilder verifyBuilder = new StringBuilder();
projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName); for(String id : verifyDeliverableTypeIdList){
}else { List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
projectLawsInventoryEO.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);
}
projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyName);
} else {
projectLawsInventoryEO.setVerifyDeliverableTypeName("空");
} }
@@ -2000,6 +2054,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}else { }else {
projectLawsInventoryEO.setVerifyDueDateString("空"); projectLawsInventoryEO.setVerifyDueDateString("空");
} }
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
} }
} }
@@ -2100,27 +2196,82 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
//交付物类型 //交付物类型
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(projectLawsInventoryEO.getDesignDeliverableType())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(","));
projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName); deliverableTypeSet.addAll(designDeliverableTypeIdList);
}else { }
projectLawsInventoryEO.setDesignDeliverableType("null"); if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.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(projectLawsInventoryEO.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);
}
projectLawsInventoryEO.setDesignDeliverableTypeName(designEnName);
} else {
projectLawsInventoryEO.setDesignDeliverableTypeName("null");
} }
//prehomo确认-交付物类型 //prehomo确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); StringBuilder prehomoBuilder = new StringBuilder();
projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); for(String id : prehomoDeliverableTypeIdList){
}else { List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
projectLawsInventoryEO.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);
}
projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoEnName);
} else {
projectLawsInventoryEO.setPrehomoDeliverableTypeName("null");
} }
//验证符合性确认-交付物类型 //验证符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); StringBuilder verifyBuilder = new StringBuilder();
projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName); for(String id : verifyDeliverableTypeIdList){
}else { List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
projectLawsInventoryEO.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);
}
projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyEnName);
} else {
projectLawsInventoryEO.setVerifyDeliverableTypeName("null");
} }
@@ -2259,6 +2410,47 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}else { }else {
projectLawsInventoryEO.setVerifyDueDateString("null"); projectLawsInventoryEO.setVerifyDueDateString("null");
} }
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
} }
} }
@@ -4283,13 +4475,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
//设计符合性确认-交付物类型 //设计符合性确认-交付物类型
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);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableType").split(",")); List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0); String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1); String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4343,13 +4535,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
} }
//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);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableType").split(",")); List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0); String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1); String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4404,13 +4596,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
//验证符合性确认-交付物类型 //验证符合性确认-交付物类型
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);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableType").split(",")); List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0); String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1); String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4463,15 +4655,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffNewEn = listEn.get(1); String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
} }
contentLog = contentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, enContentLog.length()-1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
} }
} }
contentLog = contentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, enContentLog.length()-1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
} }
//表格高度 //表格高度
private static int high = 25; private static int high = 25;
//表格宽度 //表格宽度