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

Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

Browse Source
This commit is contained in:
zyx.net
2023-09-28 15:25:45 +08:00
parent 7c37803d43 4108fbd48a
commit 5520384ad9
5 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+5
View File
@@ -4991,6 +4991,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){
projectCertificationInventoryEO.setDutyTerritory(value);
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
}
}
//工程接口人(责任领域下的工程接口人)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+12
View File
@@ -5592,6 +5592,15 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory, "责任领域", "Responsible Field");
if (flag) {
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setDutyTerritory(value);
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
}
if (StringUtils.isNotBlank(value)) {
//工程接口人(责任领域下的工程接口人)
Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
@@ -11620,6 +11629,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
}
}
String serialNumber = projectLawsInventoryEO.getSerialNumber();
if(StringUtils.isNotBlank(serialNumber) && serialNumber.contains("*")){
serialNumber = serialNumber.replaceAll("\\*","");
}
projectLawsInventoryEO.setSerialNumber(null);
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
if(StringUtils.isNotBlank(serialNumber)){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+4
View File
@@ -4880,6 +4880,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){
projectCertificationInventoryEO.setDutyTerritory(value);
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
}
}
//工程接口人(责任领域下的工程接口人)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+5
View File
@@ -5522,6 +5522,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (flag) {
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
if (StringUtils.isNotBlank(value)) {
List<String> list = Arrays.asList(value.split(","));
List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
//工程接口人(责任领域下的工程接口人)
Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+2 -16
View File
@@ -1367,16 +1367,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
emptyList.add(projectLawsInventoryEO);
}
String msg = "";
if(CutEnum.CN.getValue().equals(cut)){
msg = "在平台件项目中包含多条匹配内容，请选择关联";
}else{
msg = " multiple matching contents are included in the platform component project, please select association";
}
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
map.put("result",projectLawsInventoryEOS);
mapList.add(map);
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
@@ -1532,16 +1525,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
emptyList.add(projectLawsInventoryEO);
}
String msg = "";
if(CutEnum.CN.getValue().equals(cut)){
msg = "在平台件项目中包含多条匹配内容，请选择关联";
}else{
msg = " multiple matching contents are included in the platform component project, please select association";
}
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
map.put("result",projectLawsInventoryEOS);
mapList.add(map);
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){