Jelajahi Sumber

fixed 被无效历史

zero 7 bulan lalu
induk
melakukan
d066e098d4

+ 0 - 5
src/main/java/cn/cslg/pas/domain/business/ReportAffair.java

@@ -15,11 +15,6 @@ import java.util.Date;
 @Data
 @TableName("report_affair")
 public class ReportAffair extends BaseEntity<ReportAffair> {
-    /**
-     * 事务类型(0为口审记录,1为无效请求书,2为陈述意见书,3为无效决定书,4为行政诉讼书)
-     */
-    @TableField(value = "affair_type")
-    private Integer affairType;
 
     /**
      * 所属报告id

+ 20 - 10
src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -270,9 +271,16 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                         Integer affairType = 1;
                         Date invalidTime = this.loadInvalidTime(affairType, item);
                         invalidRecordVO.setInvalidTime(invalidTime);
-                        Integer judgeType = 5;
-                        Date judgeTime = this.loadInvalidTime(judgeType, item);
-
+                        Integer judgeType = 16;
+                        Date judgeTime1 = this.loadInvalidTime(judgeType, item);
+                        Integer judgeType1 = 26;
+                        Date judgeTime2 = this.loadInvalidTime(judgeType1, item);
+                        Date judgeTime = null;
+                        if (ObjectUtils.isNotEmpty(judgeTime2)) {
+                            judgeTime = judgeTime2;
+                        } else {
+                            judgeTime = judgeTime1;
+                        }
                         invalidRecordVO.setJudgementTime(judgeTime);
                         invalidRecordVO.setCreateId(project.getCreateId());
                         invalidRecordVO.setCreateTime(project.getCreateTime());
@@ -281,7 +289,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                         invalidRecordVO.setFileGuids(fileGuids);
                         invalidRecordVO.setIfAdd(false);
                         //装载结果  先查询行政判决诉讼书
-                        Integer resultType = 5;
+                        Integer resultType = 16;
                         ReVO reVO = this.loadResult(resultType, item);
                         invalidRecordVO.setResult(reVO.getResult());
                         invalidRecordVO.setJudgementTime(reVO.getJudgementTime());
@@ -302,7 +310,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
 
     public Date loadInvalidTime(Integer type, ReportProject reportProject) {
         LambdaQueryWrapper<ReportAffair> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ReportAffair::getAffairType, type)
+        queryWrapper.eq(ReportAffair::getAssoCasePhaseId, type)
                 .eq(ReportAffair::getProjectId, reportProject.getProjectId())
                 .orderByDesc(ReportAffair::getCreateTime)
                 .last("LIMIT 1");
@@ -318,9 +326,11 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         ReVO reVO = new ReVO();
         String result = "";
         LambdaQueryWrapper<ReportAffair> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ReportAffair::getAffairType, type)
-                .eq(ReportAffair::getProjectId, reportProject.getProjectId())
-                .orderByDesc(ReportAffair::getCreateTime)
+        queryWrapper.eq(ReportAffair::getProjectId, reportProject.getProjectId())
+                .and(item -> item.eq(ReportAffair::getAssoCasePhaseId, type)
+                .or()
+                .eq(ReportAffair::getAssoCasePhaseId,26))
+                .orderByDesc(ReportAffair::getAssoCasePhaseId).orderByDesc(ReportAffair::getCreateTime)
                 .last("LIMIT 1");
         ReportAffair reportAffair = reportAffairService.getOne(queryWrapper, false);
         if (reportAffair != null) {
@@ -336,9 +346,9 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
             }
         } else {
             //无效决定书
-            Integer affairType = 3;
+            Integer affairType = 7;
             LambdaQueryWrapper<ReportAffair> invalidRecordWrapper = new LambdaQueryWrapper<>();
-            invalidRecordWrapper.eq(ReportAffair::getAffairType, affairType)
+            invalidRecordWrapper.eq(ReportAffair::getAssoCasePhaseId, affairType)
                     .eq(ReportAffair::getProjectId, reportProject.getProjectId())
                     .orderByDesc(ReportAffair::getCreateTime)
                     .last("LIMIT 1");