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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=BF=9B?= =?UTF-8?q?=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("导入立案申请数据不能为空！"); }