Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProjectInitiationEnum.java

@@ -21,7 +21,8 @@ public enum ProjectInitiationEnum {
     监检员分配("10","监检员分配","JJYFP"),
     监检员审核("11","监检员审核","JJYSH"),
     项目关闭("12","项目关闭","XMGB"),
-    接受审查意见("13","接受审查意见","JSSCYJ");
+    接受审查意见("13","接受审查意见","JSSCYJ"),
+    流程结束("14","流程结束！","LCJS");
 
     private String status;
     private String name;

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

@@ -241,13 +241,13 @@ public class CompanyController extends BaseController {
 	}
 
 	/***
-	 * 获取当前登录人所在单位下的所有部门
+	 * 分页获取当前登录人所在单位下的所有部门
 	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/deptList")
-	@ApiOperation(httpMethod = "GET", value = "部門新增", notes = "部門新增")
+	@ApiOperation(httpMethod = "GET", value = "分页获取当前登录人所在单位下的所有部门", notes = "分页获取当前登录人所在单位下的所有部门")
 	public ResponseModel<IPage> getDept(String size, String current) {
 		Page<OrgUsr> page = new Page<>();
 		page.setSize(Long.parseLong(size));
@@ -255,6 +255,19 @@ public class CompanyController extends BaseController {
 		return ResponseHelper.buildResponse(orgServiceImpl.getCompanyDept(page));
 	}
 
+	/***
+	 * 获取当前登录人所在单位下的所有部门（全部）
+	 * @param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/dept")
+	@ApiOperation(httpMethod = "GET", value = "获取当前登录人所在单位下的所有部门（全部）", notes = "获取当前登录人所在单位下的所有部门（全部）")
+	public ResponseModel<List> getDept() {
+		Page<OrgUsr> page = new Page<>(0,Long.MAX_VALUE);
+		return ResponseHelper.buildResponse(orgServiceImpl.getCompanyDept(page).getRecords());
+	}
+
 
 	/**
 	 * 企业注册：获取单位类型

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

@@ -274,9 +274,18 @@ public class ProjectController extends BaseController {
 	public ResponseModel<String> processProject(@RequestParam("sequenceNbr") String sequenceNbr,String option,@RequestBody JSONObject json){
 		Project project = projectServiceImpl.getById(sequenceNbr);
 		JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(project));
-		jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核不通过");
-		if("1".equals(option)){
-			jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核通过");
+		jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核通过");
+		String insDep = json.getString(XJConstant.INS_DEP);
+		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);
+			jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"监检员待分配");
+		}
+		if("0".equals(option)){
+			jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核不通过");
 		}
 		if(ValidationUtil.isEmpty(option)){
 			option = json.getString(XJConstant.PROCESS_PROJECT_STATE);
@@ -284,14 +293,16 @@ public class ProjectController extends BaseController {
 				jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"资料审批通过");
 			} else if ("0".equals(option)){
 				jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"资料审批不通过");
-			} else if ("2".equals(option)){
-				jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"资料审核通过");
-				option = "1";
 			} else if ("3".equals(option)){
+				jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"监检科室待分配");
+				option = "1";
+			} else if ("4".equals(option)){
 				jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"资料审核不通过");
 				option = "0";
 			}
-
+		}
+		if(ValidationUtil.isEmpty(option)){
+			option = "1";
 		}
 		projectInitiationService.execute(project.getInstanceId(),jsonObject,option);
 		return ResponseHelper.buildResponse("ok");

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

@@ -196,7 +196,7 @@ public class WelderController extends BaseController {
         IPage page = new Page();
         page.setCurrent(current);
         page.setSize(size);
-        page = orgServiceImpl.getPersonInfo(String.valueOf(orgServiceImpl.getReginParams().getCompany().getSequenceNbr()),page);
+        page = orgServiceImpl.getPersonInfo(String.valueOf(orgServiceImpl.getReginParams().getBusinessInfo().getCompanySequenceNbr()),page);
         List<Map> mapList = page.getRecords();
         for(Map map : mapList){
             if(OrgEnum.焊工.getKey().equals((String)map.get("type"))){

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

@@ -280,7 +280,16 @@ public class OrgServiceImpl {
     public IPage getCompanyDept(IPage page){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
-        return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
+        LambdaQueryWrapper<OrgUsr> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(OrgUsr :: getParentId,orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())
+                        .eq(OrgUsr ::getBizOrgType, OrgEnum.部门.getKey());
+        IPage<OrgUsr> list = orgUsrServiceImpl.page(page,wrapper1);
+        List<Map> mapList = new ArrayList<>();
+        for(OrgUsr orgUsr: list.getRecords()){
+            mapList.add(getdetialInfo(String.valueOf(orgUsr.getSequenceNbr())));
+        }
+        page.setRecords(mapList);
+        return page;
     }
 
     /**

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

@@ -170,11 +170,11 @@ public class ProblemInitiationServiceImpl {
             smsParams.put("reviewInfo", object.getString("reviewInfo"));
             //给监察发短信
             LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
+            wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(object.getLong("sequenceNbr")).getInstallRegionCode());
             String supervisionUnitId = orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getSuperviseDeptId()).getAmosOrgId();
             sendMessage(sequenceNbr,supervisionUnitId,smsParams,smsCode,supervisionRoleId,object);
             //给安装发短信
-            String installationUnitId = orgUsrServiceImpl.getById(projectServiceImpl.getById(object.getLong("projectId")).getInstallationUnitId()).getAmosOrgId();
+            String installationUnitId = orgUsrServiceImpl.getById(projectServiceImpl.getById(object.getLong("sequenceNbr")).getInstallationUnitId()).getAmosOrgId();
             sendMessage(sequenceNbr,installationUnitId,smsParams,smsCode,installationRoleId,object);
         }
 

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

@@ -86,7 +86,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         if(!ValidationUtil.isEmpty(projectInitiationList)){
             ProjectInitiation projectInitiation = projectInitiationList.iterator().next();
             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())){
+            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)){
                     state = jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE);
                     insDep = jsonObject.getString(XJConstant.INS_DEP);