From c980aac78cb010c23954dc9f9cfcef5e943be77b Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Tue, 31 Oct 2023 13:26:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CaseApplicationServiceImpl.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 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 eda9754..7b0a133 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 @@ -234,8 +234,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { List records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord); CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); Integer caseStatus = caseApplicationselect.getCaseStatus(); - CaseLogRecord caseLogRecordin = getInCasenode(caseStatus); - records.add(caseLogRecordin); + if(caseStatus.intValue()!=0){ + CaseLogRecord caseLogRecordin = getInCasenode(caseStatus); + records.add(caseLogRecordin); + } + List recordsnofinish = getNofinishCasenode(caseStatus); records.addAll(recordsnofinish); datas.put("allCasenode",records); @@ -538,6 +541,23 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { List caseLogRecords = new ArrayList<>(); switch (caseStatus.toString()) { + case "0": + caseLogRecords.add(caseLogRecord1); + caseLogRecords.add(caseLogRecord2); + caseLogRecords.add(caseLogRecord3); + caseLogRecords.add(caseLogRecord4); + caseLogRecords.add(caseLogRecord5); + caseLogRecords.add(caseLogRecord6); + caseLogRecords.add(caseLogRecord7); + caseLogRecords.add(caseLogRecord8); + caseLogRecords.add(caseLogRecord9); + caseLogRecords.add(caseLogRecord11); + caseLogRecords.add(caseLogRecord12); + caseLogRecords.add(caseLogRecord13); + caseLogRecords.add(caseLogRecord14); + caseLogRecords.add(caseLogRecord15); + caseLogRecords.add(caseLogRecord16); + break; case "1": caseLogRecords.add(caseLogRecord2); caseLogRecords.add(caseLogRecord3); @@ -1222,6 +1242,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION); caseApplicationItera.setCreateBy(getUsername()); int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera); + // 新增日志 + CaseLogUtils.insertCaseLog(caseApplicationItera.getId(),CaseApplicationConstants.CASE_APPLICATION,""); + List caseAffiliates = caseApplicationItera.getCaseAffiliates(); if(caseAffiliates!=null&&caseAffiliates.size()>0){ for (CaseAffiliate caseAffiliate : caseAffiliates){ @@ -1241,6 +1264,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } + + }else { throw new ServiceException("导入立案申请数据不能为空！"); } From cc35c03cee29b2124a461b8eb77b89283199cbae Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Tue, 31 Oct 2023 14:51:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=80=E5=BA=AD=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CaseApplicationServiceImpl.java | 10 ++++++---- .../service/impl/CaseArbitrateServiceImpl.java | 12 ++++++------ 2 files changed, 12 insertions(+), 10 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 7b0a133..535f948 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 @@ -250,11 +250,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional public int updateHeardate(CaseApplication caseApplication) { - caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); +// caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); int rows = caseApplicationMapper.submitCaseApplication(caseApplication); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,""); + CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,""); return rows; } @@ -2071,7 +2072,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional public int pendTralSure(CaseApplication caseApplication) { - caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); +// caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); + caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); int rows = caseApplicationMapper.submitCaseApplication(caseApplication); //发送短信通知 @@ -2151,7 +2153,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } } // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,""); + CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,""); return rows; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index 0d31c94..399c242 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -58,11 +58,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { if (arbitratMethod == 2) { caseApplication1.setArbitratMethod(1); // 更改仲裁方式 //修改案件状态为待开庭审理 -// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); //修改案件状态为待修改开庭时间 - caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); +// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, ""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); } else { caseApplication1.setArbitratMethod(2); @@ -81,11 +81,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { } else { //修改案件状态为待开庭审理 -// caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); //修改案件状态为待修改开庭时间 - caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); +// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, ""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); } } From 5851ec7b70de18a06f74e9db4949455cfe729150 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 31 Oct 2023 15:18:57 +0800 Subject: [PATCH 3/5] 1 --- .../service/impl/CaseApplicationServiceImpl.java | 12 +++++++++--- .../mapper/wisdomarbitrate/CaseApplicationMapper.xml | 1 + 2 files changed, 10 insertions(+), 3 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 535f948..1b70051 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 @@ -1197,7 +1197,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseApplicationListinsert.add(caseApplication); }else { // 拼接错误信息 - failureMsg.append("
").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString()); + failureMsg.append("
").append("第").append(i+2).append("行：").append(caseApplication.getErrorMsg().toString()); } }else { @@ -1463,6 +1463,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { if( caseApplication.getLoanEndDate()== null){ failureMsg.append("【借款结束日期】字段不合法；"); } + if( caseApplication.getLoanStartDate()!= null && caseApplication.getLoanEndDate()!= null && caseApplication.getLoanStartDate().after(caseApplication.getLoanEndDate()) ){ + failureMsg.append("【借款结束日期】不能早于【借款开始日期】；"); + } if( StrUtil.isEmpty(caseApplication.getContractNumber())){ failureMsg.append("【合同编号】字段不能为空；"); }else if(caseApplication.getContractNumber().length()>50){ @@ -1502,9 +1505,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } } if( StrUtil.isEmpty(caseApplication.getArbitratClaims())){ - failureMsg.append("【申请人仲裁诉求】字段不能为空；"); + failureMsg.append("【申请人仲裁请求及事实和理由】字段不能为空；"); }else if(caseApplication.getArbitratClaims().length()>10000){ - failureMsg.append("【申请人仲裁诉求】字段超出指定长度，最大长度为10000；"); + failureMsg.append("【申请人仲裁请求及事实和理由】字段超出指定长度，最大长度为10000；"); + } + if(StrUtil.isNotEmpty(caseApplication.getArbitratClaims())&&caseApplication.getArbitratClaims().length()>10000){ + failureMsg.append("【申请人请求仲裁庭裁决】字段超出指定长度，最大长度为10000；"); } } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 76ec46a..73536b0 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -539,6 +539,7 @@ AND c.id = #{id} +order by c.create_time desc limit 1