feat: 检验检测单据列表查询增加监管单位查看逻辑

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -35,7 +35,14 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
 
     void updatePromoter(@org.apache.ibatis.annotations.Param("id") Long id);
 
-    Page<JyjcInspectionApplicationModel> selectForPage(@Param("page") Page<JyjcInspectionApplication> page, @Param("jyjcInspectionApplicationModel") JyjcInspectionApplicationModel jyjcInspectionApplicationModel, @Param("identity") String identity, @Param("currentApplicationUnitCode") String currentApplicationUnitCode, @Param("currentInspectionUnitCode") String currentInspectionUnitCode, @Param("currentUserId") String currentUserId, @Param("sort") SortVo sortMap);
+    Page<JyjcInspectionApplicationModel> selectForPage(@Param("page") Page<JyjcInspectionApplication> page,
+                                                       @Param("jyjcInspectionApplicationModel") JyjcInspectionApplicationModel jyjcInspectionApplicationModel,
+                                                       @Param("identity") String identity,
+                                                       @Param("currentApplicationUnitCode") String currentApplicationUnitCode,
+                                                       @Param("currentInspectionUnitCode") String currentInspectionUnitCode,
+                                                       @Param("currentUserId") String currentUserId,
+                                                       @Param("sort") SortVo sortMap,
+                                                       @Param("orgCode") String orgCode);
 
     /**
      * 查询待受理流流程状态的设备

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

@@ -25,7 +25,8 @@ public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningAppl
                                                                        @Param("jyjcOpeningApplicationRequstDto") JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto,
                                                                        @Param("applyStartTime") String applyStartTime,
                                                                        @Param("currentUserId") String currentUserId,
-                                                                       @Param("applyendTime") String applyendTime);
+                                                                       @Param("applyendTime") String applyendTime,
+                                                                       @Param("orgCode") String orgCode);
 
     void updatePromoter(@Param("id") Long id);
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java

@@ -16,7 +16,7 @@ import java.util.List;
 public interface IJyjcInspectionApplicationService {
     Boolean deleteBatchData(List<Long> sequenceNbr);
 
-    Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model, String sort);
+    Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model, String sort,String client);
 
     void export(String bizType, HttpServletResponse response, List<String> ids);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -62,18 +62,33 @@
     </select>
 
     <sql id="page-list">
-        SELECT tzjia.*,
+        <![CDATA[/*+ set(query_dop 16)*/ ]]>
+        WITH equip_data as (
+        SELECT
+        application_seq,
+        equip_unicode,
+        group_concat(distinct si."ORG_BRANCH_CODE") as orgBranchCodes
+        FROM
+        tz_jyjc_inspection_application_equip tzjiaeq
+        LEFT JOIN idx_biz_jg_supervision_info si ON si.record = tzjiaeq.equip_unicode
+        GROUP BY application_seq
+        )
+        SELECT
+        DISTINCT tzjia.sequence_nbr AS sequenceNbr,
+        tzjia.*,
                case
                    when tzjia.plan_data<![CDATA[ <>]]> '' then TRUE
                    else false END                                                                 as isExistPlanData,
                cdd1.NAME                                                                          AS inspectionClassify,
                cdd3.NAME                                                                          AS inspectionType,
                (SELECT name FROM "tz_equipment_category" ca where ca.code = tzjia.equip_classify) AS equipClassify,
-               cdd2.NAME                                                                          AS statusName
+               cdd2.NAME                                                                          AS statusName,
+                ed.orgBranchCodes
         FROM tz_jyjc_inspection_application AS tzjia
                  LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify AND cdd1.TYPE = 'JYJCLB'
                  LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
                  LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type AND cdd3.TYPE = 'JYJC'
+                 LEFT JOIN equip_data ed on ed.application_seq = tzjia.sequence_nbr
     </sql>
 
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
@@ -120,20 +135,22 @@
             <if test="jyjcInspectionApplicationModel.applicationUnitCode != null and jyjcInspectionApplicationModel.applicationUnitCode != ''">
                 and tzjia.application_unit_code = #{jyjcInspectionApplicationModel.applicationUnitCode}
             </if>
