压缩包导入，详情修改

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml

@@ -37,19 +37,24 @@
     </resultMap>
 
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" resultMap="CaseAffiliateResult">
-        select distinct (c.id),
+        select c.id,
         c.case_appli_id, c.identity_type,c.application_organ_id,c.application_organ_name,c.name,c.identity_num,c.contact_telphone,
         c.contact_address,c.work_address,c.work_telphone ,c.name_agent,c.identity_num_agent,c.contact_telphone_agent,
         c.comp_legal_person,c.comp_legalper_post,c.respon_sex ,c.respon_birth,
         c.residen_affili,appli_agent_title,
         c.contact_address_agent,c.email, c.send_email,c.track_num,c.applicant_agent_user_id,c.agent_email,s.user_id
         from case_affiliate c
-        left join sys_user s on c.identity_num=s.id_card
-        <where>
-            <if test="caseAppliId != null ">
-                AND c.case_appli_id = #{caseAppliId}
-            </if>
-        </where>
+        left JOIN  (
+        SELECT phonenumber,user_id, ROW_NUMBER() OVER(PARTITION BY phonenumber ORDER BY user_id ASC) as rn
+        FROM sys_user
+        ) s  ON c.contact_telphone = s.phonenumber
+        WHERE
+        s.rn = 1
+
+        <if test="caseAppliId != null ">
+            AND c.case_appli_id = #{caseAppliId}
+        </if>
+
     </select>
     <select id="selectCaseAffiliateByCaseIds" resultMap="CaseAffiliateResult">
         select (c.id),
@@ -59,15 +64,18 @@
         c.residen_affili,appli_agent_title,
         c.contact_address_agent,c.email, c.send_email,c.track_num,c.applicant_agent_user_id,c.agent_email,s.user_id
         from case_affiliate c
-        left join sys_user s on c.identity_num=s.id_card
-        <where>
-            <if test="ids != null ">
-                case_appli_id in
+        left JOIN  (
+        SELECT phonenumber,user_id, ROW_NUMBER() OVER(PARTITION BY phonenumber ORDER BY user_id ASC) as rn
+        FROM sys_user
+        ) s  ON c.contact_telphone = s.phonenumber
+        WHERE
+        s.rn = 1
+        <if test="ids != null ">
+                and case_appli_id in
                 <foreach collection="ids" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-        </where>
     </select>
     <select id="selectCaseAffiliateByIdentityType"  resultMap="CaseAffiliateResult">
         select c.*

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -1379,7 +1379,7 @@
         from reserved_conference ;
     </select>
     <select id="selectBatchNumberLike" resultType="java.lang.Integer">
-        select max(batch_number) as maxBatchNumber
+        select max(batch_number+0) as maxBatchNumber
         from case_application ;
     </select>