Browse Source

修改查询进度

qitz 2 years ago
parent
commit
c980aac78c

+ 27
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java View File

@@ -234,8 +234,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
234 234
         List<CaseLogRecord> records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord);
235 235
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
236 236
         Integer caseStatus = caseApplicationselect.getCaseStatus();
237
-        CaseLogRecord caseLogRecordin = getInCasenode(caseStatus);
238
-        records.add(caseLogRecordin);
237
+        if(caseStatus.intValue()!=0){
238
+            CaseLogRecord caseLogRecordin = getInCasenode(caseStatus);
239
+            records.add(caseLogRecordin);
240
+        }
241
+
239 242
         List<CaseLogRecord> recordsnofinish = getNofinishCasenode(caseStatus);
240 243
         records.addAll(recordsnofinish);
241 244
         datas.put("allCasenode",records);
@@ -538,6 +541,23 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
538 541
 
539 542
         List<CaseLogRecord> caseLogRecords = new ArrayList<>();
540 543
         switch (caseStatus.toString()) {
544
+            case "0":
545
+                caseLogRecords.add(caseLogRecord1);
546
+                caseLogRecords.add(caseLogRecord2);
547
+                caseLogRecords.add(caseLogRecord3);
548
+                caseLogRecords.add(caseLogRecord4);
549
+                caseLogRecords.add(caseLogRecord5);
550
+                caseLogRecords.add(caseLogRecord6);
551
+                caseLogRecords.add(caseLogRecord7);
552
+                caseLogRecords.add(caseLogRecord8);
553
+                caseLogRecords.add(caseLogRecord9);
554
+                caseLogRecords.add(caseLogRecord11);
555
+                caseLogRecords.add(caseLogRecord12);
556
+                caseLogRecords.add(caseLogRecord13);
557
+                caseLogRecords.add(caseLogRecord14);
558
+                caseLogRecords.add(caseLogRecord15);
559
+                caseLogRecords.add(caseLogRecord16);
560
+                break;
541 561
             case "1":
542 562
                 caseLogRecords.add(caseLogRecord2);
543 563
                 caseLogRecords.add(caseLogRecord3);
@@ -1222,6 +1242,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
1222 1242
                         caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
1223 1243
                         caseApplicationItera.setCreateBy(getUsername());
1224 1244
                         int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
1245
+                        // 新增日志
1246
+                        CaseLogUtils.insertCaseLog(caseApplicationItera.getId(),CaseApplicationConstants.CASE_APPLICATION,"");
1247
+
1225 1248
                         List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
1226 1249
                         if(caseAffiliates!=null&&caseAffiliates.size()>0){
1227 1250
                             for (CaseAffiliate caseAffiliate : caseAffiliates){
@@ -1241,6 +1264,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
1241 1264
 
1242 1265
             }
1243 1266
 
1267
+
1268
+
1244 1269
         }else {
1245 1270
             throw new ServiceException("导入立案申请数据不能为空!");
1246 1271
         }