草叶任务审核、暂存

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java

@@ -64,6 +64,8 @@ public interface LiquidTankTaskConst {
      * 状态-已完成，正常结束
      */
     Integer S_FINISH_OK = 11;
+    //暂存
+    Integer S_TEMP = 12;
 
     /**
      * 首测

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java

@@ -427,6 +427,16 @@ public class LiquidTankTaskController extends BladeController {
         return service.editDrugBat(list);
     }
 
+    /**
+     * [槽液检测任务] 暂存加药量批量
+     */
+    @PostMapping("/saveDraftDrugBat")
+    @ApiOperationSupport(order = 106)
+    @Operation(summary = "暂存加药量批量", description = "传入LiquidTankTask List，仅保存数据不提交审核")
+    public R saveDraftDrugBat(@Valid @RequestBody List<LiquidTankTask> list) {
+        return service.saveDraftDrugBat(list);
+    }
+
     /**
      * [槽液检测任务]
      *

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java

@@ -48,6 +48,8 @@ public interface ILiquidTankTaskService extends BaseService<LiquidTankTask> {
 
     R editDrugBat(List<LiquidTankTask> list);
 
+    R saveDraftDrugBat(List<LiquidTankTask> list);
+
     R reviewBat(String ids, Integer reviewPass, String reviewOpinion);
 
     R revoke(Long id, String revokeReason);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -171,12 +171,28 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
         return R.success();
     }
 
+    @Transactional
+    @Override
+    public R saveDraftDrugBat(List<LiquidTankTask> list) {
+        for (LiquidTankTask task : list) {
+            // 暂存功能：保持状态为待编辑加药量，不提交审核
+            task = basicChangeTaskStatus(task, LiquidTankTaskConst.S_TEMP);
+            basicUpdateById(task);
+        }
+        return R.success("暂存成功");
+    }
+
     @Transactional
     @Override
     public R reviewBat(String ids, Integer reviewPass, String reviewOpinion) {
         List<Long> list = Func.toLongList(ids);
         for (Long id : list) {
             LiquidTankTask task = baseMapper.selectById(id);
+            // 通过id去查这一条槽液任务的实际添加量actualAddValue的值，如果是0的话审核通过之后状态就变为正常完成的，不是0按之前的逻辑走
+            if (Objects.nonNull(task.getActualAddValue()) && 0 == task.getActualAddValue()) {
+                zeroUpdate(task,reviewPass,reviewOpinion);
+                continue;
+            }
             if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_YES)) {
                 // 审核通过
                 task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_SEND_DRUG);
@@ -200,6 +216,28 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
         return R.success("批量审核成功");
     }
 
+    private void zeroUpdate(LiquidTankTask task, Integer reviewPass, String reviewOpinion) {
+        if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_YES)) {
+            // 审核通过
+            task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_FINISH_OK);
+            task.setReviewPass(LiquidTankTaskConst.REVIEW_YES);
+            // todo: flag
+            // todo: 是否需要加药？
+        } else if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_NO)) {
+            // 审核不通过
+            task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_EDIT_DRUG);
+            task.setReviewPass(LiquidTankTaskConst.REVIEW_NO);
+            // todo: flag
+        }
+        // 审核意见
+        task.setReviewOpinion(reviewOpinion);
+        // 审核人
+        task.setReviewUserId(AuthUtil.getUserId());
+        // 审核时间
+        task.setReviewDate(LocalDateTime.now());
+        basicUpdateById(task);
+    }
+
     @Transactional
     @Override
     public R revoke(Long id, String revokeReason) {