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

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum ProBlemProcessEnum {
+    流程开始("流程开始","1"),
+    确定问题("确定问题","2"),
+    重大问题发送短信("重大问题发送短信","3"),
+    编制处理方案("编制处理方案","4"),
+    审查处理方案("审查处理方案","5"),
+    提交整改书("提交整改书","6"),
+    审查整改过程("审查整改过程","7"),
+    超期整改发送短信("超期整改发送短信","8"),
+    问题分类("问题分类","9"),
+    转人工("转人工","10"),
+    结束("结束","11");
+
+    private String Name;
+    private String Code;
+
+    public static Map<String,String> map = new HashMap<>();
+
+    static {
+        for (ProBlemProcessEnum proBlemProcessEnum : ProBlemProcessEnum.values()) {
+            map.put(proBlemProcessEnum.getCode(),proBlemProcessEnum.getName());
+        }
+    }
+}

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

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum ProblemTypeEnum {
+    一般问题("一般问题","1"),
+    重大问题("重大问题","2"),
+    存在问题("存在问题","1"),
+    不存在问题("不存在问题","0");
+    private String name;
+    private String code;
+
+    public static Map<String,String> map = new HashMap<>();
+
+    static {
+        for (ProBlemProcessEnum proBlemProcessEnum : ProBlemProcessEnum.values()) {
+            map.put(proBlemProcessEnum.getCode(),proBlemProcessEnum.getName());
+        }
+    }
+}

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

