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

update

Browse Source
This commit is contained in:
wangzhijiang
2023-04-04 21:55:59 +08:00
parent c7dd019532
commit 9a7761d960
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+2 -2
View File
@@ -1219,7 +1219,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
String value = ""; String value = "";
boolean flag = true; boolean flag = true;
List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); // List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode());
//编号验证 //编号验证
verifySerialNumber(datas,authDummyInventoryInfoEOTemp); verifySerialNumber(datas,authDummyInventoryInfoEOTemp);
@@ -1309,7 +1309,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
} }
//责任领域 //责任领域
if(StringUtils.isNotBlank(dutyTerritory)){ if(StringUtils.isNotBlank(dutyTerritory)){
value = pullMore(dutyTerritoryDictItemList, authDummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); value = pullMore(dictItemList, authDummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field",DicCodeEnum.DUTY_TERRITORY.getCode());
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
authDummyInventoryInfoEO.setDutyTerritory(value); authDummyInventoryInfoEO.setDutyTerritory(value);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+2 -2
View File
@@ -6971,7 +6971,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String value = ""; String value = "";
boolean flag = true; boolean flag = true;
List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); // List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode());
List<String> userNameList = new ArrayList<>(); List<String> userNameList = new ArrayList<>();
String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(",")); String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(","));
@@ -7113,7 +7113,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//责任领域(多选必填) //责任领域(多选必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field"); flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
if(flag){ if(flag){
value = pullMore(dutyTerritoryDictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field",DicCodeEnum.DUTY_TERRITORY.getCode());
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
//工程接口人(责任领域下的工程接口人) //工程接口人(责任领域下的工程接口人)
Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);