diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java index 76161a9..ae9f8a9 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java @@ -228,4 +228,7 @@ public class Examine extends BaseEntity implements Serializable { // 受理编号 public String acceptanceNum; + + //驳回原因 + private String rejectReason; } \ No newline at end of file diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java index 8483ef0..776560a 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java @@ -623,9 +623,9 @@ public class EntrustController extends BladeController { map.put("simple", simpleList); return R.data(map); } - map.put("entrust", entrust); + map.put("entrust", entrust);//委托单 map.put("simple", simpleList); - map.put("taskBlueprint", taskBlueprint); + map.put("taskBlueprint", taskBlueprint);//任务书 return R.data(map); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java index 96a8f12..3e469fc 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java @@ -3,6 +3,7 @@ package org.springblade.lims.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.*; /** + * 检验列表 * @author swj * @since 2022年6月1日19:49:10 */ @@ -100,7 +102,16 @@ public class ExamineController extends BladeController { */ @PostMapping("/updateExamine") public void updateExamine(@RequestBody Examine examine) { - examineService.updateById(examine); + examineService.updateById(examine); + if(examine.getStatus() == -1){ + //要把委托单状态改为待重订 + Examine examineInfo = examineService.getById(examine.getId()); + Long entrustId = examineInfo.getEntrustId(); + LambdaUpdateWrapper entrustWrapper = new LambdaUpdateWrapper<>(); + //entrust_status -0.5 待重订 + entrustWrapper.eq(Entrust::getId,entrustId).set(Entrust::getEntrustStatus, -0.5); + service.update(entrustWrapper); + } } /**