From 80cabfbf5eb19baa845973f2ad4f5d18fed9882e Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Thu, 23 Nov 2023 10:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E6=A1=88=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CaseApplicationServiceImpl.java | 25 ++- .../wisdomarbitrate/CaseApplicationMapper.xml | 186 +++++++++--------- 2 files changed, 118 insertions(+), 93 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 96a8f58..108b6df 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/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 caseAffiliatListeselect = caseAffiliateLogMapper.selectCaseAffiliate(caseApplicationselect.getCaseLogId()); + List 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 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()); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 880faef..fc202ce 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -58,7 +58,7 @@ t1.filearbitra_url,t1.lock_status,t1.version,t1.updateSubmitStatus from( - + 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) + + + or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1 + + and (t.case_status <= 10 or t.case_status=31)) + or (t.identity_type=1 and t.case_status in @@ -152,61 +158,61 @@ union - + - - 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 + + + + + + + + + + + + + + + + + + + + + + + + + + - - (c.case_status <= 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)) - - AND ca.application_organ_id = #{applicationOrganId} - - - AND c.case_status = #{caseStatus} - - - AND c.case_num = #{caseNum} - - - AND ca.application_organ_id=#{nameId} - + + + + + + + + + + + + + + + + + + - - AND c.lock_status = #{lockStatus} - - - union - + + + + + + @@ -673,13 +679,13 @@ - - - - - + + or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1 + + and (t.case_status <= 10 or t.case_status=31)) + - + or (t.identity_type=1 and t.case_status in @@ -705,40 +711,40 @@ union - - + + - 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 - - (c.case_status <= 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)) - - AND ca.application_organ_id = #{applicationOrganId} - - - AND c.case_status = #{caseStatus} - - - AND c.case_num = #{caseNum} - - - AND ca.application_organ_id=#{nameId} - + + + + + + + + + + + + + + + + + + + + + + + + - - AND c.lock_status = #{lockStatus} - - - union - + + + + + + -- 2.54.0