新增获取下来选择框的值 接口（ 建设单位负责人（下拉） 项目设计单位（下拉） 项目安装单位（下拉））

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/OrgPersonEnum.java

@@ -3,18 +3,40 @@ package com.yeejoin.amos.boot.module.common.api.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Getter
 @AllArgsConstructor
 public enum OrgPersonEnum {
 
-	公司("COMPANY", "244", "公司"),
-	部门("DEPARTMENT", "245", "部门"),
-	人员("PERSON", "246", "人员"),
-    焊工("WELDER","247","焊工"),
-    企业管理员("ADMIN","248","企业管理员");
+	公司("COMPANY", "244", "公司",1),
+	部门("DEPARTMENT", "245", "部门",2),
+	人员("PERSON", "246", "人员",3),
+    焊工("WELDER","247","焊工",3),
+    建设单位负责人("CHARGE","254","建设单位负责人",3),
+    企业管理员("ADMIN","248","企业管理员",3),
+    建设单位("CONSTRUCTION","249","建设单位",1),
+    安装单位("INSTALL","250","安装单位",1),
+    设计单位("DESIGN","251","设计单位",1),
+    监察单位("SUPERVISION","252","监察单位",1),
+    监检机构("MONITORING","253","监检机构",1);
+
 	
     private String key;
     private String code;
     private String name;
+    /**
+     * 1 公司 2 部门 3 人员
+     */
+    private Integer type;
+
+    public static Map map = new HashMap();
+
+    static {
+        for(OrgPersonEnum orgPersonEnum:OrgPersonEnum.values()){
+            map.put(orgPersonEnum.getName(),orgPersonEnum.getKey());
+        }
+    }
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
@@ -226,6 +227,11 @@ public class CompanyController extends BaseController {
 			jsonObject.put("amosOrgCode",companyModelFeignClient.getOrgCode());
 			orgServiceImpl.dataHandling(jsonObject,bizOrgType,null);
 
+			//企业管理员人员 动态表单存储
+			jsonObject = null;
+			jsonObject.put("name",admin);
+			jsonObject.put("phone",adminPhone);
+			orgServiceImpl.dataHandling(jsonObject, OrgPersonEnum.企业管理员.getKey(),null);
 		}
 		return ResponseHelper.buildResponse(companyServiceImpl.updateById(company));
 	}

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectInitiationServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +40,8 @@ public class ProjectController extends BaseController {
     ProjectServiceImpl projectServiceImpl;
 	@Autowired
 	ProjectInitiationServiceImpl projectInitiationService;
+	@Autowired
+	OrgServiceImpl orgServiceImpl;
 
     /**
      * 新增项目信息表
@@ -136,4 +140,16 @@ public class ProjectController extends BaseController {
 	public ResponseModel<List<JSONObject>> selectName() {
 		return ResponseHelper.buildResponse(projectServiceImpl.selectName());
 	}
+
+	/**
+	 * 获取下拉选择值
+	 * @param type CHARGE("建设单位负责人")、INSTALL("安装单位")、DESIGN("设计单位")
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "查询下拉选择框的值", notes = "查询下拉选择框的值")
+	@GetMapping(value = "/getSelectInfo")
+	public ResponseModel<List<OrgUsr>> getSelectInfo(String type){
+		return ResponseHelper.buildResponse(orgServiceImpl.getSelectInfo(type));
+	}
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -122,7 +122,7 @@ public class OrgServiceImpl {
         orgUsr.setBizOrgType(bizOrgType);
 
         if (OrgPersonEnum.公司.getKey().equals(bizOrgType)){
-            orgUsr.setOrgExpandAttr1(OrgPersonEnum.公司.getKey());
+            orgUsr.setOrgExpandAttr1(jsonObject.getString("type"));
             orgUsr.setBizOrgCode(jsonObject.getString("creditCode"));
             orgUsr.setAmosOrgId(jsonObject.getString("amosOrgId"));
             orgUsr.setAmosOrgCode(jsonObject.getString("amosOrgCode"));
@@ -209,4 +209,14 @@ public class OrgServiceImpl {
         return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
     }
 
+    /**
+     * 获取下拉选择值
+     * @param type CHARGE("建设单位负责人")、INSTALL("安装单位")、DESIGN("设计单位")
+     * @return
+     */
+    public List<OrgUsr> getSelectInfo(String type){
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr :: getOrgExpandAttr1,type);
+       return  orgUsrServiceImpl.list(wrapper);
+    }
 }