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:
liyawei
2022-05-31 15:30:55 +08:00
parent 78981cd23f 04b9e8a7cf
commit 2d6f2b4056
2 changed files with 20 additions and 6 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
+14 -6
View File
@@ -227,6 +227,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
@Override
public void issue(DummyInventoryBaseEO dummyInventoryBaseEO){
this.updateById(dummyInventoryBaseEO);
//不管有没有维护清单,都返回操作成功
//发布与撤回均需要发消息(向订阅的人员发消息)
//首次发布不发消息
//(1)首次发布将虚拟清单的基础数据和详情数据存入维护清单内容变更表_dummy_content_change
@@ -429,13 +430,12 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
iDummyContentChangeEOService.saveBatch(list);
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,
// String addSerialNumber,String deleteSerialNumber,String state,String cut) {
}else {
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("维护清单为空,发布失败");
throw new JeroBootException("操作成功");
} else {
throw new JeroBootException("The maintenance list is empty, and publishing failed.");
throw new JeroBootException("Successful operation.");
}
}
}
@@ -717,19 +717,25 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}else {
dummyInventoryInfoEO.setVerifyDuty("空");
}
//文件
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(",")));
}else {
dummyInventoryInfoEO.setDesignDeliverableTemplateName("空");
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(",")));
}else {
dummyInventoryInfoEO.setPrehomoDeliverableTemplateName("空");
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(",")));
}else {
dummyInventoryInfoEO.setVerifyDeliverableTemplateName("空");
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
@@ -763,7 +769,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
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() + ",");
if (CollectionUtils.isNotEmpty(collect)) {
sb.append(collect.get(0).getFileName() + ",");
}
}
String sbStr = "";
if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+6
View File
@@ -2082,14 +2082,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}else {
projectLawsInventoryEO.setDesignDeliverableTemplateName("空");
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}else {
projectLawsInventoryEO.setPrehomoDeliverableTemplateName("空");
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}else {
projectLawsInventoryEO.setVerifyDeliverableTemplateName("空");
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){