From dd5251ee8c44ff2a4e2690f2e9c8c60cb82871b5 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 12 May 2023 14:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95-=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=B8=80=E7=BA=A7=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?=
 =?UTF-8?q?=EF=BC=88=E7=BB=9F=E8=AE=A1=E8=8A=82=E7=82=B9=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectRelatedPersonnel.java       |  4 +++
 .../ProjectRelatedPersonnelServiceImpl.java   | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+)

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<ProjectRelat
 	@Autowired
 	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
 
+	@Autowired
+	private ISysDictItemService sysDictItemService;
+
 	/**
 	 * 保存
 	 *
@@ -334,6 +339,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 	}
 
 	public void disposeData(List<ProjectRelatedPersonnel> records) {
+
+		List<SysDictItem> sysDictItems = this.sysDictItemService.selectItemsAll();
+		Map<String, List<SysDictItem>> firstLevelDutyTerritoryMap = this.sysDictItemService.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems);
 		for (ProjectRelatedPersonnel projectRelatedPersonnel:records) {
 			//法规工程师
 			List<SysUser> lawEngineerUsers = new ArrayList<>();
@@ -459,6 +467,28 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					projectRelatedPersonnel.setEngineerAttSetName(AttSetName.substring(0,AttSetName.toString().length()-1));
 				}
 			}
+
+			String dutyTerritory = projectRelatedPersonnel.getDutyTerritory();
+			for (Map.Entry<String, List<SysDictItem>> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) {
+				String firstLevel = firstLevelMap.getKey();
+				List<SysDictItem> dutyTerritoryList = firstLevelMap.getValue();
+				if(StringUtils.isEmpty(firstLevel) && CollectionUtils.isEmpty(dutyTerritoryList)){
+					continue;
+				}
+
+				List<SysDictItem> 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;
+				}
+			}
+
 		}
 	}