SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改查询进度 #162

Merged
qtz merged 2 commits from qtz3 into dev 2023-10-31 05:31:05 +00:00
Conversation 0 Commits 2 Files Changed 1
+27 -2
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+25
View File
@@ -234,8 +234,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
List<CaseLogRecord> records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord); List<CaseLogRecord> records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord);
CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
Integer caseStatus = caseApplicationselect.getCaseStatus(); Integer caseStatus = caseApplicationselect.getCaseStatus();
if(caseStatus.intValue()!=0){
CaseLogRecord caseLogRecordin = getInCasenode(caseStatus); CaseLogRecord caseLogRecordin = getInCasenode(caseStatus);
records.add(caseLogRecordin); records.add(caseLogRecordin);
}
List<CaseLogRecord> recordsnofinish = getNofinishCasenode(caseStatus); List<CaseLogRecord> recordsnofinish = getNofinishCasenode(caseStatus);
records.addAll(recordsnofinish); records.addAll(recordsnofinish);
datas.put("allCasenode",records); datas.put("allCasenode",records);
@@ -538,6 +541,23 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
List<CaseLogRecord> caseLogRecords = new ArrayList<>(); List<CaseLogRecord> caseLogRecords = new ArrayList<>();
switch (caseStatus.toString()) { 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": case "1":
caseLogRecords.add(caseLogRecord2); caseLogRecords.add(caseLogRecord2);
caseLogRecords.add(caseLogRecord3); caseLogRecords.add(caseLogRecord3);
@@ -1222,6 +1242,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION); caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
caseApplicationItera.setCreateBy(getUsername()); caseApplicationItera.setCreateBy(getUsername());
int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera); int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
// 新增日志
CaseLogUtils.insertCaseLog(caseApplicationItera.getId(),CaseApplicationConstants.CASE_APPLICATION,"");
List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates(); List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
if(caseAffiliates!=null&&caseAffiliates.size()>0){ if(caseAffiliates!=null&&caseAffiliates.size()>0){
for (CaseAffiliate caseAffiliate : caseAffiliates){ for (CaseAffiliate caseAffiliate : caseAffiliates){
@@ -1241,6 +1264,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
} }
}else { }else {
throw new ServiceException("导入立案申请数据不能为空！"); throw new ServiceException("导入立案申请数据不能为空！");
} }