修复人大金仓适配

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfIcbcRecordMapper.xml

@@ -104,10 +104,38 @@
         icbc.medium_id,
         ph.rec_date
         FROM
-        (SELECT amos_user_id, is_delete, developer_code,regional_companies_code, developer_user_id, MAX( sequence_nbr ), owners_name, telephone, id_card,regional_companies_name,project_address, rec_date FROM hygf_peasant_household GROUP BY amos_user_id) ph
+        (
+        SELECT
+        amos_user_id,
+        MAX(developer_code)  AS developer_code,
+        MAX(regional_companies_code ) AS regional_companies_code ,
+        MAX(is_delete) AS is_delete,
+		MAX(owners_name) AS owners_name,
+		MAX(telephone) AS telephone,
+		MAX(id_card) AS id_card,
+		MAX(regional_companies_name) AS regional_companies_name,
+		MAX(project_address) AS project_address,
+		MAX(rec_date)  AS rec_date
+        FROM hygf_peasant_household GROUP BY amos_user_id
+        ) ph
         LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
         <where>
-            ph.is_delete = 0
+             ph.is_delete = 0
+            <if test="param.custName != null and param.custName != ''">
+                AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%') OR icbc.cust_name LIKE CONCAT('%', #{param.custName}, '%'))
+            </if>
+            <if test="param.idCard != null and param.idCard != ''">
+                AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
+            </if>
+            <if test="param.phone != null and param.phone != ''">
+                AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
+            </if>
+            <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
+                AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
+            </if>
+            <if test="param.addressName != null and param.addressName != ''">
+                AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
+            </if>
             <if test="param != null">
                 <if test="param.openAccountStatus != null and param.openAccountStatus != ''">
                     <if test="param.openAccountStatus != '00'">
@@ -117,21 +145,7 @@
                         AND (icbc.open_account_status = #{param.openAccountStatus} OR icbc.open_account_status is null)
                     </if>
                 </if>
-                <if test="param.custName != null and param.custName != ''">
-                    AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%') OR icbc.cust_name LIKE CONCAT('%', #{param.custName}, '%'))
-                </if>
-                <if test="param.idCard != null and param.idCard != ''">
-                    AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
-                </if>
-                <if test="param.phone != null and param.phone != ''">
-                    AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
-                </if>
-                <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
-                    AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
-                </if>
-                <if test="param.addressName != null and param.addressName != ''">
-                    AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
-                </if>
+               
             </if>
         </where>
         <if test="param.offset != null and param.limit != null">