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/AuditEnum.java

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/11/10
+ */
+@Getter
+@AllArgsConstructor
+public enum  AuditEnum {
+
+
+    符合("符合","1"),
+    不符合且不需要整改("不符合且不需要整改","0"),
+    不符合且需要重新提交资料("不符合且需要重新提交资料","2");
+
+
+    private String name;
+    private String status;
+
+
+    public static Map<String,String> getStatusByName = new HashMap<>();
+    public static Map<String,String> getNameByStatus = new HashMap<>();
+
+    static{
+        for(AuditEnum auditEnum:AuditEnum.values()){
+            getStatusByName.put(auditEnum.name,auditEnum.status);
+            getNameByStatus.put(auditEnum.status,auditEnum.name);
+        }
+    }
+}

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/pom.xml

@@ -31,11 +31,20 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.24</version>
         </dependency>
+        <!--pqr 和wps-->
         <dependency>
             <groupId>fakepath</groupId>
             <artifactId>ugp-welding-evaluation-inspection-sdk</artifactId>
             <version>1.0.1</version>
         </dependency>
+        <!--调用python的依赖-->
+        <dependency>
+            <groupId>org.python</groupId>
+            <artifactId>jython-standalone</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+
+
 
     </dependencies>
     <build>

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/EquipmentController.java

@@ -5,15 +5,18 @@ 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.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
 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.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 
