立案详情修改

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -188,6 +188,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     caseApplication.setDeptIds(deptIds);
                 }
                 if ("申请人".equals(role.getRoleName())) {
+                    caseApplication.setIsOtherRole(1);
                     // 查询有关的用户部门
                     caseApplication.setApplicationOrganId(String.valueOf(sysUser.getDeptId()));
                 }
@@ -263,6 +264,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 caseApplication.setDeptIds(deptIds);
             }
             if ("申请人".equals(role.getRoleName())) {
+                caseApplication.setIsOtherRole(1);
                 // 查询角色有关的用户部门
                 caseApplication.setApplicationOrganId(String.valueOf(sysUser.getDeptId()));
             }
@@ -1233,7 +1235,16 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     @Override
     public CaseApplication selectCaseApplication(CaseApplication caseApplication) {
-        CaseApplication caseApplicationselect=caseApplicationLogMapper.selectByCaseIdAndVersion(caseApplication.getId(),caseApplication.getVersion());
+        CaseApplication caseApplicationselect=new CaseApplication();
+        if(caseApplication.getVersion()!=null) {
+             caseApplicationselect=caseApplicationLogMapper.selectByCaseIdAndVersion(caseApplication.getId(),caseApplication.getVersion());
+
+        }
+        else {
+             caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
+
+
+        }
         caseApplicationselect.setId(caseApplication.getId());
 
 
@@ -1264,7 +1275,16 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             }
         }
         caseApplicationselect.setCaseAttachList(caseAttachList);
-        List<CaseAffiliate> caseAffiliatListeselect = caseAffiliateLogMapper.selectCaseAffiliate(caseApplicationselect.getCaseLogId());
+        List<CaseAffiliate> caseAffiliatListeselect;
+        if(caseApplication.getVersion()!=null) {
+            caseAffiliatListeselect = caseAffiliateLogMapper.selectCaseAffiliate(caseApplicationselect.getCaseLogId());
+
+        }else {
+            CaseAffiliate caseAffiliate = new CaseAffiliate();
+            caseAffiliate.setCaseAppliId(caseApplication.getId());
+            caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
+        }
+
         if (caseAffiliatListeselect != null) {
             // 查询组织机构
             List<SysDept> sysDepts = sysDeptMapper.selectDeptList(new SysDept());
@@ -1287,7 +1307,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     ;
                 } else if (identityType == 2) {
                     respondentName.append(caseAffiliateselect.getName()).append(",");
-                    ;
                 }
             }
             caseApplicationselect.setApplicantName(applicantName.toString());

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

