修改监检部门选择接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java

@@ -29,7 +29,9 @@ public class XJConstant {
     public static final String PROCESS_PROJECT_STATE="processProjectState";
     //监管科室
     public static final String INS_DEP = "insDep";
+    public static final String INS_DEPID="insDepId";
     public static final String INS_PRESON = "insPerson";
+    public static final String INS_PRESONID = "insPersonId";
 
     /**
      * 构造方法

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectDto.java

@@ -104,6 +104,7 @@ public class ProjectDto  extends BaseDto {
 
     private String processProjectState;
 
+    private String insDepId;
     private String insDep;
     private String insPerson;
     private String startDateString;

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
@@ -12,8 +13,10 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Attachment;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*;
 import io.swagger.annotations.ApiModel;
@@ -60,6 +63,8 @@ public class ProjectController extends BaseController {
 	@Autowired
 	ProjectInitiationServiceImpl projectInitiationService;
 	@Autowired
+	CompanyMapper companyMapper;
+	@Autowired
 	OrgServiceImpl orgServiceImpl;
 	@Autowired
 	EquipmentServiceImpl equipmentService;
@@ -275,13 +280,17 @@ public class ProjectController extends BaseController {
 		Project project = projectServiceImpl.getById(sequenceNbr);
 		JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(project));
 		jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核通过");
-		String insDep = json.getString(XJConstant.INS_DEP);
+		String insDepId = json.getString(XJConstant.INS_DEPID);
 		String insPerson = json.getString(XJConstant.INS_PRESON);
 		if(!ValidationUtil.isEmpty(insPerson)){
 			jsonObject.put(XJConstant.INS_PRESON,insPerson);
 			jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"监检员待审核");
-		} else if (!ValidationUtil.isEmpty(insDep)) {
-			jsonObject.put(XJConstant.INS_DEP,insDep);
+		} else if (!ValidationUtil.isEmpty(insDepId)) {
+
+
+			Map map = orgServiceImpl.getdetialInfo(insDepId);
+			jsonObject.put(XJConstant.INS_DEPID,map.get("sequenceNbr"));
+			jsonObject.put(XJConstant.INS_DEP,map.get("name"));
 			jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"监检员待分配");
 		}
 		if("0".equals(option)){

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

@@ -76,7 +76,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     }
 
     private void getProjectState(ProjectDto project) {
-        String state = "",insDep = "",insPerson = "";
+        String state = "",insDep = "",insPerson = "",insDepId = "";
         LambdaQueryWrapper<ProjectInitiation> lambdaQueryWrap = new LambdaQueryWrapper<>();
         lambdaQueryWrap.eq(ProjectInitiation::getInstanceId,project.getInstanceId())
 //                .eq(ProjectInitiation ::getTaskName, ProjectInitiationEnum.平台审核.getName())
@@ -88,6 +88,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
             JSONObject jsonObject = JSON.parseObject(projectInitiation.getContext());
             if(ProjectInitiationEnum.平台审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus()) || ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.流程结束.getName().equals(project.getStatus()) || ProjectInitiationEnum.项目关闭.getName().equals(project.getStatus())){
                 if(!ValidationUtil.isEmpty(jsonObject)){
+                    insDepId = jsonObject.getString(XJConstant.INS_DEPID);
                     state = jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE);
                     insDep = jsonObject.getString(XJConstant.INS_DEP);
                     insPerson = jsonObject.getString(XJConstant.INS_PRESON);
@@ -123,6 +124,8 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         project.setExamineProjectState(state);
         project.setInsDep(insDep);
         project.setInsPerson(insPerson);
+        project.setInsDepId(insDepId);
+
     }