fix(jg):密评集成后报错问题解决

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

@@ -2528,16 +2528,17 @@
         )
     </select>
     <update id="updateTechParamDynamic">
-        <if test="columns != null and columns.size > 0">
-            update
-                ${tableName}
-            set
-                <foreach collection="columns" item="column" separator=",">
+        update ${tableName}
+        <set>
+            <foreach collection="columns" item="column" separator=",">
+                <if test="column.columnValue != null and column.columnValue != ''">
                     ${column.columnName} = #{column.columnValue}
-                </foreach>
-            where record = #{record}
-        </if>
+                </if>
+            </foreach>
+        </set>
+        where record = #{record}
     </update>
+
     <select id="countBizNumAfterUseReg" resultType="java.lang.Long">
         select
             sum(inUseNumber)

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

@@ -91,8 +91,6 @@
             <if test="contractDto.createDate != null">
                 AND tjmc.create_date LIKE concat(DATE_FORMAT(#{contractDto.createDate},'%Y-%m-%d'),'%')
             </if>
-            -- 数据过滤开始 ----------------------------------------------------
-            -- 只有使用单位或者维保单位用，或者都没有
             <if test="contractDto.useUnitCodeFilter != '' and contractDto.useUnitCodeFilter != null">
                 and (tjmc.use_unit_code = #{contractDto.useUnitCodeFilter}
                     or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
@@ -102,13 +100,11 @@
                     or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
                 and (tjmc.instance_id  <![CDATA[<>]]>  '')
             </if>
-            -- 接受机构用
             <if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null">
                 and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter}
                     or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
                 and (tjmc.instance_id <![CDATA[<>]]>  '')
             </if>
-            -- 监管单位用
             <if test="contractDto.orgBranchCode != '' and contractDto.orgBranchCode != null">
                 and tjmc.instance_id <![CDATA[<>]]>  ''
                 HAVING (
@@ -118,7 +114,6 @@
                 WHERE ede.equip_transfer_id = tjmc.sequence_nbr
                 ) LIKE concat('%', #{contractDto.orgBranchCode}, '%')
             </if>
-            -- 数据过滤结束 ----------------------------------------------------
         </where>
         ORDER BY
         <if test="sort != null">

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

@@ -379,7 +379,7 @@
         </choose>
     </select>
 
-    <select id="getListPage1" resultType="java.util.Map">
+    <select id="getListPage1" resultType="java.util.Map" fetchSize="500">
         WITH pre_filtered_equipment AS NOT MATERIALIZED (
         SELECT re.equip_transfer_id
         FROM tzs_jg_use_registration_eq re

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/EquipChangeDataUpdateServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.edit.process.equip;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -224,7 +225,9 @@ public class EquipChangeDataUpdateServiceImpl {
             return columnDto;
         }).collect(Collectors.toList());
         //  sql 动态构建入库
-        commonMapper.updateTechParamDynamic(tableName, record, columns);
+        if (CollUtil.isNotEmpty(columns)) {
+            commonMapper.updateTechParamDynamic(tableName, record, columns);
+        }
     }
 
     public void checkFactoryChangeData(String record, EquipFactoryChangeDataDto equipFactoryChangeDataDto, String equList, String equCategory, String equDefine) {