@@ -58,7 +58,7 @@
         t1.filearbitra_url,t1.lock_status,t1.version,t1.updateSubmitStatus
         from(
         <trim suffixOverrides="union">
-                <!--被申请人，仲裁员,部门长，财务，代理人案件-->
+                <!--申请人，被申请人，仲裁员,部门长，财务，代理人案件-->
             <if test="isOtherRole!=null and isOtherRole==1">
 
                 select t.id,t.caseLogId,t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method,
@@ -125,7 +125,13 @@
                         and
                         instr (t.arbitrator_id,#{userId})>0)
                     </if>
+                    <!--申请人-->
+                    <if test="applicationOrganId != null and applicationOrganId != ''">
+                        or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
+                        <!--暂时改为可以查询到生成裁决书之前所有的案件状态-->
+                        and (t.case_status &lt;= 10 or t.case_status=31))
 
+                    </if>
                     <!--部门长-->
                     <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
                         or (t.identity_type=1 and t.case_status in
@@ -152,61 +158,61 @@
                 </where>
                 union
             </if>
-            <if test="applicationOrganId != null and applicationOrganId != ''">
+<!--            <if test="applicationOrganId != null and applicationOrganId != ''">-->
 
 
-                <!--申请人案件-->
-                select c.id ,l.id AS caseLogId,c.case_num ,l.case_subject_amount ,c.register_date ,c.arbitrat_method ,
-                CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
-                ELSE '无审理方式'
-                END arbitratMethodName,
-                c.case_status ,
-                CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
-                when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
-                when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
-                when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
-                when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
-                when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
-                when 31 then '待修改开庭时间'
-                ELSE '无案件状态'
-                END caseStatusName,
-                c.hear_date ,l.arbitrat_claims ,
-                l.loan_start_date ,l.loan_end_date ,l.claim_princi_owed ,l.claim_interest_owed ,l.claim_liquid_damag
-                ,l.fee_payable ,
-                c.begin_video_date ,c.online_video_person ,l.contract_number ,c.create_by ,c.create_time ,
-                c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name
-                as
-                applicantName,
-                c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status,l.version,l.update_submit_status as updateSubmitStatus
-                from case_application c
-                JOIN case_application_log l ON c.id = l.case_appli_id
-                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1
-
-                <where>
-                    (c.case_status &lt;= 10 or c.case_status=31) AND ca.identity_type=1
-                    and l.version=(SELECT
-                    max( version ) version
-                    FROM
-                    case_application_log where case_appli_id = c.id and update_submit_status not in(4,5))
-                    <if test="applicationOrganId != null and applicationOrganId != ''">
-                        AND ca.application_organ_id = #{applicationOrganId}
-                    </if>
-                    <if test="caseStatus != null">
-                        AND c.case_status = #{caseStatus}
-                    </if>
-                    <if test="caseNum != null and caseNum != ''">
-                        AND c.case_num = #{caseNum}
-                    </if>
-                    <if test="nameId != null and nameId != ''">
-                        AND ca.application_organ_id=#{nameId}
-                    </if>
+<!--                &lt;!&ndash;申请人案件&ndash;&gt;-->
+<!--                select c.id ,l.id AS caseLogId,c.case_num ,l.case_subject_amount ,c.register_date ,c.arbitrat_method ,-->
+<!--                CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'-->
+<!--                ELSE '无审理方式'-->
+<!--                END arbitratMethodName,-->
+<!--                c.case_status ,-->
+<!--                CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'-->
+<!--                when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'-->
+<!--                when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'-->
+<!--                when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'-->
+<!--                when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'-->
+<!--                when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'-->
+<!--                when 31 then '待修改开庭时间'-->
+<!--                ELSE '无案件状态'-->
+<!--                END caseStatusName,-->
+<!--                c.hear_date ,l.arbitrat_claims ,-->
+<!--                l.loan_start_date ,l.loan_end_date ,l.claim_princi_owed ,l.claim_interest_owed ,l.claim_liquid_damag-->
+<!--                ,l.fee_payable ,-->
+<!--                c.begin_video_date ,c.online_video_person ,l.contract_number ,c.create_by ,c.create_time ,-->
+<!--                c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name-->
+<!--                as-->
+<!--                applicantName,-->
+<!--                c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status,l.version,l.update_submit_status as updateSubmitStatus-->
+<!--                from case_application c-->
+<!--                JOIN case_application_log l ON c.id = l.case_appli_id-->
+<!--                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1-->
+
+<!--                <where>-->
+<!--                    (c.case_status &lt;= 10 or c.case_status=31) AND ca.identity_type=1-->
+<!--                    and l.version=(SELECT-->
+<!--                    max( version ) version-->
+<!--                    FROM-->
+<!--                    case_application_log where case_appli_id = c.id and update_submit_status not in(4,5))-->
+<!--                    <if test="applicationOrganId != null and applicationOrganId != ''">-->
+<!--                        AND ca.application_organ_id = #{applicationOrganId}-->
+<!--                    </if>-->
+<!--                    <if test="caseStatus != null">-->
+<!--                        AND c.case_status = #{caseStatus}-->
+<!--                    </if>-->
+<!--                    <if test="caseNum != null and caseNum != ''">-->
+<!--                        AND c.case_num = #{caseNum}-->
+<!--                    </if>-->
+<!--                    <if test="nameId != null and nameId != ''">-->
+<!--                        AND ca.application_organ_id=#{nameId}-->
+<!--                    </if>-->
 
-                    <if test="lockStatus != null">
-                        AND c.lock_status = #{lockStatus}
-                    </if>
-                </where>
-                union
-            </if>
+<!--                    <if test="lockStatus != null">-->
+<!--                        AND c.lock_status = #{lockStatus}-->
+<!--                    </if>-->
+<!--                </where>-->
+<!--                union-->
+<!--            </if>-->
             <!--秘书案件-->
             <if test="deptIds != null and deptIds.size() > 0">
 
@@ -673,13 +679,13 @@
 <!--                </foreach> )-->
 <!--            </if>-->
             <!--申请人-->
-<!--            <if test="applicationOrganId != null and applicationOrganId != ''">-->
-<!--                or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1-->
-<!--                &lt;!&ndash;暂时改为可以查询到生成裁决书之前所有的案件状态&ndash;&gt;-->
-<!--                and (t.case_status &lt;= 10 or t.case_status=31))-->
-<!--            &lt;!&ndash; and t.case_status in (0,2,17))&ndash;&gt;-->
+            <if test="applicationOrganId != null and applicationOrganId != ''">
+                or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
+                <!--暂时改为可以查询到生成裁决书之前所有的案件状态-->
+                and (t.case_status &lt;= 10 or t.case_status=31))
+            <!-- and t.case_status in (0,2,17))-->
 
