详情页面上一条下一条逻辑修改

@@ -10,6 +10,7 @@ public enum AshErrorCode {
     LOGINNAME_PWD_NOT_MATCH("用户名密码不正确"),
     USER_FORBIDDEN("用户名冻结"),
     LOGINNAME_OR_PWD_EMPTY("用户名密码为空"),
+    NEXT_DATA_EMPTY("已经是最后一条"),
     ;
 
     private final String text;

@@ -2,6 +2,7 @@ package com.ash.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.exception.ExcelDataConvertException;
+import com.ash.base.AshErrorCode;
 import com.ash.base.BaseController;
 import com.ash.base.JsonResult;
 import com.ash.base.OptionStatus;
@@ -79,6 +80,34 @@ public class CaseController extends BaseController {
         }
     }
 
+    @PostMapping("/detail")
+    public JsonResult detail(@RequestBody Case data) {
+        try {
+            Case caseInfo = caseService.load(data.getId());
+            Map<String, CaseAnalysis> analysisMap = caseAnalysisService.listByCaseId(Collections.singletonList(caseInfo.getId()));
+            caseInfo.setAnalysis(analysisMap.get(caseInfo.getId()));
+            return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), caseInfo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    @PostMapping("/getNextUnReviewId")
+    public JsonResult getNextUnReviewId(@RequestBody Case data) {
+        try {
+            List<String> dataList = caseService.listUnReview(data.getExceptIds());
+            if (CollectionUtils.isEmpty(dataList)) {
+                return new JsonResult(false, AshErrorCode.NEXT_DATA_EMPTY.getText(), null);
+            }
+            return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), dataList.get(0));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
 
     @GetMapping(value = "/importTempDownload")
     public void myExcelDownload(HttpServletResponse response) throws IOException {
@@ -172,7 +201,7 @@ public class CaseController extends BaseController {
                     CaseExportExcelData ed = new CaseExportExcelData();
                     BeanUtils.copyProperties(e, ed);
                     CaseAnalysis analysis = e.getAnalysis();
-                    if(analysis!=null){
+                    if (analysis != null) {
                         ed.setArea(analysis.getArea());
                         ed.setCounty(analysis.getCounty());
                         ed.setTotalAmount(analysis.getTotalAmount());

@@ -2,9 +2,7 @@ package com.ash.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.ash.base.BaseController;
-import com.ash.base.JsonResult;
-import com.ash.base.OptionStatus;
+import com.ash.base.*;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.Case;
 import com.ash.entity.FileData;
@@ -89,6 +87,35 @@ public class WarningInstanceController extends BaseController {
         }
     }
 
+    @PostMapping("/detail")
+    public JsonResult detail(@RequestBody WarningInstance warningInstance) {
+        try {
+            WarningInstance data = warningInstanceService.load(warningInstance.getId());
+            Map<String, WarningInstanceAnalysis> wiMap = warningInstanceAnalysisService.listByWiId(Collections.singletonList(data.getId()));
+            data.setAnalysis(wiMap.get(data.getId()));
+            return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), data);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    @PostMapping("/getNextUnReviewId")
+    public JsonResult getNextUnReviewId(@RequestBody WarningInstance warningInstance) {
+        try {
+            List<String> dataList = warningInstanceService.listUnReview(warningInstance.getExceptIds());
+            if (CollectionUtils.isEmpty(dataList)) {
+                return new JsonResult(false, AshErrorCode.NEXT_DATA_EMPTY.getText(), null);
+            }
+            return new JsonResult(true, OptionStatus.OPT_SUCCESS.getName(), dataList.get(0));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
     @GetMapping(value = "/importTempDownload")
     public void myExcelDownload(HttpServletResponse response) throws IOException {
         List<WarningInstanceExcelData> list = new ArrayList<>();

@@ -12,6 +12,7 @@ import lombok.Data;
 
 import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName(value = "t_ash_case")
@@ -91,4 +92,7 @@ public class Case extends BaseModel {
 
     @Transient
     private transient Integer age;
+
+    @Transient
+    private transient List<String> exceptIds;
 }

@@ -12,6 +12,7 @@ import lombok.Data;
 
 import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName(value = "t_ash_warning_instance")
@@ -155,4 +156,7 @@ public class WarningInstance extends BaseModel {
 
     @Transient
     private transient WarningInstanceAnalysis analysis;
+
+    @Transient
+    private transient List<String> exceptIds;
 }

@@ -9,10 +9,7 @@ import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.Case;
 import com.ash.entity.CaseAnalysis;
 import com.ash.entity.dao.CaseMapper;
-import com.ash.enums.AnalysisStatusEnum;
-import com.ash.enums.CaseVictimAgeRangeEnum;
-import com.ash.enums.ConformStatusEnum;
-import com.ash.enums.LossRangeEnum;
+import com.ash.enums.*;
 import com.ash.excelData.CaseExcelData;
 import com.ash.listener.CaseExcelListener;
 import com.ash.util.*;
@@ -146,6 +143,22 @@ public class CaseService {
         return caseMapper.selectList(queryWrapper);
     }
 
+
+    public List<String> listUnReview(List<String> exceptIds) {
+        QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();
+        lambda.select(Case::getId);
+        lambda.ne(Case::getReviewStatus, ReviewStatusEnum.UNAUDITED);
+        if (!CollectionUtils.isEmpty(exceptIds)) {
+            lambda.notIn(Case::getId, exceptIds);
+        }
+        lambda.last("limit 1");
+        lambda.orderByDesc(BaseModel::getCreateTime).orderByDesc(Case::getId);
+        List<Case> warningInstances = caseMapper.selectList(queryWrapper);
+        return Optional.ofNullable(warningInstances).map(all -> all.stream()
+                .map(Case::getId).collect(Collectors.toList())).orElse(new ArrayList<>());
+    }
+
     public Page<Case> pageByCondition(Case params, Page<Case> page) {
         QueryWrapper<Case> queryWrapper = getCondition(params);
         return caseMapper.selectPage(page, queryWrapper);
@@ -645,7 +658,7 @@ public class CaseService {
             }
         }
 
-        lambda.orderByDesc(BaseModel::getCreateTime, Case::getCode, Case::getId);
+        lambda.orderByDesc(BaseModel::getCreateTime).orderByDesc(Case::getCode).orderByDesc(Case::getId);
 
         return queryWrapper;
     }

@@ -57,7 +57,7 @@ public class WarningInstanceAnalysisService {
             throw new AshException(AshErrorCode.DATA_NOT_EXIST);
         }
 
-        int result = warningInstanceAnalysisMapper.updateById(data);
+        warningInstanceAnalysisMapper.updateById(data);
     }
 
     public Map<String, WarningInstanceAnalysis> listByWiId(List<String> wiIds) {

@@ -12,6 +12,7 @@ import com.ash.entity.WarningInstanceAnalysis;
 import com.ash.entity.dao.WarningInstanceMapper;
 import com.ash.enums.AnalysisStatusEnum;
 import com.ash.enums.ConformStatusEnum;
+import com.ash.enums.ReviewStatusEnum;
 import com.ash.excelData.WarningInstanceExcelData;
 import com.ash.listener.WarningInstanceExcelListener;
 import com.ash.util.*;
@@ -128,6 +129,21 @@ public class WarningInstanceService {
         return warningInstanceMapper.selectList(queryWrapper);
     }
 
+    public List<String> listUnReview(List<String> exceptIds) {
+        QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();
+        lambda.select(WarningInstance::getId);
+        lambda.ne(WarningInstance::getReviewStatus, ReviewStatusEnum.UNAUDITED);
+        if (!CollectionUtils.isEmpty(exceptIds)) {
+            lambda.notIn(WarningInstance::getId, exceptIds);
+        }
+        lambda.last("limit 1");
+        lambda.orderByDesc(BaseModel::getCreateTime).orderByDesc(WarningInstance::getId);
+        List<WarningInstance> warningInstances = warningInstanceMapper.selectList(queryWrapper);
+        return Optional.ofNullable(warningInstances).map(all -> all.stream()
+                .map(WarningInstance::getId).collect(Collectors.toList())).orElse(new ArrayList<>());
+    }
+
 
     public Page<WarningInstance> pageByCondition(WarningInstance params, Page<WarningInstance> page) {
         QueryWrapper<WarningInstance> queryWrapper = getCondition(params);
@@ -368,7 +384,7 @@ public class WarningInstanceService {
             }
         }
 
-        lambda.orderByDesc(BaseModel::getCreateTime, WarningInstance::getCode, WarningInstance::getId);
+        lambda.orderByDesc(BaseModel::getCreateTime).orderByDesc(WarningInstance::getCode).orderByDesc(WarningInstance::getId);
         return queryWrapper;
     }