+import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
@@ -66,6 +69,8 @@ public class EquipmentController extends BaseController {
 
 	@Autowired
 	OrgServiceImpl orgService;
+	@Autowired
+	ProjectResourceMapper projectResourceMapper;
 
     /**
      * 新增设备信息表
@@ -108,8 +113,17 @@ public class EquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除设备信息表", notes = "根据sequenceNbr删除设备信息表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-		return ResponseHelper.buildResponse(equipmentServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") List<Long> sequenceNbr) throws Exception {
+		LambdaQueryWrapper<ProjectResource> wrapper = new LambdaQueryWrapper<>();
+		for (Long i:sequenceNbr){
+			wrapper.eq(ProjectResource::getResourceId,i);
+			if (!projectResourceMapper.selectList(wrapper).isEmpty()){
+				return CommonResponseUtil.failure("无法删除,设备："+equipmentServiceImpl.getById(i).getName()+"已绑定项目");
+			}
+		}
+		return ResponseHelper.buildResponse(equipmentServiceImpl.removeByIds(sequenceNbr));
+
+
     }
 
     /**

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

@@ -136,7 +136,7 @@ public class InspectionController {
         return page;
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "", notes = "")
     @GetMapping("/saveInfo")
     public ResponseModel<String> saveInfo(@RequestBody JSONObject jsonObject) {

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

@@ -2,18 +2,21 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
-import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl;
-import com.yeejoin.amos.boot.module.ugp.biz.service.impl.EquipmentServiceImpl;
-import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.ArrayList;
 import java.util.List;
-import com.yeejoin.amos.boot.module.ugp.biz.service.impl.MaterialServiceImpl;
+
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,8 @@ public class MaterialController extends BaseController {
 	AttachmentMapper attachmentMapper;
 	@Autowired
 	OrgServiceImpl orgService;
+	@Autowired
+	ProjectResourceMapper projectResourceMapper;
 
 
     /**
@@ -81,9 +86,19 @@ public class MaterialController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除材料信息表", notes = "根据sequenceNbr删除材料信息表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(materialServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") List<Long> sequenceNbr) throws Exception {
+
+		LambdaQueryWrapper<ProjectResource> wrapper = new LambdaQueryWrapper<>();
+		for (Long i:sequenceNbr){
+		wrapper.eq(ProjectResource::getResourceId,i);
+			if (!projectResourceMapper.selectList(wrapper).isEmpty()){
+				throw  new Exception("无法删除，已绑定项目");
 			}
+		}
+        return ResponseHelper.buildResponse(materialServiceImpl.removeByIds(sequenceNbr));
+	}
+
+
 
     /**
      * 根据sequenceNbr查询

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,"审核通过");
+		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/WeldController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 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.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Weld;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -37,6 +40,8 @@ public class WeldController extends BaseController {
 
     @Autowired
     WeldServiceImpl weldServiceImpl;
+    @Autowired
+    ProjectResourceMapper projectResourceMapper;
 
     /**
      * 新增焊口信息表
@@ -74,8 +79,16 @@ public class WeldController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除焊口信息表", notes = "根据sequenceNbr删除焊口信息表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(weldServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") List<Long> sequenceNbr) throws Exception {
+        LambdaQueryWrapper<ProjectResource> wrapper = new LambdaQueryWrapper<>();
+        for (Long i:sequenceNbr){
+            wrapper.eq(ProjectResource::getResourceId,i);
+            if (!projectResourceMapper.selectList(wrapper).isEmpty()){
+                throw  new Exception("无法删除，已绑定项目");
+            }
+        }
+        return ResponseHelper.buildResponse(weldServiceImpl.removeByIds(sequenceNbr));
+
     }
 
     /**

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/ProjectInitiationServiceImpl.java

@@ -8,10 +8,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Maps;
+import com.mao.expertSystem.WeldingQualification;
+import com.mao.expertSystem.material.MyPqr;
+import com.mao.expertSystem.material.MyWps;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.AuditEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.SMSEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Util.CommonResponse;
@@ -153,7 +157,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             }
         }
 
-
         try {
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
@@ -176,6 +179,108 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         }
     }
 
+
+
+
+
+    /*焊评审核(后期优化)
+     * @return
+     */
+    public String evaluateMethod(String sequenceNbr,JSONObject json) {
+
+        //获取文档信息(2个文档 wps pqr)
+        JSONArray subForm = json.getJSONArray("subForm");
+        JSONObject jsonObject1 = subForm.getJSONObject(0);
+        JSONArray info = jsonObject1.getJSONArray("info");
+        //info里面上传两个文档
+        JSONObject js1 = info.getJSONObject(0);
+        JSONObject js2 = info.getJSONObject(1);
+        String name1 = js1.getString("name");
+        String url1 = js1.getString("url");
+        String name2 = js1.getString("name");
+        String url2 = js2.getString("url");
+        //文档下载,调用python 文字识别
+
+        //识别结果,将结果放到pqr wps
+
+
+
+        MyPqr pqr = new MyPqr( );
+        MyWps wps = new MyWps( );
+        pqr.setWelding_method(json.getString("pqr_welding_method"));
+        pqr.setMaterial_a_number(json.getString("pqr_material_a_number"));
+        pqr.setMaterial_a_class(json.getString("pqr_material_a_class"));
+        pqr.setMaterial_a_thickness(json.getDouble("pqr_material_a_thickness"));
+        pqr.setMaterial_a_group(json.getString("pqr_material_a_group"));
+        pqr.setMaterial_a_standard(json.getString("pqr_material_a_standard"));
+        pqr.setMaterial_b_number(json.getString("pqr_material_b_number"));
+        pqr.setMaterial_b_class(json.getString("pqr_material_b_class"));
+        pqr.setMaterial_b_thickness(json.getDouble("pqr_material_b_thickness"));
+        pqr.setMaterial_b_group(json.getString("pqr_material_b_group"));
+        pqr.setMaterial_b_standard(json.getString("pqr_material_b_standard"));
+        pqr.setIf_shock(json.getString("pqr_if_shock"));
+        pqr.setIf_bend(json.getString("pqr_if_bend"));
+        pqr.setGtaw_weld_material_class(json.getString("pqr_gtaw_weld_material_class"));
+        pqr.setSmaw_weld_material_class(json.getString("pqr_smaw_weld_material_class"));
+        pqr.setSaw_weld_material_class_1(json.getString("pqr_saw_weld_material_class_1"));
+        pqr.setSaw_weld_material_class_2(json.getString("pqr_saw_weld_material_class_2"));
+        pqr.setGmaw_weld_material_class(json.getString("pqr_gmaw_weld_material_class"));
+        pqr.setIf_heat_treatment(json.getString("pqr_if_heat_treatment"));
+        pqr.setTemperature(json.getDouble("pqr_temperature"));
+        pqr.setCombox_type(json.getString("pqr_combox_type"));
+        pqr.setTemperature_time(json.getDouble("pqr_temperature_time"));
+        pqr.setMaterial_minT_of_a_b_thickness(json.getDouble("pqr_material_minT_of_a_b_thickness"));
+
+
+
+        wps.setWelding_method(json.getString("wps_welding_method"));
+        wps.setMaterial_a_number(json.getString("wps_material_a_number"));
+        wps.setMaterial_a_class(json.getString("wps_material_a_class"));
+        wps.setMaterial_a_thickness(json.getDouble("wps_material_a_thickness"));
+        wps.setMaterial_a_group(json.getString("wps_material_a_group"));
+        wps.setMaterial_a_standard(json.getString("wps_material_a_standard"));
+        wps.setMaterial_b_number(json.getString("wps_material_b_number"));
+        wps.setMaterial_b_class(json.getString("wps_material_b_class"));
+        wps.setMaterial_b_thickness(json.getDouble("wps_material_b_thickness"));
+        wps.setMaterial_b_group(json.getString("wps_material_b_group"));
+        wps.setMaterial_b_standard(json.getString("wps_material_b_standard"));
+        wps.setIf_shock(json.getString("wps_if_shock"));
+        wps.setIf_bend(json.getString("wps_if_bend"));
+        wps.setGtaw_weld_material_class(json.getString("wps_gtaw_weld_material_class"));
+        wps.setSmaw_weld_material_class(json.getString("wps_smaw_weld_material_class"));
+        wps.setSaw_weld_material_class_1(json.getString("wps_saw_weld_material_class_1"));
+        wps.setSaw_weld_material_class_2(json.getString("wps_saw_weld_material_class_2"));
+        wps.setGmaw_weld_material_class(json.getString("wps_gmaw_weld_material_class"));
+        wps.setIf_heat_treatment(json.getString("wps_if_heat_treatment"));
+        wps.setTemperature(json.getDouble("wps_temperature"));
+        wps.setCombox_type(json.getString("wps_combox_type"));
+        wps.setTemperature_time(json.getDouble("wps_temperature_time"));
+        wps.setMaterial_minT_of_a_b_thickness(json.getDouble("wps_material_minT_of_a_b_thickness"));
+
+
+        HashMap<String, String> stringStringHashMap = new WeldingQualification( ).equipmentWeldingQualification(pqr, wps);
+
+
+        //结果(假设)
+       String reslut =AuditEnum.符合.getName();
+
+        String option =AuditEnum.getNameByStatus.get(reslut);
+        Project project = projectServiceImpl.getById(sequenceNbr);
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(project));
+        jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,AuditEnum.符合.getName());
+        if(AuditEnum.不符合且不需要整改.getStatus().equals(option)){
+            jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,AuditEnum.不符合且不需要整改.getName());
+            projectInitiationService.execute(project.getInstanceId(),jsonObject,option);
+            projectInitiationService.execute(project.getInstanceId(),jsonObject,option);
+        }else if(AuditEnum.不符合且需要重新提交资料.getStatus().equals(option)){
+            jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,AuditEnum.不符合且需要重新提交资料.getName());
+        }
+        projectInitiationService.execute(project.getInstanceId(),jsonObject,option);
+        return stringStringHashMap.toString();
+    }
+
+
+
     /**
      * 获取流程当前任务名称
      * @param instanceId

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);