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

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 智能检验状态
+ */
+public enum IntelligentInspectionEnum {
+
+    未通过("0","未通过"),
+    通过("1","通过");
+
+    IntelligentInspectionEnum() {
+
+    }
+    IntelligentInspectionEnum(String status, String name) {
+        this.status = status;
+        this.name = name;
+    }
+
+    public static Map<String,String> getNameByStatusMap = new HashMap<String,String>();
+    public static Map<String,String> getStatusByNameMap = new HashMap<String,String>();
+    static {
+        for(IntelligentInspectionEnum inspectionEnum:IntelligentInspectionEnum.values()){
+            getNameByStatusMap.put(inspectionEnum.status,inspectionEnum.name);
+            getStatusByNameMap.put(inspectionEnum.name, inspectionEnum.status);
+        }
+    }
+
+
+    private String status;
+    private String name;
+
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author cpp
+ * @Description    检验检测阶段
+ * @Date 2022/10/17
+ */
+@Getter
+@AllArgsConstructor
+public enum  StageEnum {
+
+    焊前(0,"BEFORE-WELDING"),
+    工艺(1,"CRAFT"),
+    耐压(2,"VOLTAGE"),
+    敷设(3,"LAY"),
+    定位(4,"LOTCATION");
+
+    private Integer status;
+    private String name;
+
+
+
+
+    public static Map<Integer,String> getNameByStatusMap = new HashMap<Integer,String>();
+    public static Map<String,Integer> getStatusByNameMap = new HashMap<String,Integer>();
+    static {
+        for(StageEnum enums:StageEnum.values()){
+            getNameByStatusMap.put(enums.status,enums.name);
+            getStatusByNameMap.put(enums.name, enums.status);
+        }
+    }
+
+
+
+
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/BeforeDto.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/17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="BeforeDto", description="焊接管材检验信息列表")
+public class BeforeDto extends IntelligentInspectionDto {
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author cpp
+ * @Description  公共返回字段提取出来
+ * @Date 2022/10/13
+ */
+@Data
+public class IntelligentInspectionDto extends BaseDto {
+
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+    @ApiModelProperty(value = "项目编号")
+    private String projectCode;
+
+    @ApiModelProperty(value = "检验检测单位")
+    private String companyName;
+
+    @ApiModelProperty(value = "检验负责人")
+    private String usrName;
+
+    @ApiModelProperty(value = "检验员")
+    private String inspector;
+
+    @ApiModelProperty(value = "检验状态")
+    private String status;
+
+    @ApiModelProperty(value = "检验方式")
+    private String type;
+
+    @ApiModelProperty(value = "交检日期")
+    private Date submitTime;
+
+    @ApiModelProperty(value = "检验时间")
+    private Date verifyTime;
+
+
+    @ApiModelProperty(value = "app上传的数据")
+    private String targetInfo;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/OrgUsrDto.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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="OrgUsrDto", description="人员表")
+public class OrgUsrDto extends BaseDto {
+
+    private String bizOrgName;
+    /**
+     * 机构编码
+     */
+    private String bizOrgCode;
+    /**
+     * amos中公司/部门ID
+     */
+    private String amosOrgId;
+    /**
+     * amos中公司/部门编码
+     */
+    private String amosOrgCode;
+    /**
+     * 机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）
+     */
+    private String bizOrgType;
+    /**
+     * 所属建筑名称
+     */
+    private String buildName;
+    /**
+     * 所属建筑ID
+     */
+    private String buildId;
+    /**
+     * 归属机构/部门/人员
+     */
+    private String parentId;
+    /**
+     * 扩展属性1
+     */
+    private String orgExpandAttr1;
+    /**
+     * 扩展属性2
+     */
+    private String orgExpandAttr2;
+    /**
+     * 扩展属性3
+     */
+    private String orgExpandAttr3;
+    /**
+     * 扩展属性4
+     */
+    private String orgExpandAttr4;
+
+    private String orgExpandAttr5;
+
+    private String orgExpandAttr6;
+
+    private String orgExpandAttr7;
+
+    private String orgExpandAttr8;
+    /**
+     * 更新人
+     */
+    private String recUserName;
+    /**
+     * 更新人ID
+     */
+    private String recUserId;
+    /**
+     * 更新时间
+     */
+    private Date recDate;
+
+    /**
+     * 归属机构/部门/人员名称
+     */
+    private String parentName;
+    /**
+     * 唯一编号
+     */
+    private String code;
+    /**
+     * 省市区编号
+     */
+    private String pczCode;
+    /**
+     * 省市区名称
+     */
+    private String pczName;
+}

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

@@ -21,13 +21,13 @@ public class QualityInfoDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "企业id")
+    @ApiModelProperty(value = "项目id")
     private Long projectId;
 
     @ApiModelProperty(value = "项目进度")
     private String projectProcess;
 
-    @ApiModelProperty(value = "监理单位")
+    @ApiModelProperty(value = "监理单位id")
     private Long supervisoryUnitId;
 
 }

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

