资料提交管材列表查询接口修改，修改焊前校验不生产质量问题，修改焊前校验失败不生成焊口码

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

@@ -142,20 +142,37 @@ public class MaterialController extends BaseController {
 	}
 
 	/**
-	 * 提交资料 获取管材列表（建设单位） 分页查询
+	 * 提交资料 获取管材列表 分页查询 projectId关联的资源
 	 *
 	 * @param current 当前页
 	 * @param current 每页大小
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@GetMapping( value = "/pageList")
+	@GetMapping( value = "/pageOutList")
 	@ApiOperation(httpMethod = "GET",value = "材料信息表分页查询",  notes = "材料信息表分页查询")
 	public ResponseModel<IPage<Material>> queryPage( int current, int size, MaterialDto material) {
 		IPage<Material> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
-		return ResponseHelper.buildResponse(materialServiceImpl.queryMaterialPage(page,material));
+		return ResponseHelper.buildResponse(materialServiceImpl.queryOutPage(page,material));
+	}
+
+	/**
+	 * 提交资料 获取管材列表 分页查询 projectId关联的资源和空闲的资源
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping( value = "/pageInList")
+	@ApiOperation(httpMethod = "GET",value = "材料信息表分页查询",  notes = "材料信息表分页查询")
+	public ResponseModel<IPage<Material>> queryMaterialPage( int current, int size, MaterialDto material) {
+		IPage<Material> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(materialServiceImpl.queryInPage(page,material));
 	}
 
 	/**

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

@@ -79,17 +79,10 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
     }
 
     /**
-     * 提交资料 获取管材列表（建设单位） 分页查询
+     * 提交资料 获取管材列表 分页查询 projectId关联的资源
      */
-    @BusinessIdentify
-    public IPage<Material> queryMaterialPage(IPage<Material> page, MaterialDto material) {
+    public IPage<Material> queryOutPage(IPage<Material> page, MaterialDto material) {
         LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
-        getWrapper(wrapper,material);
-        wrapper.in(Material::getCompanyId,getCompanyIds());
-        return this.page(page,wrapper);
-    }
-
-    public void getWrapper(LambdaQueryWrapper<Material> wrapper,MaterialDto material){
         List materialIds = new ArrayList<>();
         LambdaQueryWrapper<ProjectResource> resourceWrapper = new LambdaQueryWrapper<>();
         if(!ValidationUtil.isEmpty(material.getProjectId())){
@@ -100,8 +93,23 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
                 materialIds.add(projectResource.getResourceId());
             }
             wrapper.in(Material::getSequenceNbr,materialIds);
-        } else {
-            resourceWrapper.eq(ProjectResource::getType, ProjectResourceEnum.管材资源.getCode());
+        }
+
+        getWrapper(wrapper,material);
+        wrapper.in(Material::getCompanyId,getCompanyIds());
+        return this.page(page,wrapper);
+    }
+
+    /**
+     * 提交资料 获取管材列表 分页查询 projectId关联的资源和空闲的资源
+     */
+    public IPage<Material> queryInPage(IPage<Material> page, MaterialDto material) {
+        LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
+        List materialIds = new ArrayList<>();
+        LambdaQueryWrapper<ProjectResource> resourceWrapper = new LambdaQueryWrapper<>();
+        if(!ValidationUtil.isEmpty(material.getProjectId())){
+            resourceWrapper.ne(ProjectResource::getProjectId,material.getProjectId())
+                    .eq(ProjectResource::getType, ProjectResourceEnum.管材资源.getCode());
             List<ProjectResource> list = projectResourceServiceImpl.list(resourceWrapper);
             for (ProjectResource projectResource: list) {
                 materialIds.add(projectResource.getResourceId());
@@ -109,6 +117,14 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
             wrapper.notIn(Material::getSequenceNbr,materialIds);
         }
 
+        getWrapper(wrapper,material);
+        wrapper.in(Material::getCompanyId,getCompanyIds());
+        return this.page(page,wrapper);
+    }
+
+
+
+    public void getWrapper(LambdaQueryWrapper<Material> wrapper,MaterialDto material){
         if(!ValidationUtil.isEmpty(material.getName())){
             wrapper.like(Material::getName,material.getName());
         }

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

@@ -113,10 +113,23 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         return instanceId;
     }
 
+    /**
+     * 测试流程使用
+     * @param instanceId
+     * @return
+     */
     public void getTaskList(String instanceId){
-        Workflow.taskClient.getTaskList(instanceId).getResult();
-        Workflow.taskClient.getTasksNoAuth(processDefinitionKey,null).getResult();
-        Workflow.taskClient.getTasks(processDefinitionKey).getResult();
+        JSONObject dataObject = new JSONObject();
+        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(Workflow.taskClient.getTaskList(instanceId)));
+        JSONArray jsonArray = jsonObject.getJSONArray("data");
+        for(Object o:jsonArray){
+            String name = JSONObject.parseObject(JSON.toJSONString(o)).getString("name");
+            if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name)){
+                dataObject = JSONObject.parseObject(JSON.toJSONString(o));
+            }
+        }
+        Workflow.taskClient.getTaskList(instanceId);
+        Workflow.taskClient.getTasksNoAuth(processDefinitionKey,null);
         Workflow.taskClient.getTask(instanceId);
     }
 
