diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 14aec4667..2d33511d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -106,4 +106,8 @@ public class ProjectRelatedPersonnel implements Serializable { //批量设置传参ids @TableField(exist = false) private String ids; + + // 一级责任领域(统计节点) + @TableField(exist = false) + private String firstLevelDutyTerritory; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 674640af9..ee9069061 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -28,8 +28,10 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -108,6 +110,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records) { + + List sysDictItems = this.sysDictItemService.selectItemsAll(); + Map> firstLevelDutyTerritoryMap = this.sysDictItemService.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems); for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { //法规工程师 List lawEngineerUsers = new ArrayList<>(); @@ -459,6 +467,28 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) { + String firstLevel = firstLevelMap.getKey(); + List dutyTerritoryList = firstLevelMap.getValue(); + if(StringUtils.isEmpty(firstLevel) && CollectionUtils.isEmpty(dutyTerritoryList)){ + continue; + } + + List dutyTerritoryListTemp = dutyTerritoryList.stream().filter(sysDictItem -> { + boolean flag = false; + if (StringUtils.equals(sysDictItem.getItemValue(), dutyTerritory)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(dutyTerritoryListTemp)){ + projectRelatedPersonnel.setFirstLevelDutyTerritory(firstLevel); + break; + } + } + } }