@@ -15,20 +15,22 @@ import java.util.Map;
 @AllArgsConstructor
 public enum  StageEnum {
 
-    焊前(0,"BEFORE-WELDING"),
-    工艺(1,"CRAFT"),
-    耐压(2,"VOLTAGE"),
-    敷设(3,"LAY"),
-    定位(4,"LOTCATION");
-
-    private Integer status;
+    焊前人员("0","STAFF"),
+    焊前设备("1","EQUIPMENT"),
+    焊前管材质量("2","BEFORE-WELDING"),
+    焊接工艺("3","CRAFT"),
+    管道耐压("4","VOLTAGE"),
+    敷设质量("5","LAY"),
+    焊口定位("6","LOTCATION");
+
+    private String status;
     private String name;
 
 
 
 
-    public static Map<Integer,String> getNameByStatusMap = new HashMap<Integer,String>();
-    public static Map<String,Integer> getStatusByNameMap = new HashMap<String,Integer>();
+    public static Map<String,String> getNameByStatusMap = new HashMap<String,String>();
+    public static Map<String,String> getStatusByNameMap = new HashMap<String,String>();
     static {
         for(StageEnum enums:StageEnum.values()){
             getNameByStatusMap.put(enums.status,enums.name);

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AcceptDto", description="接收App数据")
+public class AcceptDto  extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FacilityDto", description="焊接设备检验信息")
+public class FacilityDto extends IntelligentInspectionDto{
+}

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

@@ -47,36 +47,8 @@ public class IntelligentInspectionDto extends BaseDto {
     @ApiModelProperty(value = "app上传的数据")
     private String targetInfo;
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    @ApiModelProperty(value = "检验检测阶段")
+    private String stage;
 
 
 }

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

@@ -122,4 +122,40 @@ public class QualityProblemDto  extends BaseDto {
      * 检验员名称
      */
     private String inspectorName;
+
+    /**
+     * 监管部门
+     */
+    private String superviseDeptName;
+
+    /**
+     * 、监检机构
+     */
+    private String inspectionUnitName;
+
+    /**
+     * 建设单位
+     */
+    private String constructionUnit;
+
+    /**
+     * 安装单位
+     */
+    private String installationUnit;
+
+    /**
+     * 建设单位负责人
+     */
+    private String chargerPerson;
+
+    /**
+     * 流程id
+     */
+    private String installId;
+
+    /**
+     * 流程状态
+     */
+    private String status;
+
 }

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

@@ -36,4 +36,30 @@ public class RectifyMsgDto  extends BaseDto {
     @ApiModelProperty(value = "短信发送日期")
     private Date sendTime;
 
+    @ApiModelProperty(value = "质量问题编码")
+    private String code;
+
+    @ApiModelProperty(value = "质量问题产生阶段")
+    private String generateStage;
+
+    @ApiModelProperty(value = "质量问题描述")
+    private String desc;
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+    @ApiModelProperty(value = "安装（使用）单位")
+    private String installationUnit;
+
+    @ApiModelProperty(value = "所在地")
+    private String address;
+
+    @ApiModelProperty(value = "质量问题处理进度")
+    private String processProgress;
+
+    @ApiModelProperty(value = "短信通知单位")
+    private String noticeUnitName;
+
+
+
 }

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TubingDto", description="焊接管材检验信息")
+public class TubingDto extends IntelligentInspectionDto {
+
+}

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="WorkerDto", description="焊接人员检验信息")
+public class WorkerDto extends IntelligentInspectionDto {
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/QualityProblem.java

@@ -136,4 +136,14 @@ public class QualityProblem extends BaseEntity {
 	@TableField("rectify_within_time")
     private Boolean rectifyWithinTime;
 
+    /**
+     * 流程id
+     */
+	private String instanceId;
+    /**
+     * 流程状态
+     */
+	private String status;
+	
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Verify.java

@@ -90,5 +90,4 @@ public class Verify extends BaseEntity {
 
     //项目表
     private Project project;
-
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/QualityProblemMapper.java

@@ -17,4 +17,6 @@ public interface QualityProblemMapper extends BaseMapper<QualityProblem> {
 
     IPage<QualityProblemDto> getItems(IPage<QualityProblemDto> page,QualityProblemDto qualityProblemDto);
 
+    QualityProblemDto getInfoBySequenceNbr(String sequenceNbr);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/RectifyMsgMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 整改短信通知表 Mapper 接口
@@ -11,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface RectifyMsgMapper extends BaseMapper<RectifyMsg> {
 
+
+    IPage<RectifyMsgDto> queryForRectifyMsgPage(IPage<RectifyMsgDto> page, String name,String installationUnit );
+
+
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/VerifyMapper.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
 import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
 
 /**
  * 智能监检管理表 Mapper 接口
@@ -9,6 +12,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2022-09-22
  */
+@Mapper
 public interface VerifyMapper extends BaseMapper<Verify> {
 
+    /**
+     * 公共接口
+     * @param   stage 处于那个检验检测阶段
+     * @return
+     */
+
+    List<Verify> commonality(String stage);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IQualityProblemService.java

@@ -14,4 +14,8 @@ public interface IQualityProblemService {
 
     IPage<QualityProblemDto> getItems(String current , String size,QualityProblemDto qualityProblemDto);
 
+    QualityProblemDto getInfoBySequenceNbr(String sequenceNbr);
+
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IRectifyMsgService.java

 package com.yeejoin.amos.boot.module.ugp.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
+
 /**
  * 整改短信通知表接口类
  *
@@ -9,4 +15,7 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
  */
 public interface IRectifyMsgService {
 
+    IPage<RectifyMsgDto> queryForRectifyMsgPage(IPage<RectifyMsgDto> page, String name, String installationUnit);
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IVerifyService.java

 package com.yeejoin.amos.boot.module.ugp.api.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.dto.FacilityDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.IntelligentInspectionDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.TubingDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.WorkerDto;
 
 /**
  * 智能监检管理表接口类
@@ -9,4 +14,8 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
  */
 public interface IVerifyService {
 
+    Page<TubingDto> selectInspection(Page<TubingDto> page, TubingDto dto);
+    Page<WorkerDto> selectWorker(Page<WorkerDto> page, WorkerDto dto);
+    Page<FacilityDto> selectFacility(Page<FacilityDto> page, FacilityDto dto);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/QualityProblemMapper.xml

@@ -7,15 +7,24 @@
         qi.*,
         up.`name` AS project_name,
         up.address AS project_address,
+        up.construction_unit,
+        up.installation_unit,
+        up.charge_person,
         uv.stage,
         uv.target_info,
         uv.verify_unit_id,
         uv.charger_person_id,
-        uv.inspector_id
+        uv.inspector_id,
+        ou.biz_org_name AS supervise_dept_name,
+        cou.biz_org_name AS inspection_unit_name
+
         FROM
         tz_ugp_quality_problem AS qi
         LEFT JOIN tz_ugp_project AS up ON up.sequence_nbr = qi.project_id
         LEFT JOIN tz_ugp_verify AS uv ON uv.sequence_nbr = qi.stage_verify_id
+        LEFT JOIN tz_ugp_supervise_rule AS ur ON up.install_region_code = ur.admin_region_code
+        LEFT JOIN cb_org_usr AS ou ON ur.supervise_dept_id = ou.sequence_nbr
+        LEFT JOIN cb_org_usr AS cou ON ur.inspection_unit_id = cou.sequence_nbr
         <where>
             <if test="qualityProblemDto.projectName != '' and qualityProblemDto.projectName != null">
                 and up.`name` like concat("%",qualityProblemDto.projectName,"%")
@@ -26,4 +35,31 @@
         </where>
     </select>
 
+    <select id="getInfoBySequenceNbr" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto">
+        SELECT
+        qi.*,
+        up.`name` AS project_name,
+        up.address AS project_address,
+        up.construction_unit,
+        up.installation_unit,
+        up.charge_person,
+        uv.stage,
+        uv.target_info,
+        uv.verify_unit_id,
+        uv.charger_person_id,
+        uv.inspector_id,
+        ou.biz_org_name AS supervise_dept_name,
+        cou.biz_org_name AS inspection_unit_name
+        FROM
+        tz_ugp_quality_problem AS qi
+        LEFT JOIN tz_ugp_project AS up ON up.sequence_nbr = qi.project_id
+        LEFT JOIN tz_ugp_verify AS uv ON uv.sequence_nbr = qi.stage_verify_id
+        LEFT JOIN tz_ugp_supervise_rule AS ur ON up.install_region_code = ur.admin_region_code
+        LEFT JOIN cb_org_usr AS ou ON ur.supervise_dept_id = ou.sequence_nbr
+        LEFT JOIN cb_org_usr AS cou ON ur.inspection_unit_id = cou.sequence_nbr
+        WHERE qi.sequence_nbr = #{sequenceNbr}
+    </select>
+
+
+
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/RectifyMsgMapper.xml

@@ -2,4 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.RectifyMsgMapper">
 
+    <select id = 'queryForRectifyMsgPage' resultType="com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto">
+        SELECT msg.*,pro.project_id,org.biz_org_name,up.installation_unit,pro.`code`,pro.generate_stage,pro.`desc`,up.`name`,up.address,pro.process_progress,gro.biz_org_name AS notice_unit_name
+        FROM tz_ugp_rectify_msg AS msg
+        LEFT JOIN tz_ugp_quality_problem AS pro ON pro.sequence_nbr = msg.problem_id
+        LEFT JOIN cb_org_usr AS org ON org.sequence_nbr = msg.msg_receiver
+        LEFT JOIN tz_ugp_project AS up ON up.sequence_nbr = pro.project_id
+        LEFT JOIN cb_org_usr AS gro ON gro.sequence_nbr = msg.notice_unit_id
+        <where>
+            <if test="name != '' and name != null" >
+                and up.`name` like concat("%", #{name},"%")
+            </if>
+
+            <if test="installationUnit != '' and installationUnit != null" >
+                and up.installation_unit like concat("%",#{installationUnit},"%")
+            </if>
+
+        </where>
+
+    </select>
+
+
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.VerifyMapper">
 
+
+    <resultMap id="resultMap" type="com.yeejoin.amos.boot.module.ugp.api.entity.Verify">
+        <result property="sequenceNbr" column="sequence_nbr" jdbcType="INTEGER"/>
+        <result property="projectId" column="project_id" jdbcType="INTEGER"/>
+        <result property="code" column="code" jdbcType="VARCHAR"/>
+        <result property="stage" column="stage" jdbcType="VARCHAR"/>
+        <result property="targetInfo" column="target_info" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="submitTime" column="submit_time" jdbcType="TIMESTAMP"/>
+        <result property="verifyTime" column="verify_time" jdbcType="TIMESTAMP"/>
+        <result property="verifyUnitId" column="verify_unit_id" jdbcType="INTEGER"/>
+        <result property="chargerPersonId" column="charger_person_id" jdbcType="INTEGER"/>
+        <result property="inspectorId" column="inspector_id" jdbcType="INTEGER"/>
+        <association property="project" javaType="com.yeejoin.amos.boot.module.ugp.api.entity.Project">
+            <result property="name" column="name"></result>
+            <result property="code" column="code"></result>
+        </association>
+
+    </resultMap>
+
+
+    <select id="commonality" resultMap="resultMap">
+         select
+         vf.sequence_nbr,
+        vf.project_id,
+        vf.stage,
+        vf.status,
+        vf.target_info,
+        vf.type,
+        vf.submit_time,
+        vf.verify_time,
+        vf.verify_unit_id,
+        vf.charger_person_id,
+        vf.inspector_id,
+        pt.name,
+        pt.code
+        from
+        tz_ugp_verify vf,
+        tz_ugp_project pt
+         where
+        vf.project_id =pt.sequence_nbr
+        and
+        pt.is_delete='0'
+        and
+		vf.stage =#{stage}
+
+    </select>
+
 </mapper>

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.QualityProblemServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -125,10 +126,29 @@ public class QualityProblemController extends BaseController {
 	 * 列表分页查询
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@RequestMapping(value = "/pageList", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
 	public ResponseModel<IPage<QualityProblemDto>> getItems(String current, String size,QualityProblemDto qualityProblemDto){
 		return ResponseHelper.buildResponse(qualityProblemServiceImpl.getItems(current,size,qualityProblemDto));
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/updateItem")
+	@ApiOperation(httpMethod = "POST", value = "更新质量问题表")
+	public ResponseModel<String> updateItem(@RequestBody QualityProblem qualityProblem,Long sequenceNbr){
+		return ResponseHelper.buildResponse(qualityProblemServiceImpl.updateItem(qualityProblem,sequenceNbr));
+	}
+
+	/**
+	 * 质量问题详情显示
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@RequestMapping(value = "/getInfoBySequenceNbr", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "质量问题详情显示", notes = "质量问题详情显示")
+	public ResponseModel<QualityProblemDto> getInfoBySequenceNbr(String sequenceNbr){
+		return ResponseHelper.buildResponse(qualityProblemServiceImpl.getInfoBySequenceNbr(sequenceNbr));
+	}
+
 }

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

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -91,15 +92,18 @@ public class RectifyMsgController extends BaseController {
      * @param current 每页大小
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "整改短信通知表分页查询",  notes = "整改短信通知表分页查询")
-	public ResponseModel<Page<RectifyMsgDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<RectifyMsgDto> page = new Page<RectifyMsgDto>();
+	public ResponseModel<IPage<RectifyMsgDto>> queryForPage(
+			@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size,
+			@RequestParam(value = "name",required = false) String name,
+			@RequestParam(value = "installationUnit",required = false) String installationUnit) {
+	    IPage<RectifyMsgDto> page = new Page<RectifyMsgDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(rectifyMsgServiceImpl.queryForRectifyMsgPage(page));
+	    return ResponseHelper.buildResponse(rectifyMsgServiceImpl.queryForRectifyMsgPage(page,name,installationUnit));
 	}
 
 	/**
@@ -107,7 +111,7 @@ public class RectifyMsgController extends BaseController {
      *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "整改短信通知表列表全部数据查询",   notes = "整改短信通知表列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<RectifyMsgDto>> selectForList() {

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

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.yeejoin.amos.boot.module.ugp.api.dto.*;
+import com.yeejoin.amos.boot.module.ugp.api.service.IVerifyService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -13,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.ugp.api.dto.VerifyDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
@@ -30,6 +31,8 @@ public class VerifyController extends BaseController {
 
     @Autowired
     VerifyServiceImpl verifyServiceImpl;
+    @Autowired
+	IVerifyService service;
 
     /**
      * 新增智能监检管理表
@@ -113,4 +116,97 @@ public class VerifyController extends BaseController {
 	public ResponseModel<List<VerifyDto>> selectForList() {
 	    return ResponseHelper.buildResponse(verifyServiceImpl.queryForVerifyList());
 	}
+
+
+
+
+
+
+
+
+
+
+	/**   cpp
+	 *
+	 *焊接管材检验信息列表
+	 * @param current
+	 * @param size
+	 * @param dto
+	 * @return
+	 */
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectInspection")
+	@ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表")
+	public ResponseModel<Page<TubingDto>> selectInspection(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size, TubingDto dto) {
+		Page<TubingDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(service.selectInspection(page,dto));
+	}
+
+
+	/**   cpp
+	 *
+	 *查询焊接人员检验信息列表
+	 * @param current
+	 * @param size
+	 * @param dto
+	 * @return
+	 */
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectWorker")
+	@ApiOperation(httpMethod = "GET", value = "查询焊接人员检验信息列表", notes = "查询焊接人员检验信息列表")
+	public ResponseModel<Page<WorkerDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size, WorkerDto dto) {
+		Page<WorkerDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(service.selectWorker(page,dto));
+	}
+
+	/**   cpp
+	 *
+	 *查询焊接设备检验信息列表
+	 * @param current
+	 * @param size
+	 * @param dto
+	 * @return
+	 */
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectFacility")
+	@ApiOperation(httpMethod = "GET", value = "查询焊接设备检验信息列表", notes = "查询焊接设备检验信息列表")
+	public ResponseModel<Page<FacilityDto>> selectFacility(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size, FacilityDto dto) {
+		Page<FacilityDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(service.selectFacility(page,dto));
+	}
+
+
+
+
+
+
+
+	/**
+	 *  cpp
+	 *
+	 *    校验
+	 * @param dto
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/checks")
+	@ApiOperation(httpMethod = "POST", value = "校验app上传数据", notes = "校验app上传数据")
+	public ResponseModel<String> checks(@RequestBody AcceptDto dto) {
+		return ResponseHelper.buildResponse(verifyServiceImpl.checks(dto));
+	}
+
+
+
 }

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

@@ -135,7 +135,7 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
 
             }
         }
-        return null;
+        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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 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.ugp.api.entity.InstallNoticeMsg;
-import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
-import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProBlemProcessEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.AjaxResult;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Dell
@@ -27,6 +37,9 @@ import java.util.List;
 public class ProblemInitiationServiceImpl {
 
     @Autowired
+    WorkflowFeignService workflowFeignService;
+
+    @Autowired
     ProjectServiceImpl projectServiceImpl;
 
     @Autowired
@@ -38,8 +51,81 @@ public class ProblemInitiationServiceImpl {
     @Autowired
     OrgUsrServiceImpl orgUsrServiceImpl;
 
+    @Autowired
+    ProjectInitiationServiceImpl projectInitiationService;
+
+    @Autowired
+    QualityProblemServiceImpl qualityProblemService;
+
     private static String SMSCODE = "SMS_UGP_0002";
 
+    @Value("${params.work.flow.problemDefinitionKey}")
+    private String problemDefinitionKey;
+
+    @Transactional(rollbackFor = Exception.class)
+    public String start() {
+        String instanceId = null;
+        //启动流程
+        try {
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey(problemDefinitionKey);
+            dto.setBusinessKey("1");
+            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
+            instanceId = ((Map)ajaxResult.get("data")).get("id").toString();
+            ProjectInitiation projectInitiation = new ProjectInitiation();
+            projectInitiation.setInstanceId(instanceId);
+            projectInitiation.setTaskName("流程启动！");
+            projectInitiationService.save(projectInitiation);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("流程启动失败："+e.getMessage());
+        }
+        updateProBlemFlowStatus(instanceId);
+        return instanceId;
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public void execute(String instanceId,Object objectd, String option){
+        JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(objectd));
+        JSONObject jsonObject = workflowFeignService.getTask(instanceId);
+        ProjectInitiation projectInitiation = new ProjectInitiation();
+        projectInitiation.setInstanceId(instanceId);
+        projectInitiation.setContext(JSON.toJSONString(objectd));
+        JSONObject dataObject = jsonObject.getJSONObject("data");
+        projectInitiation.setTaskId(dataObject.getString("id"));
+        projectInitiation.setTaskName(dataObject.getString("name"));
+
+        if (ProBlemProcessEnum.重大问题发送短信.getName().equals(dataObject.getString("name"))) {
+            if(!ValidationUtil.isEmpty(objectd)) {
+                sendSms(object);
+            }
+        }
+
+
+        try {
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResult(option);
+            dto.setResultCode("select");
+            dto.setTaskId(projectInitiation.getTaskId());
+            HashMap<String, Object> var = new HashMap<>();
+            var.put("select", option);
+            dto.setVariable(var);
+            //执行流程
+            Workflow.taskClient.completeByTask(projectInitiation.getTaskId(),dto);
+            //保存日志
+            projectInitiationService.save(projectInitiation);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("任务完成失败："+e.getMessage());
+        } finally {
+            //更新problem中的status字段，表示当前流程下一个执行的任务
+            updateProBlemFlowStatus(instanceId);
+        }
+    }
+
+
     public void sendSms(JSONObject object){
         //设置短信发送的基本参数
         HashMap<String, String> smsParams = new HashMap();
@@ -81,4 +167,12 @@ public class ProblemInitiationServiceImpl {
         }
         return smsRecordModel;
     }
+
+    public void updateProBlemFlowStatus(String instanceId){
+        LambdaQueryWrapper<QualityProblem> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(QualityProblem::getInstanceId,instanceId);
+        QualityProblem qualityProblem = qualityProblemService.getOne(wrapper);
+        qualityProblem.setStatus(projectInitiationService.getFlowTaskName(instanceId));
+        qualityProblemService.updateById(qualityProblem);
+    }
 }

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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProBlemProcessEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.QualityProblemMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IQualityProblemService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -59,4 +63,61 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
         page.setRecords(list);
         return page;
     }
+
+    public String updateItem(QualityProblem qualityProblem, Long sequenceNbr){
+        QualityProblem quality = this.getById(sequenceNbr);
+        if(ProBlemProcessEnum.确定问题.getName().equals(quality.getStatus())) {
+            //监检机构确定问题
+            quality.setLevel(qualityProblem.getLevel());
+            quality.setReformLimitDate(qualityProblem.getReformLimitDate());
+            if(ProblemTypeEnum.一般问题.getCode().equals(quality.getLevel())){
+                //流程执行一次
+            }
+            if(ProblemTypeEnum.重大问题.getCode().equals(quality.getLevel())){
+                //流程执行两次
+            }
+        }
+        if(ProBlemProcessEnum.编制处理方案.getName().equals(quality.getStatus())) {
+            //编制处理方案
+            quality.setSolution(qualityProblem.getSolution());
+            quality.setSolutionDesc(qualityProblem.getSolutionDesc());
+            //执行一次
+        }
+        if(ProBlemProcessEnum.提交整改书.getName().equals(quality.getStatus())) {
+            //上传整改书
+            quality.setReformDoc(qualityProblem.getReformDoc());
+            quality.setReformDesc(qualityProblem.getReformDesc());
+            quality.setRectifyWithinTime(quality.getReformLimitDate().after(new Date()));
+            //审核通过
+            if (quality.getRectifyWithinTime()) {
+                quality.setReviewStatus(qualityProblem.getReviewStatus());
+                //执行流程 option=1
+            } else {
+                //执行两次流程 option=2
+            }
+        }
+        if(ProBlemProcessEnum.问题分类.getName().equals(quality.getStatus())) {
+            quality.setHandingOpinion(qualityProblem.getHandingOpinion());
+            quality.setHandingOpinionDesc(qualityProblem.getHandingOpinionDesc());
+            //执行两次
+        }
+        if(ProBlemProcessEnum.审查整改过程.getName().equals(quality.getStatus())) {
+            quality.setReviewStatus(qualityProblem.getReviewStatus());
+            if(ProblemTypeEnum.存在问题.equals(quality.getReviewStatus())){
+                if(ProblemTypeEnum.一般问题.getName().equals(quality.getLevel())){
+                    //执行一次
+                }else {
+                    //执行两次
+                }
+            }
+        }
+
+        this.updateById(quality);
+        return "0k";
+    }
+
+    public QualityProblemDto getInfoBySequenceNbr(String sequenceNbr){
+        return qualityProblemMapper.getInfoBySequenceNbr(sequenceNbr);
+    }
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.RectifyMsgMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IRectifyMsgService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 整改短信通知表服务实现类
@@ -17,11 +25,17 @@ import java.util.List;
  */
 @Service
 public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,RectifyMsgMapper> implements IRectifyMsgService {
+
+    @Autowired
+    IRectifyMsgService iRectifyMsgService;
+
+    @Autowired
+    RectifyMsgMapper rectifyMsgMapper;
     /**
      * 分页查询
      */
-    public Page<RectifyMsgDto> queryForRectifyMsgPage(Page<RectifyMsgDto> page)   {
-        return this.queryForPage(page, null, false);
+    public IPage<RectifyMsgDto> queryForRectifyMsgPage(IPage<RectifyMsgDto> page,String name,String installationUnit) {
+        return rectifyMsgMapper.queryForRectifyMsgPage(page,name,installationUnit);
     }
 
     /**
@@ -30,4 +44,10 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
     public List<RectifyMsgDto> queryForRectifyMsgList()   {
         return this.queryForList("" , false);
     }
+
+    /**
+     * 质量问题整改短信列表查询
+     */
+    
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
-
+import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
+import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.VerifyMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IVerifyService;
-import com.yeejoin.amos.boot.module.ugp.api.dto.VerifyDto;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,4 +34,140 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
     public List<VerifyDto> queryForVerifyList()   {
         return this.queryForList("" , false);
     }
+
+
+
+
+
+
+
+@Autowired
+private  VerifyMapper verifyMapper;
+    /**
+     * 智能监检共用查询方法
+     *
+     */
+    public List<IntelligentInspectionDto> commonality(String stage){
+
+        List<Verify> commonality = verifyMapper.commonality(stage);
+        List<IntelligentInspectionDto> dtoList =new ArrayList<>();
+                //进入焊前
+                if (commonality !=null && commonality.size() !=0){
+
+                    for (Verify verify : commonality) {
+                        IntelligentInspectionDto beforeDto = new IntelligentInspectionDto( );
+                        beforeDto.setSequenceNbr(verify.getSequenceNbr());//智能监检表id
+                        beforeDto.setProjectId(verify.getProjectId());  //项目id
+                        beforeDto.setName(verify.getProject().getName());//项目名称
+                        beforeDto.setProjectCode(verify.getProject().getCode());//项目编号
+                        beforeDto.setStatus(verify.getStatus());//检验状态
+                        beforeDto.setType(verify.getType());//检验方式
+                        beforeDto.setSubmitTime(verify.getVerifyTime());//交检日期
+                        beforeDto.setVerifyTime(verify.getVerifyTime());//检验时间
+                        beforeDto.setStage(verify.getStage());
+                        String targetInfo = verify.getTargetInfo();//app上传数据
+                        beforeDto.setTargetInfo(targetInfo);
+                        dtoList.add(beforeDto);
+                    }
+                }
+
+                return dtoList ;
+    }
+
+
+
+
+    /**
+     * 查询焊接管材检验信息列表
+     * @param page
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<TubingDto> selectInspection(Page<TubingDto> page, TubingDto dto) {
+
+        List<IntelligentInspectionDto> commonality = this.commonality(StageEnum.焊前管材质量.getName());
+        ArrayList<TubingDto> list = new ArrayList<>( );
+        for (IntelligentInspectionDto intelligentInspectionDto : commonality) {
+            TubingDto tubingDto = new TubingDto( );
+            BeanUtils.copyProperties(intelligentInspectionDto,tubingDto);
+            list.add(tubingDto);
+        }
+        page.setRecords(list);
+        page.setTotal(list.size());
+        return page;
+    }
+
+
+
+    /**
+     * 查询焊接人员检验信息列表
+     * @param page
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<WorkerDto> selectWorker(Page<WorkerDto> page, WorkerDto dto) {
+
+        List<IntelligentInspectionDto> commonality = this.commonality(StageEnum.焊前人员.getName());
+        ArrayList<WorkerDto> workerList = new ArrayList<>( );
+        for (IntelligentInspectionDto intelligentInspectionDto : commonality) {
+            WorkerDto workerDto = new WorkerDto( );
+            BeanUtils.copyProperties(intelligentInspectionDto,workerDto);
+            workerList.add(workerDto);
+        }
+        page.setRecords(workerList);
+        page.setTotal(workerList.size());
+        return page;
+    }
+
+
+
+
+
+    /**
+     * 查询焊接设备检验信息列表
+     * @param page
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<FacilityDto> selectFacility(Page<FacilityDto> page, FacilityDto dto) {
+
+        List<IntelligentInspectionDto> commonality = this.commonality(StageEnum.焊前设备.getName());
+        ArrayList<FacilityDto> facilityList = new ArrayList<>( );
+        for (IntelligentInspectionDto intelligentInspectionDto : commonality) {
+            FacilityDto facilityDto = new FacilityDto( );
+            BeanUtils.copyProperties(intelligentInspectionDto,facilityDto);
+            facilityList.add(facilityDto);
+        }
+        page.setRecords(facilityList);
+        page.setTotal(facilityList.size());
+        return page;
+    }
+
+    /**
+     * 智能监检校验数据
+     * @param dto
+     * @return
+     */
+    public String checks(AcceptDto dto) {
+        if (dto != null) {
+            // 校验数据
+         
+            //调用方法判断
+
+
+            //通过,将数据添加到verity表中,并返回ok
+
+
+            //如果不通过，将出现问题的哪一个阶段存入tz_ugp_quality_problem表中,返回失败
+
+        }
+
+
+        return "ok";
+
+
+    }
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties

@@ -30,6 +30,7 @@ emqx.password=123456
 fire-rescue=123
 
 params.work.flow.processDefinitionKey=xiangmulixiangliucheng
+params.work.flow.problemDefinitionKey=zhiliangwentiliucheng
 amos.secret.key=ugp
 
 #logging.level.com.yeejoin.amos=error
\ No newline at end of file