Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

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

         <result property="appliAgentTitle"    column="appli_agent_title"   />
         <result property="userId"    column="user_id"   />
         <result property="email"     column="email"    />
+        <result property="sendEmail"     column="send_email"    />
+        <result property="applicantAgentUserId"     column="applicant_agent_user_id"    />
     </resultMap>
 
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" resultMap="CaseAffiliateResult">
-        select c.id ,c.case_appli_log_id ,c.identity_type ,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.contact_address_agent,
-        c.comp_legal_person,c.comp_legalper_post,c.respon_sex,c.respon_birth,
-        c.residen_affili,c.appli_agent_title,c.email,
-        c.track_num,c.application_organ_id,c.application_organ_name,s.user_id
+        select c.*,s.user_id
         from case_affiliate_log c
         left join sys_user s on c.identity_num=s.id_card
         <where>
         </where>
     </select>
     <select id="selectCaseAffiliateByIdentityType"  resultMap="CaseAffiliateResult">
-        select c.id ,c.case_appli_log_id ,c.identity_type ,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.contact_address_agent,
-        c.track_num,c.application_organ_id,c.application_organ_name
+        select c.*
         from case_affiliate_log c
         <where>
             <if test="caseAppliLogId != null ">
         contact_address,work_address,work_telphone ,name_agent,identity_num_agent,contact_telphone_agent,
         comp_legal_person,comp_legalper_post,respon_sex ,respon_birth,
         residen_affili,appli_agent_title,
-        contact_address_agent,email ) values
+        contact_address_agent,email , send_email,track_num,applicant_agent_user_id) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.caseAppliLogId},#{item.identityType},#{item.applicationOrganId},#{item.applicationOrganName},#{item.name},#{item.identityNum},#{item.contactTelphone},
             #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},#{item.contactTelphoneAgent},
             #{item.compLegalPerson},#{item.compLegalperPost},#{item.responSex},  #{item.responBirth},
             #{item.residenAffili},#{item.appliAgentTitle},
             #{item.contactAddressAgent},
-            #{item.email})
+            #{item.email},
+            #{item.sendEmail},
+            #{item.trackNum},
+            #{item.applicantAgentUserId}
+            )
         </foreach>
     </insert>
 
         send_email = #{sendEmail},
         residen_affili = #{residenAffili},
         email= #{email},
-        track_num = #{trackNum}
+        track_num = #{trackNum},
+        comp_legal_person=#{compLegalPerson},
+        comp_legalper_post=#{compLegalperPost},
+        applicant_agent_user_id=#{applicantAgentUserId},
+        respon_sex=#{responSex},
+        respon_birth=#{responBirth},
+        residen_affili=#{residenAffili},
+        appli_agent_title=#{appliAgentTitle}
 
         where id = #{id}
 

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

         <result property="appliAgentTitle"    column="appli_agent_title"   />
         <result property="userId"    column="user_id"   />
         <result property="email"     column="email"    />
+        <result property="sendEmail"     column="send_email"    />
+        <result property="applicantAgentUserId"     column="applicant_agent_user_id"    />
     </resultMap>
 
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" resultMap="CaseAffiliateResult">
-        select c.id ,c.case_appli_id ,c.identity_type ,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.contact_address_agent,
-        c.comp_legal_person,c.comp_legalper_post,c.respon_sex,c.respon_birth,
-        c.residen_affili,c.appli_agent_title,c.email,
-        c.track_num,c.application_organ_id,c.application_organ_name,s.user_id
+        select c.*,s.user_id
         from case_affiliate c
         left join sys_user s on c.identity_num=s.id_card
         <where>
         </where>
     </select>
     <select id="selectCaseAffiliateByIdentityType"  resultMap="CaseAffiliateResult">
-        select c.id ,c.case_appli_id ,c.identity_type ,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.contact_address_agent,
-        c.track_num,c.application_organ_id,c.application_organ_name
+        select c.*
         from case_affiliate c
         <where>
             <if test="caseAppliId != null ">
         contact_address,work_address,work_telphone ,name_agent,identity_num_agent,contact_telphone_agent,
         comp_legal_person,comp_legalper_post,respon_sex ,respon_birth,
         residen_affili,appli_agent_title,
-        contact_address_agent,email ) values
+        contact_address_agent,email, send_email,track_num,applicant_agent_user_id) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.caseAppliId},#{item.identityType},#{item.applicationOrganId},#{item.applicationOrganName},#{item.name},#{item.identityNum},#{item.contactTelphone},
             #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},#{item.contactTelphoneAgent},
             #{item.compLegalPerson},#{item.compLegalperPost},#{item.responSex},  #{item.responBirth},
             #{item.residenAffili},#{item.appliAgentTitle},
             #{item.contactAddressAgent},
-            #{item.email})
+            #{item.email},
+             #{item.sendEmail},
+             #{item.trackNum},
+             #{item.applicantAgentUserId}
+             )
         </foreach>
     </insert>
 
         contact_address = #{contactAddress},
         work_address = #{workAddress},
         work_telphone = #{workTelphone},
-
         name_agent = #{nameAgent},
         identity_num_agent = #{identityNumAgent},
         contact_telphone_agent = #{contactTelphoneAgent},
         send_email = #{sendEmail},
         residen_affili = #{residenAffili},
         email= #{email},
-        track_num = #{trackNum}
-
+        track_num = #{trackNum},
+            comp_legal_person=#{compLegalPerson},
+            comp_legalper_post=#{compLegalperPost},
+            applicant_agent_user_id=#{applicantAgentUserId},
+            respon_sex=#{responSex},
+            respon_birth=#{responBirth},
+            residen_affili=#{residenAffili},
+            appli_agent_title=#{appliAgentTitle}
         where id = #{id}
 
     </update>
             send_email = #{item.sendEmail},
             residen_affili = #{item.residenAffili},
             email= #{item.email},
-            track_num = #{item.trackNum}
+            track_num = #{item.trackNum},
+                comp_legal_person=#{item.compLegalPerson},
+                comp_legalper_post=#{item.compLegalperPost},
+                applicant_agent_user_id=#{item.applicantAgentUserId},
+                respon_sex=#{item.responSex},
+                respon_birth=#{item.responBirth},
+                residen_affili=#{item.residenAffili},
+                appli_agent_title=#{item.appliAgentTitle}
             </set>
         where case_appli_id = #{caseAppliId} and   identity_type= #{item.identityType};
         </foreach>