-<!--         </if>-->
+         </if>
          <!--部门长-->
             <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
                 or (t.identity_type=1 and t.case_status in
@@ -705,40 +711,40 @@
         </where>
             union
         </if>
-            <if test="applicationOrganId != null and applicationOrganId != ''">
-                <!--申请人案件-->
-
-                select l.case_appli_id id ,
-                c.case_status,ca.application_organ_id,
-                c.arbitrator_id,ca.identity_num , ca.identity_type
-                from case_application c
-                JOIN case_application_log l ON c.id = l.case_appli_id
-                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1
-                <where>
-                    (c.case_status &lt;= 10 or c.case_status=31) AND ca.identity_type=1
-                    and l.version=(SELECT
-                    max( version ) version
-                    FROM
-                    case_application_log where case_appli_id = c.id and update_submit_status not in(4,5))
-                    <if test="applicationOrganId != null and applicationOrganId != ''">
-                        AND ca.application_organ_id = #{applicationOrganId}
-                    </if>
-                    <if test="caseStatus != null">
-                        AND c.case_status = #{caseStatus}
-                    </if>
-                    <if test="caseNum != null and caseNum != ''">
-                        AND c.case_num = #{caseNum}
-                    </if>
-                    <if test="nameId != null and nameId != ''">
-                        AND ca.application_organ_id=#{nameId}
-                    </if>
+<!--            <if test="applicationOrganId != null and applicationOrganId != ''">-->
+<!--                &lt;!&ndash;申请人案件&ndash;&gt;-->
+
+<!--                select l.case_appli_id id ,-->
+<!--                c.case_status,ca.application_organ_id,-->
+<!--                c.arbitrator_id,ca.identity_num , ca.identity_type-->
+<!--                from case_application c-->
+<!--                JOIN case_application_log l ON c.id = l.case_appli_id-->
+<!--                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1-->
+<!--                <where>-->
+<!--                    (c.case_status &lt;= 10 or c.case_status=31) AND ca.identity_type=1-->
+<!--                    and l.version=(SELECT-->
+<!--                    max( version ) version-->
+<!--                    FROM-->
+<!--                    case_application_log where case_appli_id = c.id and update_submit_status not in(4,5))-->
+<!--                    <if test="applicationOrganId != null and applicationOrganId != ''">-->
+<!--                        AND ca.application_organ_id = #{applicationOrganId}-->
+<!--                    </if>-->
+<!--                    <if test="caseStatus != null">-->
+<!--                        AND c.case_status = #{caseStatus}-->
+<!--                    </if>-->
+<!--                    <if test="caseNum != null and caseNum != ''">-->
+<!--                        AND c.case_num = #{caseNum}-->
+<!--                    </if>-->
+<!--                    <if test="nameId != null and nameId != ''">-->
+<!--                        AND ca.application_organ_id=#{nameId}-->
+<!--                    </if>-->
 
-                    <if test="lockStatus != null">
-                        AND c.lock_status = #{lockStatus}
-                    </if>
-                </where>
-                union
-            </if>
+<!--                    <if test="lockStatus != null">-->
+<!--                        AND c.lock_status = #{lockStatus}-->
+<!--                    </if>-->
+<!--                </where>-->
+<!--                union-->
+<!--            </if>-->
             <!--秘书案件-->
             <if test="deptIds != null and deptIds.size() > 0">