From fe0af29b27283d404917cb8ce34b6db4ea9bf4a2 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 7 Dec 2023 14:44:47 +0800 Subject: [PATCH] =?UTF-8?q?web:=20=E6=B7=BB=E5=8A=A0=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E8=AE=A1=E5=88=92=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TreatmentPlanController.java | 4 ++-- .../supervision/service/TreatmentPlanService.java | 2 +- .../service/impl/TreatmentPlanServiceImpl.java | 12 ++++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java index 78f1ccd5..6472d211 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java @@ -32,9 +32,9 @@ public class TreatmentPlanController { @ApiOperation("确认处置计划") @PostMapping("/confirm") - public boolean confirmTreatmentPlan(String processId) { + public boolean confirmTreatmentPlan(@RequestParam("processId") String processId,@RequestParam("status") String status) { - return treatmentPlanService.confirmTreatmentPlan(processId); + return treatmentPlanService.confirmTreatmentPlan(processId,status); } @ApiOperation("修改处置计划记录") diff --git a/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java b/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java index 89c22220..635bb7ec 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java @@ -13,5 +13,5 @@ public interface TreatmentPlanService { boolean deleteTreatmentPlanRecord(String id); - boolean confirmTreatmentPlan(String processId); + boolean confirmTreatmentPlan(String processId,String status); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java index 98e35df0..9f98b962 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java @@ -1,6 +1,7 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import com.supervision.model.Process; import com.supervision.model.TreatmentPlanRecord; @@ -11,6 +12,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; @Slf4j @@ -59,15 +61,17 @@ public class TreatmentPlanServiceImpl implements TreatmentPlanService { } @Override - public boolean confirmTreatmentPlan(String processId) { + public boolean confirmTreatmentPlan(String processId, String status) { + + Assert.isTrue(CollectionUtil.newArrayList("0","1","2").contains(status),"状态值有误"); + Process process = processService.getById(processId); Assert.notNull(process,"流程数据不存在"); - Assert.notNull(process.getStatus(),"状态值有误"); - if (process.getStatus().equals(2)){ + if (Integer.valueOf(status).compareTo(process.getStatus()) <= 0){ return true; } - process.setStatus(2); + process.setStatus(Integer.valueOf(status)); return processService.updateById(process); }