Browse Source

fixed 被无效历史

zero 7 tháng trước cách đây
mục cha
commit
88387957d1

+ 3 - 0
src/main/java/cn/cslg/pas/common/vo/business/ReVO.java

@@ -12,4 +12,7 @@ import java.util.Date;
 public class ReVO {
     private Date judgementTime;
     private String result;
+    private String casePhase;
+    private String caseChildPhase;
+    private Integer flowType;
 }

+ 18 - 3
src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -17,6 +17,7 @@ import cn.cslg.pas.domain.BaseEntity;
 import cn.cslg.pas.domain.business.*;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.InvalidRecordMapper;
+import cn.cslg.pas.mapper.ReportAffairCasePhaseMapper;
 import cn.cslg.pas.service.common.FileManagerService;
 import cn.cslg.pas.service.permissions.PermissionService;
 import com.alibaba.fastjson.JSONObject;
@@ -79,7 +80,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
     private InvalidDecisionFileService invalidDecisionFileService;
 
     @Autowired
-    private AssoReportAffairFileService assoReportAffairFileService;
+    private ReportAffairCasePhaseMapper reportAffairCasePhaseMapper;
 
     @Autowired
     private CourtOrderService courtOrderService;
@@ -330,7 +331,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                 .and(item -> item.eq(ReportAffair::getAssoCasePhaseId, type)
                 .or()
                 .eq(ReportAffair::getAssoCasePhaseId,26))
-                .orderByDesc(ReportAffair::getAssoCasePhaseId).orderByDesc(ReportAffair::getCreateTime)
+                .orderByDesc(ReportAffair::getAssoCasePhaseId).orderByDesc(ReportAffair::getOccurredTime)
                 .last("LIMIT 1");
         ReportAffair reportAffair = reportAffairService.getOne(queryWrapper, false);
         if (reportAffair != null) {
@@ -343,6 +344,13 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                 result = courtOrder.getConclusion();
                 reVO.setResult(result);
                 reVO.setJudgementTime(reportAffair.getOccurredTime());
+                Integer casePhaseId = reportAffair.getAssoCasePhaseId();
+                ReportAffairCasePhase casePhase = reportAffairCasePhaseMapper.selectById(casePhaseId);
+                if (ObjectUtils.isNotEmpty(casePhase)) {
+                    reVO.setCasePhase(casePhase.getCasePhase());
+                    reVO.setCaseChildPhase(casePhase.getCaseChildPhase());
+                    reVO.setFlowType(casePhase.getFlowType());
+                }
             }
         } else {
             //无效决定书
@@ -350,7 +358,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
             LambdaQueryWrapper<ReportAffair> invalidRecordWrapper = new LambdaQueryWrapper<>();
             invalidRecordWrapper.eq(ReportAffair::getAssoCasePhaseId, affairType)
                     .eq(ReportAffair::getProjectId, reportProject.getProjectId())
-                    .orderByDesc(ReportAffair::getCreateTime)
+                    .orderByDesc(ReportAffair::getOccurredTime)
                     .last("LIMIT 1");
             ReportAffair reportAffair1 = reportAffairService.getOne(invalidRecordWrapper, false);
             if (reportAffair1 != null) {
@@ -369,6 +377,13 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                         reVO.setJudgementTime(reportAffair1.getOccurredTime());
                     }
                 }
+                Integer casePhaseId = reportAffair1.getAssoCasePhaseId();
+                ReportAffairCasePhase casePhase = reportAffairCasePhaseMapper.selectById(casePhaseId);
+                if (ObjectUtils.isNotEmpty(casePhase)) {
+                    reVO.setCasePhase(casePhase.getCasePhase());
+                    reVO.setCaseChildPhase(casePhase.getCaseChildPhase());
+                    reVO.setFlowType(casePhase.getFlowType());
+                }
             }
         }
         return reVO;