@@ -88,4 +88,7 @@ public class Verify extends BaseEntity {
 	@TableField("inspector_id")
     private Long inspectorId;
 
+    //项目表
+    private Project project;
+
 }

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

+package com.yeejoin.amos.boot.module.ugp.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
+import javafx.stage.Stage;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+
+public interface IntelligentInspectionMapper extends BaseMapper<Verify> {
+    /**
+     * 公共接口
+     * @param
+     * @return
+     */
+
+    List<Verify>  commonality();
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IIntelligentInspectionService.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.BeforeDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.IntelligentInspectionDto;
+
+public interface IIntelligentInspectionService {
+
+
+    Page<BeforeDto> selectInspection(Page<BeforeDto> page, BeforeDto dto);
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/IntelligentInspectionMapper.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.IntelligentInspectionMapper">
+
+
+    <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"/>
+        <result property="recDate" column="rec_date" jdbcType="TIMESTAMP"/>
+        <result property="recUserId" column="rec_user_id" jdbcType="INTEGER"/>
+        <result property="recUserName" column="rec_user_name" jdbcType="VARCHAR"/>
+        <result property="isDelete" column="is_delete" jdbcType="VARCHAR"/>
+        <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.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'
+
+    </select>
+
+</mapper>

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

+package com.yeejoin.amos.boot.module.ugp.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.dto.BeforeDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.IntelligentInspectionDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.PercentOfPassDto;
+import com.yeejoin.amos.boot.module.ugp.api.service.IIntelligentInspectionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+/**
+ * @Author cpp
+ * @Description 【智能监检与评价管理】【焊前准备校验】管材质量校验
+ * @Date 2022/10/13
+ */@RestController
+@Api(tags = "焊接管材检验信息列表Api")
+@RequestMapping(value = "/intelligent-inspection")
+public class IntelligentInspectionController {
+
+   @Autowired
+    IIntelligentInspectionService services;
+
+
+  @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/selectInspection")
+    @ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表")
+    public ResponseModel<Page<BeforeDto>> selectInspection(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size, BeforeDto dto) {
+        Page<BeforeDto> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(services.selectInspection(page,dto));
+    }
+
+
+}

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

@@ -101,9 +101,21 @@ public class WeldController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "焊口信息表分页查询", notes = "焊口信息表分页查询")
     public ResponseModel<Page<WeldDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size,String projectId) {
+            (value = "size") int size) {
 
-        return ResponseHelper.buildResponse(weldServiceImpl.queryForWeldPage(current, size,projectId));
+        return ResponseHelper.buildResponse(weldServiceImpl.queryForWeldPage(current, size));
+    }
+
+    /**
+     * 更新焊口编码任务状态
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/updateTask")
+    @ApiOperation(httpMethod = "GET", value = "更新焊口编码任务状态", notes = "更新焊口编码任务状态")
+    public ResponseModel<String> updateTask(Weld weld) {
+
+        return ResponseHelper.buildResponse(weldServiceImpl.updateTask(weld));
     }
 
     /**

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

+package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.QueryChainWrapper;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
+import com.yeejoin.amos.boot.module.ugp.api.dto.BeforeDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.IntelligentInspectionDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.WeldDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.IntelligentInspectionMapper;
+import com.yeejoin.amos.boot.module.ugp.api.service.IIntelligentInspectionService;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2022/10/13
+ */
+@Service
+public class IntelligentInspectionServiceImpl  extends BaseService<IntelligentInspectionDto, Verify, IntelligentInspectionMapper> implements IIntelligentInspectionService {
+
+ @Autowired
+ private IntelligentInspectionMapper mapper;
+
+
+    /**
+     * 校检阶段公共方法
+     * name: 那个阶段
+     */
+
+    public   JSONArray commonality(String  name){
+        List<Verify> commonality = mapper.commonality();
+        if (!StringUtils.isEmpty(name)) {
+
+            if (name.equals(StageEnum.焊前.getName())) {
+
+                //进入焊前
+
+                List<BeforeDto> beforeDtoList =new ArrayList<>();
+                //获取项目信息
+                for (Verify verify : commonality) {
+                    BeforeDto beforeDto = new BeforeDto( );
+                    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());//检验时间
+
+
+                    String targetInfo = verify.getTargetInfo( );//app上传数据
+
+                    //塞数据(焊口编码,管材厂家,管材批号,质量许可,焊工编号,管材验证定位信息,检验检测单位,检验负责人,监检员)
+
+                    beforeDtoList.add(beforeDto);
+
+                }
+                JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(beforeDtoList));
+                return jsonArray ;
+
+            }else if (name.equals(StageEnum.工艺.getName())) {
+                //进入工艺
+                return null;
+
+            }else if (name.equals(StageEnum.耐压.getName()) ) {
+                //进入耐压
+
+                return null;
+
+            }else if (name.equals(StageEnum.敷设.getName())) {
+                //进入敷压
+                return null;
+            }else if (name.equals(StageEnum.定位.getName()) ){
+                //进入定位
+                return null;
+
+            }
+
+        }
+
+        return null;
+    }
+
+
+
+
+
+
+
+
+    /**
+     * 查询焊接管材检验信息列表
+     * @param page
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<BeforeDto> selectInspection(Page<BeforeDto> page, BeforeDto dto) {
+
+        JSONArray commonality = this.commonality("BEFORE-WELDING");
+        List<BeforeDto> beforeDtoList = JSONObject.parseArray(commonality.toJSONString( ), BeforeDto.class);
+        page.setRecords(beforeDtoList);
+        page.setTotal(beforeDtoList.size());
+
+
+        return page;
+    }
+
+
+
+}

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

@@ -56,4 +56,16 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
 
         return names;
     }
+
+
+    /**
+     * 通过多个主键sequence_nbr查询数据
+     * @param ids
+     * @return
+     */
+    public List<Project> selectByidList(List<Long> ids){
+
+        return projectMapper.selectBatchIds(ids);
+
+    }
 }
