item：值班人员类型字典处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/enums/DataDictionaryTypeEnum.java

+package com.yeejoin.amos.boot.module.common.biz.enums;
+
+public enum DataDictionaryTypeEnum {
+
+    PERSON_TYPE("人员类型", "DLRYLX");
+
+    private String name;
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    DataDictionaryTypeEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/enums/DynamicGroupCode.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/enums/DynamicGroupCodeEnum.java

 package com.yeejoin.amos.boot.module.common.biz.enums;
 
-public enum DynamicGroupCode {
+public enum DynamicGroupCodeEnum {
 
     JCS_PERSON("机场人员", "246");
 
@@ -23,7 +23,7 @@ public enum DynamicGroupCode {
         this.code = code;
     }
 
-    DynamicGroupCode(String name, String code) {
+    DynamicGroupCodeEnum(String name, String code) {
         this.name = name;
         this.code = code;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -19,7 +19,10 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.yeejoin.amos.boot.module.common.biz.enums.DynamicGroupCode;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
+import com.yeejoin.amos.boot.module.common.biz.enums.DataDictionaryTypeEnum;
+import com.yeejoin.amos.boot.module.common.biz.enums.DynamicGroupCodeEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -82,6 +85,10 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	@Autowired
 	DutyPersonShiftMapper dutyPersonShiftMapper;
 
+	@Autowired
+	IDataDictionaryService dataDictionaryService;
+
+
 	/**
 	 * 每天单个班次执勤人数全部小于等于3人
 	 */
@@ -122,7 +129,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 			});
 		}
 		//	获取人员详细信息
-		List<Map<String, Object>> personInfoList = dynamicFormInstanceService.personInfoList(DynamicGroupCode.JCS_PERSON.getCode(), userIdSet);
+		List<Map<String, Object>> personInfoList = dynamicFormInstanceService.personInfoList(DynamicGroupCodeEnum.JCS_PERSON.getCode(), userIdSet);
 		if (!CollectionUtils.isEmpty(personInfoList)) {
 			Map<String, List<Map<String, Object>>> listMap = personInfoList.stream().collect(Collectors.groupingBy((Map m) -> String.valueOf(m.get("userId"))));
 			records.forEach(x -> {
@@ -559,9 +566,17 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 			List<DynamicFormInstance> instances = dynamicFormInstanceService
 					.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "peopleType")
 							.eq(DynamicFormInstance::getInstanceId, userId)
-							.eq(DynamicFormInstance::getGroupCode, DynamicGroupCode.JCS_PERSON.getCode()));
+							.eq(DynamicFormInstance::getGroupCode, DynamicGroupCodeEnum.JCS_PERSON.getCode()));
 			if (!CollectionUtils.isEmpty(instances)) {
-				d.put("personType", instances.get(0).getFieldValue());
+				String fieldValue = instances.get(0).getFieldValue();
+				List<DataDictionary> dictionaryList = dataDictionaryService.getByType(DataDictionaryTypeEnum.PERSON_TYPE.getCode());
+				if (StringUtils.isNotBlank(fieldValue) && !CollectionUtils.isEmpty(dictionaryList)) {
+					Map<String, List<DataDictionary>> map = dictionaryList.stream().collect(Collectors.groupingBy(DataDictionary::getCode));
+					List<DataDictionary> list = map.get(fieldValue);
+					if (!CollectionUtils.isEmpty(list)) {
+						d.put("personType", list.get(0).getName());
+					}
+				}
 			}
 		}
 		return d;