Merge remote-tracking branch 'origin/developer-tzs-V1.0.23.1' into developer

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/UseUnitCreditCodeCategoryDto.java

@@ -12,6 +12,11 @@ public class UseUnitCreditCodeCategoryDto {
      * 使用单位编码
      */
     private String useUnitCreditCode;
+
+    /**
+     * 管辖机构编码
+     */
+    private String orgBranchCode;
     /**
      * 状态
      */

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

@@ -39,7 +39,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     Map<String, Object> getCategoryAndDefineByRecord(@Param("record") String record);
 
-    List<Map<String, Object>> getAllUnit(@Param("unitCodes")List<String> unitCodes);
+    List<Map<String, Object>> getAllUnit(@Param("unitCodes")List<String> unitCodes,@Param("orgBranchCodes")List<String> orgBranchCodes);
 
     List<Map<String, Object>> getCategoryData(String level, String orgCode, String companyCode);
 

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.SuperviseInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 特种设备基本信息-监督管理信息 Mapper 接口
@@ -16,7 +17,7 @@ public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> {
 
 	void updateRecordBatch(@Param("recordList") List<String> recordList);
 
-	List<String> selectUnitCodeList(@Param("records") List<String> records);
+	List<Map<String,Object>> selectUnitCodeList(@Param("records") List<String> records);
 	List<String> selectSuperviseCodeList(@Param("records") List<String> records);
 
 	void deleteDataAll(@Param("records") List<String> records);

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

@@ -29,7 +29,8 @@
         <if test="status != null and status != ''">
             and status = #{status}
         </if>
-        ORDER BY CODE96333 DESC LIMIT 1
+        <if test="status != 2 ">ORDER BY CODE96333 DESC LIMIT 1 </if>
+        <if test="status == 2 ">ORDER BY CODE96333 ASC LIMIT 1 </if>
     </select>
 
     <select id="selectEquipInfo" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquInfoDto">

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

@@ -129,22 +129,27 @@
 
     <select id="getAllUnit" resultType="java.util.Map">
         SELECT
-            DISTINCT (USE_UNIT_CREDIT_CODE) use_code,
-            ifnull(ORG_BRANCH_CODE,50) supervise_org_code
+            ibjui.USE_UNIT_CREDIT_CODE use_code,
+            ibjsi.ORG_BRANCH_CODE supervise_org_code
         FROM
             idx_biz_jg_use_info ibjui
         LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjui."RECORD" = ibjsi."RECORD"
         WHERE
-        USE_UNIT_CREDIT_CODE <![CDATA[ <> ]]>  ''
-        AND (lengthb(USE_UNIT_CREDIT_CODE)= 15 or lengthb(USE_UNIT_CREDIT_CODE)= 18)
+        ibjui.USE_UNIT_CREDIT_CODE <![CDATA[ <> ]]>  ''
+        AND (lengthb(ibjui.USE_UNIT_CREDIT_CODE)= 15 or lengthb(ibjui.USE_UNIT_CREDIT_CODE)= 18)
         <if test="unitCodes !=null and unitCodes.size>0">
-            and USE_UNIT_CREDIT_CODE in
+            and ibjui.USE_UNIT_CREDIT_CODE in
             <foreach collection="unitCodes" separator="," item="unitCode" open="(" close=")">
                  #{unitCode}
             </foreach>
         </if>
-        GROUP BY use_code
-        ORDER BY use_code
+        <if test="orgBranchCodes !=null and orgBranchCodes.size>0">
+            and ibjsi.ORG_BRANCH_CODE in
+            <foreach collection="orgBranchCodes" separator="," item="orgBranchCode" open="(" close=")">
+                #{orgBranchCode}
+            </foreach>
+        </if>
+        GROUP BY use_code,supervise_org_code
     </select>
 
     <select id="getCategoryData" resultType="java.util.Map">
@@ -301,6 +306,7 @@
 
     <select id="useUnitCreditCodeCategoryCount" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.UseUnitCreditCodeCategoryDto">
         SELECT
+          ibjsi."ORG_BRANCH_CODE",
           ibjui."USE_UNIT_CREDIT_CODE",
           ibjoi."CLAIM_STATUS",
           ibjri."EQU_LIST",
@@ -309,12 +315,12 @@
           idx_biz_jg_use_info ibjui
           LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.RECORD = ibjri.RECORD
           LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
+          LEFT JOIN idx_biz_jg_supervision_info ibjsi ON  ibjsi."RECORD" = ibjui."RECORD"
         where
           ibjoi."CLAIM_STATUS" <![CDATA[ <> ]]> ''
           and ibjui."USE_UNIT_CREDIT_CODE" <![CDATA[ <> ]]> ''
           and ibjri."EQU_LIST" <![CDATA[ <> ]]> ''
-          GROUP BY ibjui."USE_UNIT_CREDIT_CODE", ibjoi."CLAIM_STATUS",ibjri."EQU_LIST"
-          ORDER BY ibjui."USE_UNIT_CREDIT_CODE"
+          GROUP BY ibjui."USE_UNIT_CREDIT_CODE",ibjsi."ORG_BRANCH_CODE", ibjoi."CLAIM_STATUS",ibjri."EQU_LIST"
     </select>
     <select id="getEquipExportData" resultType="com.yeejoin.amos.boot.module.tzs.api.vo.EquipExportVo">
         select ORG_BRANCH_NAME as orgBranchName,

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

@@ -9,15 +9,18 @@
         </foreach>
     </update>
 
-    <select id="selectUnitCodeList" resultType="java.lang.String">
+    <select id="selectUnitCodeList" resultType="java.util.Map">
         SELECT
-        DISTINCT ( USE_UNIT_CREDIT_CODE ) unitCode
+            ui."USE_UNIT_CREDIT_CODE" unitCode,
+            si."ORG_BRANCH_CODE" orgBranchCode
         FROM
             idx_biz_jg_use_info ui
+            left join idx_biz_jg_supervision_info si ON ui."RECORD" = si."RECORD"
         WHERE ui."RECORD" in
         <foreach collection="records" separator="," item="record" open="(" close=")">
             #{record}
         </foreach>
+        GROUP BY unitCode,orgBranchCode
     </select>
 
     <select id="selectSuperviseCodeList" resultType="java.lang.String">

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

@@ -12,7 +12,8 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
 spring.liquibase.enabled= true
 
-
+feign.client.config.default.connect-timeout=30000
+feign.client.config.default.read-timeout=30000
 
 ## eureka properties:
 eureka.client.registry-fetch-interval-seconds=5