-            <choose>
-                <when test="identity == 'apply'">
+            <if test="identity == 'apply'">
                 and (tzjia.application_unit_code = #{currentApplicationUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
-                </when>
-                <when test="identity == 'receive'">
+            </if>
+            <if test="identity == 'receive'">
                 and (tzjia.inspection_unit_code = #{currentInspectionUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
-                </when>
-                <when test="identity == 'all'">
+            </if>
+            <if test="identity == 'all'">
                 and ((tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code = #{currentInspectionUnitCode}) OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
-                </when>
-                <otherwise>
-                1=2
-                </otherwise>
-            </choose>
+            </if>
+            <if test="orgCode != null and orgCode != ''">
+                AND tzjia.instance_id <![CDATA[<>]]>  ''
+                AND EXISTS (
+                SELECT 1
+                FROM unnest(string_to_array(ed.orgBranchCodes, ',')) AS elem
+                WHERE elem LIKE  concat(#{orgCode},'%' ) )
+            </if>
         </where>
         order by
         <if test="sort != null">

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -9,6 +9,7 @@
             a.*
         from
             tz_jyjc_opening_application a
+        LEFT JOIN tz_base_enterprise_info tbei ON a.unit_code = tbei.use_code
         <where>
             <if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">
                 and a.application_seq like concat('%',#{jyjcOpeningApplicationRequstDto.applicationSeq},'%')
@@ -37,6 +38,9 @@
             <if test="jyjcOpeningApplicationRequstDto.unitCodeName != '' and jyjcOpeningApplicationRequstDto.unitCodeName != null">
                 and a.unit_code_name like concat('%',#{jyjcOpeningApplicationRequstDto.unitCodeName},'%')
             </if>
+            <if test="orgCode != '' and orgCode != null">
+                and tbei.supervise_org_code like concat(#{orgCode},'%')
+            </if>
         </where>
         order by sequence_nbr desc
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
@@ -142,11 +143,13 @@ public class JyjcInspectionApplicationController extends BaseController {
     public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageList(@RequestParam(value = "current") int current,
                                                                                 @RequestParam(value = "size") int size,
                                                                                 @RequestParam(value = "sort", required = false) String sort,
-                                                                                @RequestBody JyjcInspectionApplicationModel model) {
+                                                                                @RequestBody JyjcInspectionApplicationModel model,
+                                                                                @ApiParam(value = "客户端类型: jgAudit-监管审核;jgLook-监管查看") @RequestParam(value = "client", required = false, defaultValue = "jgAudit") String client
+                                                                                ) {
         Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForPageList(page, model, sort));
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForPageList(page, model, sort,client));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -151,12 +151,15 @@ public class JyjcOpeningApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/page")
     @ApiOperation(httpMethod = "POST", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<JyjcOpeningApplicationModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, @RequestBody JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto) {
+    public ResponseModel<Page<JyjcOpeningApplicationModel>> queryForPage(@RequestParam(value = "current") int current,
+                                                                         @RequestParam(value = "size") int size,
+                                                                         @RequestBody JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto,
+                                                                         @ApiParam(value = "客户端类型: jgAudit-监管审核;jgLook-监管查看") @RequestParam(value = "client", required = false, defaultValue = "jgAudit") String client
+    ) {
         Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page, jyjcOpeningApplicationRequstDto));
+        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page, jyjcOpeningApplicationRequstDto,client));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -19,7 +19,6 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
-import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
@@ -524,7 +523,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
     @Override
-    public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model, String sort) {
+    public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model, String sort,String client) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         SortVo sortMap = commonService.sortFieldConversion(sort);
         String companyType = reginParams.getCompany().getCompanyType();
@@ -547,7 +546,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             currentApplicationUnitCode = companyCode;
             currentInspectionUnitCode = companyCode;
         }
-        return this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode, currentUserId, sortMap);
+        String orgCode = "jgLook".equals(client) ? reginParams.getCompany().getOrgCode() : null;
+        return this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode, currentUserId, sortMap,orgCode);
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -452,7 +452,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return this.queryForList("", false);
     }
 
-    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto dto) {
+    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto dto,String client) {
         ReginParams reginParams = commonService.getReginParamsOfCurrentUser();
         String companyLevel = CommonServiceImpl.getCompanyLevel(reginParams.getCompany());
         String currentUserId = RequestContext.getExeUserId();
@@ -463,6 +463,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         } else {
             dto.setType("supervision");
         }
+        dto.setType("jgLook".equals(client) ? null : dto.getType());
+        String orgCode = "jgLook".equals(client) ? reginParams.getCompany().getOrgCode() : null;
         String applyStartTime = "";
         String applyEndTime = "";
         if (ObjectUtils.isNotEmpty(dto.getApplyTime())) {
@@ -470,7 +472,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             applyStartTime = date + " 00:00:00";
             applyEndTime = date + " 23:59:59";
         }
-        Page<JyjcOpeningApplicationModel> result = jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, dto, applyStartTime, currentUserId, applyEndTime);
+        Page<JyjcOpeningApplicationModel> result = jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, dto, applyStartTime, currentUserId, applyEndTime,orgCode);
         for (JyjcOpeningApplicationModel openingApplicationModel : result.getRecords()) {
             openingApplicationModel.setIdentityType(dto.getType());
             openingApplicationModel.setOpenBizTypeName(this.getOpenBizTypeName(openingApplicationModel.getOpenBizType()));