fix(检验检测开通)：1.过滤检验检测人员枚举更换；2.行业主管部门字段从字典表取值

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -32,6 +32,7 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.apache.commons.lang3.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,6 +71,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Value ("${process-definition-key.jyjc.openapplication:}")
     private String processDefinitionKey;
 
+    @Value("${jyjc.user-post:6615}")
+    private String jyjcUserPost;
+
     @Autowired
     private RedisUtils redisUtils;
 
@@ -198,7 +202,14 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         if (baseUnitLicenceEntity != null) {
             jyjcOpeningApplicationModel.setUseContact(baseUnitLicenceEntity.getUseContact());
             jyjcOpeningApplicationModel.setContactPhone(baseUnitLicenceEntity.getContactPhone());
+            if (StringUtils.isNotBlank(baseUnitLicenceEntity.getIndustrySupervisor())) {
+                List<Map<String, String>> dicts = baseMapper.selectDataDictionaryList(Arrays.asList(baseUnitLicenceEntity.getIndustrySupervisor()));
+                if (!ValidationUtil.isEmpty(dicts)) {
+                    jyjcOpeningApplicationModel.setIndustrySupervisor(dicts.get(0).get("name"));
+                } else {
                     jyjcOpeningApplicationModel.setIndustrySupervisor(baseUnitLicenceEntity.getIndustrySupervisor());
+                }
+            }
             jyjcOpeningApplicationModel.setLongitude(baseUnitLicenceEntity.getLongitude());
             jyjcOpeningApplicationModel.setLatitude(baseUnitLicenceEntity.getLatitude());
             if(ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {
@@ -236,7 +247,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 //    dto.setPostName(postName);
                 // }
                 return dto;
-            }).filter(o -> o.getPost() != null && o.getPost().contains("6554")).collect(Collectors.toList());
+            }).filter(o -> o.getPost() != null && o.getPost().contains(jyjcUserPost)).collect(Collectors.toList());
             jyjcOpeningApplicationModel.setUserInfos(userInfoDtos);
         }
         return jyjcOpeningApplicationModel;