bug修复

2024-04-07 11:10:35 +08:00
parent 9537faea90
commit 666090fbe3
21 changed files with 311 additions and 118 deletions
@@ -115,6 +115,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			<if test="code != null and code != ''">code,</if>
 			<if test="compLegalPerson != null and compLegalPerson != ''">comp_legal_person,</if>
+ 			<if test="home != null and home != ''">home,</if>
+ 			<if test="address != null and address != ''">address,</if>
+			<if test="nationality != null ">nationality,</if>
 			create_time
 		)values(
 			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -130,6 +133,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 		   <if test="code != null and code != ''">#{code},</if>
 		   <if test="compLegalPerson != null and compLegalPerson != ''">#{compLegalPerson},</if>
+		   <if test="home != null and home != ''">#{home},</if>
+		   <if test="address != null and address != ''">#{address},</if>
+			<if test="nationality != null ">#{nationality},</if>
 			sysdate()
 		);
 	</insert>
@@ -148,6 +154,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		create_by,
 		code,
 		comp_legal_person,
+		nationality,
+		home,
+		address,
 		create_time
 		)values
 		<foreach item="item" index="index" collection="list" separator=",">
@@ -165,6 +174,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		#{item.createBy},
 		#{item.code},
 		#{item.compLegalPerson},
+		#{item.nationality},
+		#{item.home},
+		#{item.address},
 		sysdate()
 		)
 		</foreach>;
@@ -186,6 +198,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="code != null and code != ''">code = #{code},</if>
 			<if test="compLegalPerson != null and compLegalPerson != ''">comp_legal_person = #{compLegalPerson},</if>
+ 			<if test="home != null and home != ''">home = #{home},</if>
+ 			<if test="address != null and address != ''">address = #{address},</if>
+ 			<if test="nationality != null ">nationality = #{nationality},</if>
 			update_time = sysdate()
 		</set>
 		where dept_id = #{deptId}
@@ -39,8 +39,13 @@
    group by a.case_appli_id
  </select>
    <select id="selectByCaseId" resultType="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate">
-        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.nick_name name,u.id_card idCard,u.phonenumber phone,
-            u.email,u.home,u.address,u.sex,u.nationality,u.id_type idType,u.birth,a.user_id userId
+        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,
+            u.email,
+               (case when a.user_id is null then d.dept_name else u.nick_name end)  name,
+               (case when a.user_id is null then d.home else u.home end) home,
+               (case when a.user_id is null then d.address else u.address end) address,
+               (case when a.user_id is null then d.nationality else u.nationality end) nationality,
+                u.sex,u.id_type idType,u.birth,a.user_id userId,c.organize_flag organizeFlag,c.case_source caseSource,d.dept_name applicantOrgName
        FROM
            ms_case_application c
                JOIN ms_case_affiliate a ON a.case_appli_id=#{id} and c.id = a.case_appli_id
@@ -52,8 +57,13 @@
        GROUP BY a.id
    </select>
    <select id="selectUserRoleByCaseIds" resultType="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate">
-        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.nick_name name,u.id_card idCard,u.phonenumber phone,
-               u.email,u.home,u.address,u.sex,u.nationality,u.id_type idType,u.birth,r.role_name roleName,d.dept_name applicantOrgName,a.user_id userId
+        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,
+               u.email,
+        (case when a.user_id is null then d.dept_name else u.nick_name end)  name,
+        (case when a.user_id is null then d.home else u.home end) home,
+        (case when a.user_id is null then d.address else u.address end) address,
+        (case when a.user_id is null then d.nationality else u.nationality end) nationality,
+        u.sex,u.id_type idType,u.birth,r.role_name roleName,d.dept_name applicantOrgName,a.user_id userId,a.applicant_dept_id applicantDeptId,c.organize_flag organizeFlag,c.case_source caseSource
        FROM
            ms_case_application c
                JOIN ms_case_affiliate a ON  c.id = a.case_appli_id
@@ -110,7 +110,7 @@
  <select id="list" resultType="com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO">
    select t.* from(
    SELECT
-    c.id,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus,
+    c.id,c.organize_flag organizeFlag,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus,
    c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum,
    u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime,
    c.mediation_method mediationMethod,
@@ -120,7 +120,7 @@
    c.id
    union
    SELECT
-    c.id,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus,
+    c.id,c.organize_flag organizeFlag,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus,
    c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum,
    u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime,
    c.mediation_method mediationMethod,