\ 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/WeldServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldCodeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldMethodEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WeldDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Weld;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.SuperviseRuleMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.WeldMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IWeldService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -34,15 +40,22 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
     WeldMapper weldMapper;
     @Autowired
     ProjectMapper projectMapper;
+    @Autowired
+    OrgServiceImpl orgService;
+    @Autowired
+    SuperviseRuleMapper superviseRuleMapper;
 
 
 //    Logger logger = LoggerFactory.getLogger(WeldServiceImpl.class);
 
+    private final String 安装单位="INSTALL";
 
+    private final String 监察单位="SUPERVISION";
     /**
-     * 分页查询
+     * 分页查询(安装单位管理员只能查看本单位项目所有焊口信息。
+     *         监检机构管理员可查看所有项目焊口信息。)
      */
-    public Page<WeldDto> queryForWeldPage(int current, int size, String projectId) {
+    public Page<WeldDto> queryForWeldPage(int current, int size) {
         Page<WeldDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
@@ -65,15 +78,46 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
             }
 
         }
-        //如果不为空则过滤
-        if (projectId != null) {
-            List<WeldDto> L = weldDtoPage.getRecords().stream().filter(b -> b.getProjectId().equals(projectId)).collect(Collectors.toList());
+
+        //获取登录人信息
+        OrgUsr orgUsr = orgService.getOrgUsr();
+        //获取登录人企业下的所有焊口
+        if (orgUsr.getOrgExpandAttr1() == 安装单位) {
+
+            List<WeldDto> L = weldDtoPage.getRecords().stream().filter(b -> b.getInstallCompany().equals(orgUsr.getParentId())).collect(Collectors.toList());
             weldDtoPage.setRecords(L);
         }
+
+        //根据 所在地 筛选焊口
+        if (orgUsr.getOrgExpandAttr1() == 监察单位) {
+
+            LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
+            LambdaQueryWrapper<SuperviseRule> eq = wrapper.eq(SuperviseRule::getSuperviseDeptId, orgUsr.getParentId());
+            List<SuperviseRule> superviseRules = superviseRuleMapper.selectList(eq);
+            for (SuperviseRule i : superviseRules) {
+
+                List<WeldDto> L = weldDtoPage.getRecords().stream().filter(b -> b.getRegion().equals(i.getAdminRegion())).collect(Collectors.toList());
+                weldDtoPage.setRecords(L);
+            }
+        }
         return weldDtoPage;
+    }
+
+    /**
+     * 更新焊口编码任务状态
+     */
+    public String updateTask(Weld weld) {
+        LambdaQueryWrapper<Weld> wrapper = new LambdaQueryWrapper<>();
+        //根据焊口编码修改任务状态
+        wrapper.eq(Weld::getCode, weld.getCode());
+        int update = weldMapper.update(weld, wrapper);
+
+        return "成功更新" + update + "条";
 
     }
 
