4/23

src/main/java/cn/cslg/pas/common/vo/business/ReVO.java

@@ -0,0 +1,15 @@
+package cn.cslg.pas.common.vo.business;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/4/23
+ */
+@Data
+public class ReVO {
+    private Date judgementTime;
+    private String result;
+}

src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -9,6 +9,7 @@ import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.vo.business.InvalidRecordVO;
+import cn.cslg.pas.common.vo.business.ReVO;
 import cn.cslg.pas.common.vo.business.ReportVO;
 import cn.cslg.pas.domain.BaseEntity;
 import cn.cslg.pas.domain.business.*;
@@ -203,7 +204,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
             }
             List<String> fileGuids = invalidRecordVO.getFileGuids();
             List<SystemFile> systemFiles = new ArrayList<>();
-            if (fileGuids!=null&&fileGuids.size() != 0) {
+            if (fileGuids != null && fileGuids.size() != 0) {
                 String res = fileManagerService.getSystemFileFromFMS(fileGuids);
                 systemFiles = JSONObject.parseArray(res, SystemFile.class);
             }
@@ -269,8 +270,9 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                         invalidRecordVO.setIfAdd(false);
                         //装载结果  先查询行政判决诉讼书
                         Integer resultType = 5;
-                        String result = this.loadResult(resultType, item);
-                        invalidRecordVO.setResult(result);
+                        ReVO reVO = this.loadResult(resultType, item);
+                        invalidRecordVO.setResult(reVO.getResult());
+                        invalidRecordVO.setJudgementTime(reVO.getJudgementTime());
                         //带出报告信息
                         ReportVO reportVO = new ReportVO();
                         BeanUtils.copyProperties(item, reportVO);
@@ -300,7 +302,8 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         }
     }
 
-    public String loadResult(Integer type, ReportProject reportProject){
+    public ReVO loadResult(Integer type, ReportProject reportProject){
+        ReVO reVO = new ReVO();
         String result = "";
         LambdaQueryWrapper<ReportAffair> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportAffair::getAffairType, type)
@@ -316,8 +319,11 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
             if (!CollectionUtils.isEmpty(courtOrders)) {
                 CourtOrder courtOrder = courtOrders.get(0);
                 result = courtOrder.getConclusion();
+                reVO.setResult(result);
+                reVO.setJudgementTime(reportAffair.getOccurredTime());
             }
         } else {
+            //无效决定书
             Integer affairType = 3;
             LambdaQueryWrapper<ReportAffair> invalidRecordWrapper = new LambdaQueryWrapper<>();
             invalidRecordWrapper.eq(ReportAffair::getAffairType, affairType)
@@ -333,13 +339,17 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                 if (invalidDecisionFile != null) {
                     if (StringUtils.isNotEmpty(invalidDecisionFile.getConclusion())) {
                         result = invalidDecisionFile.getConclusion();
+                        reVO.setResult(result);
+                        reVO.setJudgementTime(reportAffair.getOccurredTime());
                     } else {
                         result = invalidDecisionFile.getDecisionKey();
+                        reVO.setResult(result);
+                        reVO.setJudgementTime(reportAffair.getOccurredTime());
                     }
                 }
             }
         }
-        return result;
+        return reVO;
     }