@@ -205,11 +218,11 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         }catch (Exception e) {
             //当存在多个用户任务时 主要是安装/设计提交资料修改
             logger.error("当前用户存在多个任务");
-            JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(Workflow.taskClient.getTaskList(instanceId).getResult()));
+            JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(Workflow.taskClient.getTaskList(instanceId)));
             JSONArray jsonArray = jsonObject.getJSONArray("data");
             for(Object o:jsonArray){
                 String name = JSONObject.parseObject(JSON.toJSONString(o)).getString("name");
-                if(name == ProjectInitiationEnum.安装开工资料修改.getName()){
+                if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name)){
                     dataObject = JSONObject.parseObject(JSON.toJSONString(o));
                 }
             }

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

@@ -271,6 +271,28 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
      */
     private static final String TYPE="智能检验";
 
+    /**
+     * 焊前校验不通过时删除焊口码 并将tz_ugp_verify表中的code制空
+     * @param weldCode
+     */
+    public void deleteWeld(String weldCode){
+        //焊前校验不通过需要将新申请的焊口删除！
+        LambdaQueryWrapper<Weld> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Weld::getCode,weldCode);
+        Long weldId = weldService.getOne(wrapper).getSequenceNbr();
+        weldService.deleteBySeq(weldId);
+        //检查tz_ugp_verify表中code=weldCode的校验记录，将code制空
+        LambdaQueryWrapper<Verify> verifierWrap = new LambdaQueryWrapper<>();
+        verifierWrap.eq(Verify::getCode,weldCode);
+        List<Verify> list = this.list(verifierWrap);
+        Iterator<Verify> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            Verify verifyNew = iterator.next();
+            verifyNew.setCode("");
+            this.updateById(verifyNew);
+        }
+    }
+
     @BusinessIdentify
     public String checks(JSONObject jsonObject) {
         if (jsonObject == null || jsonObject.size() ==0) {
@@ -286,6 +308,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         String stage = jsonObject.getString("stage");//阶段检验
         Date time = new Date();// //获取当前校验时间
         String photo = jsonObject.getString("photo");//图片
+        String weldCode = jsonObject.getString("code"); //焊口码
         Verify verify = new Verify( );
         jsonObject.put("welderId",welderId);
         verify.setProjectId(projectId);//项目id
@@ -335,7 +358,9 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
             String targetInfo = jsonObject.toString();
             verify.setTargetInfo(targetInfo);//json信息
             if (!flag) {
-                this.addFailData(verify,jsonObject,new QualityProblem());
+                //焊前校验不进行质量问题生产
+//                this.addFailData(verify,jsonObject,new QualityProblem());
+                deleteWeld(weldCode);
                 return VerifyEnum.未通过.getName();
             }
             //成功
@@ -380,7 +405,9 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
             String targetInfo = jsonObject.toString();
             verify.setTargetInfo(targetInfo);
             if (!flag) {
-                this.addFailData(verify,jsonObject,new QualityProblem());
+                //焊前校验不进行质量问题生产
+//                this.addFailData(verify,jsonObject,new QualityProblem());
+                deleteWeld(weldCode);
                 return VerifyEnum.未通过.getName();
             }
             this.addSuccessData(verify,null,jsonObject);
@@ -418,7 +445,9 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
             verify.setTargetInfo(targetInfo);//json信息
             if (!flag) {
                 //校验不通过
-                this.addFailData(verify,jsonObject,new QualityProblem());
+                //焊前校验不进行质量问题生产
+//                this.addFailData(verify,jsonObject,new QualityProblem());
+                deleteWeld(weldCode);
                 return VerifyEnum.未通过.getName();
             }
             //效验通过

amos-boot-system-ugp/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-workflow</artifactId>
-            <version>1.7.9-SNAPSHOT</version>
+            <version>1.8.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yeejoin</groupId>