+
+
     /**
      * 列表查询 示例
      */

amos-boot-system-ugp/src/main/resources/mapper/TzUgpVerifyDao.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=".dao.TzUgpVerifyDao">
+
+    <resultMap id="BaseResultMap" type=".entity.TzUgpVerify">
+        <!--@Table tz_ugp_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"/>
+        <result property="recDate" column="rec_date" jdbcType="TIMESTAMP"/>
+        <result property="recUserId" column="rec_user_id" jdbcType="INTEGER"/>
+        <result property="recUserName" column="rec_user_name" jdbcType="VARCHAR"/>
+        <result property="isDelete" column="is_delete" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="BaseResultMap">
+        select
+          sequence_nbr, project_id, code, stage, target_info, status, type, submit_time, verify_time, verify_unit_id, charger_person_id, inspector_id, rec_date, rec_user_id, rec_user_name, is_delete
+        from tzs_amos_ugp_biz.tz_ugp_verify
+        where sequence_nbr = #{sequenceNbr}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="queryAllByLimit" resultMap="BaseResultMap">
+        select
+          sequence_nbr, project_id, code, stage, target_info, status, type, submit_time, verify_time, verify_unit_id, charger_person_id, inspector_id, rec_date, rec_user_id, rec_user_name, is_delete
+        from tzs_amos_ugp_biz.tz_ugp_verify
+        limit #{offset}, #{limit}
+    </select>
+
+    <!--通过实体作为筛选条件查询-->
+    <select id="queryAll" resultMap="BaseResultMap">
+        select
+          sequence_nbr, project_id, code, stage, target_info, status, type, submit_time, verify_time, verify_unit_id, charger_person_id, inspector_id, rec_date, rec_user_id, rec_user_name, is_delete
+        from tzs_amos_ugp_biz.tz_ugp_verify
+        <where>
+            <if test="sequenceNbr != null">
+                and sequence_nbr = #{sequenceNbr}
+            </if>
+            <if test="projectId != null">
+                and project_id = #{projectId}
+            </if>
+            <if test="code != null and code != ''">
+                and code = #{code}
+            </if>
+            <if test="stage != null and stage != ''">
+                and stage = #{stage}
+            </if>
+            <if test="targetInfo != null and targetInfo != ''">
+                and target_info = #{targetInfo}
+            </if>
+            <if test="status != null and status != ''">
+                and status = #{status}
+            </if>
+            <if test="type != null and type != ''">
+                and type = #{type}
+            </if>
+            <if test="submitTime != null">
+                and submit_time = #{submitTime}
+            </if>
+            <if test="verifyTime != null">
+                and verify_time = #{verifyTime}
+            </if>
+            <if test="verifyUnitId != null">
+                and verify_unit_id = #{verifyUnitId}
+            </if>
+            <if test="chargerPersonId != null">
+                and charger_person_id = #{chargerPersonId}
+            </if>
+            <if test="inspectorId != null">
+                and inspector_id = #{inspectorId}
+            </if>
+            <if test="recDate != null">
+                and rec_date = #{recDate}
+            </if>
+            <if test="recUserId != null">
+                and rec_user_id = #{recUserId}
+            </if>
+            <if test="recUserName != null and recUserName != ''">
+                and rec_user_name = #{recUserName}
+            </if>
+            <if test="isDelete != null and isDelete != ''">
+                and is_delete = #{isDelete}
+            </if>
+        </where>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="sequenceNbr" useGeneratedKeys="true">
+        insert into tzs_amos_ugp_biz.tz_ugp_verify(project_id, code, stage, target_info, status, type, submit_time, verify_time, verify_unit_id, charger_person_id, inspector_id, rec_date, rec_user_id, rec_user_name, is_delete)
+        values (#{projectId}, #{code}, #{stage}, #{targetInfo}, #{status}, #{type}, #{submitTime}, #{verifyTime}, #{verifyUnitId}, #{chargerPersonId}, #{inspectorId}, #{recDate}, #{recUserId}, #{recUserName}, #{isDelete})
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update tzs_amos_ugp_biz.tz_ugp_verify
+        <set>
+            <if test="projectId != null">
+                project_id = #{projectId},
+            </if>
+            <if test="code != null and code != ''">
+                code = #{code},
+            </if>
+            <if test="stage != null and stage != ''">
+                stage = #{stage},
+            </if>
+            <if test="targetInfo != null and targetInfo != ''">
+                target_info = #{targetInfo},
+            </if>
+            <if test="status != null and status != ''">
+                status = #{status},
+            </if>
+            <if test="type != null and type != ''">
+                type = #{type},
+            </if>
+            <if test="submitTime != null">
+                submit_time = #{submitTime},
+            </if>
+            <if test="verifyTime != null">
+                verify_time = #{verifyTime},
+            </if>
+            <if test="verifyUnitId != null">
+                verify_unit_id = #{verifyUnitId},
+            </if>
+            <if test="chargerPersonId != null">
+                charger_person_id = #{chargerPersonId},
+            </if>
+            <if test="inspectorId != null">
+                inspector_id = #{inspectorId},
+            </if>
+            <if test="recDate != null">
+                rec_date = #{recDate},
+            </if>
+            <if test="recUserId != null">
+                rec_user_id = #{recUserId},
+            </if>
+            <if test="recUserName != null and recUserName != ''">
+                rec_user_name = #{recUserName},
+            </if>
+            <if test="isDelete != null and isDelete != ''">
+                is_delete = #{isDelete},
+            </if>
+        </set>
+        where sequence_nbr = #{sequenceNbr}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete from tzs_amos_ugp_biz.tz_ugp_verify where sequence_nbr = #{sequenceNbr}
+    </delete>
+
+</mapper>
\ No newline at end of file