feat: 超设计使用年限登记列表查询增加监管单位查看逻辑

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgOverDesignServiceLifeMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgOverDesignServiceLifeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgOverDesignServiceLife;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +23,8 @@ public interface JgOverDesignServiceLifeMapper extends BaseMapper<JgOverDesignSe
 
     Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page,
                                           @Param("sort") SortVo sortMap,
-                                          @Param("dto") JgOverDesignServiceLifeDto dto);
+                                          @Param("dto") JgOverDesignServiceLifeDto dto,
+                                          @Param("orgCode") String orgCode);
 
     List<Map<String, Object>> selectEquipList(@Param("records") List<String> records);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgOverDesignServiceLifeMapper.xml

@@ -13,11 +13,22 @@
     </select>
 
     <sql id="pageList">
-        WITH crteq_limited AS (
+        <![CDATA[/*+ set(query_dop 16)*/ ]]>
+        WITH equip_data as (
+            SELECT
+                over_design_id,
+                equ_id,
+                group_concat(distinct si."ORG_BRANCH_CODE") as orgBranchCodes
+                FROM
+                tzs_jg_over_design_service_life_eq ovdseq
+                LEFT JOIN idx_biz_jg_supervision_info si ON si.record = ovdseq.equ_id
+                GROUP BY over_design_id
+        ),
+        crteq_limited AS (
             SELECT *,ROW_NUMBER() OVER (PARTITION BY over_design_id ORDER BY rec_date desc) AS rn
             FROM tzs_jg_over_design_service_life_eq)
         SELECT
-            ovds.sequence_nbr AS sequenceNbr,
+            DISTINCT ovds.sequence_nbr AS sequenceNbr,
             DATE_FORMAT(ovds.rec_date,'%Y-%m-%d') AS regDate,
             DATE_FORMAT(ovds.create_date,'%Y-%m-%d') AS createDate,
             ovds.status,
@@ -36,11 +47,13 @@
             jri.EQU_CODE AS equCode,
             (SELECT name FROM tz_equipment_category WHERE code = jri.EQU_LIST) AS equList,
             (SELECT name FROM tz_equipment_category WHERE code = jri.EQU_CATEGORY) AS equCategory,
-            (SELECT name FROM tz_equipment_category WHERE code = jri.EQU_DEFINE) AS equDefine
+            (SELECT name FROM tz_equipment_category WHERE code = jri.EQU_DEFINE) AS equDefine,
+            ed.orgBranchCodes
         FROM tzs_jg_over_design_service_life ovds
         LEFT JOIN crteq_limited ovdseq ON ovds.sequence_nbr = ovdseq.over_design_id AND ovdseq.rn = 1
         LEFT JOIN idx_biz_jg_register_info jri  ON ovdseq.equ_id = jri.RECORD
         LEFT JOIN idx_biz_jg_use_info use ON ovdseq.equ_id = use.RECORD
+        LEFT JOIN equip_data ed on ed.over_design_id = ovds.sequence_nbr
     </sql>
     <select id="getListPage" resultType="java.util.Map">
         <include refid="pageList"/>
@@ -89,6 +102,13 @@
             <if test="dto.applyNo != null and dto.applyNo != ''">
                 and  ovds.apply_no like concat('%',#{dto.applyNo},'%')
             </if>
+            <if test="orgCode != null and orgCode != ''">
+                AND ovds.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-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgOverDesignServiceLifeController.java

@@ -3,24 +3,24 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgOverDesignServiceLifeDto;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgOverDesignServiceLife;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgOverDesignServiceLifeServiceImpl;
+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.web.bind.annotation.*;
 import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+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;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgOverDesignServiceLife;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -102,7 +102,9 @@ public class JgOverDesignServiceLifeController extends BaseController {
     public ResponseModel<Page<Map<String, Object>>> getPageList(@RequestParam("current") int current,
                                                                 @RequestParam("size") int size,
                                                                 @RequestParam(value = "sort", required = false) String sort,
-                                                                JgOverDesignServiceLifeDto dto) {
+                                                                JgOverDesignServiceLifeDto dto,
+                                                                @ApiParam(value = "客户端类型: jgAudit-监管审核;jgLook-监管查看") @RequestParam(value = "client", required = false, defaultValue = "jgAudit") String client
+                                                                ) {
         ReginParams reginParams = getSelectedOrgInfo();
         dto.setUnitCode(Optional.ofNullable(reginParams.getCompany().getCompanyCode())
                 .map(code -> code.contains("_") ? code.split("_")[1] : code)
@@ -112,8 +114,10 @@ public class JgOverDesignServiceLifeController extends BaseController {
         } else {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
         }
+        dto.setDataType("jgLook".equals(client) ? null : dto.getDataType());
+        String orgCode = "jgLook".equals(client)? reginParams.getCompany().getOrgCode() : null;
         dto.setCurrentUserId(reginParams.getUserModel().getUserId());
-        return ResponseHelper.buildResponse(jgOverDesignServiceLifeServiceImpl.getPageList(new Page<>(current, size), sort, dto));
+        return ResponseHelper.buildResponse(jgOverDesignServiceLifeServiceImpl.getPageList(new Page<>(current, size), sort, dto,orgCode));
     }
 
     /**

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

@@ -120,8 +120,8 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
     /**
      * 分页查询
      */
-    public Page<Map<String, Object>> getPageList(Page<Map<String, Object>> page, String sort, JgOverDesignServiceLifeDto dto) {
-        return this.baseMapper.getListPage(page, commonService.sortFieldConversion(sort), dto);
+    public Page<Map<String, Object>> getPageList(Page<Map<String, Object>> page, String sort, JgOverDesignServiceLifeDto dto, String orgCode) {
+        return this.baseMapper.getListPage(page, commonService.sortFieldConversion(sort), dto, orgCode);
     }
 
     /**