1、检验单修改增加驳回原因

dev
a15234804788@163.com 3 years ago
parent 383c8a0e76
commit 295d3d36e1
  1. 3
      lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
  2. 4
      lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
  3. 13
      lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java

@ -228,4 +228,7 @@ public class Examine extends BaseEntity implements Serializable {
// 受理编号 // 受理编号
public String acceptanceNum; public String acceptanceNum;
//驳回原因
private String rejectReason;
} }

@ -623,9 +623,9 @@ public class EntrustController extends BladeController {
map.put("simple", simpleList); map.put("simple", simpleList);
return R.data(map); return R.data(map);
} }
map.put("entrust", entrust); map.put("entrust", entrust);//委托单
map.put("simple", simpleList); map.put("simple", simpleList);
map.put("taskBlueprint", taskBlueprint); map.put("taskBlueprint", taskBlueprint);//任务书
return R.data(map); return R.data(map);
} }

@ -3,6 +3,7 @@ package org.springblade.lims.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;
/** /**
* 检验列表
* @author swj * @author swj
* @since 2022年6月1日19:49:10 * @since 2022年6月1日19:49:10
*/ */
@ -100,7 +102,16 @@ public class ExamineController extends BladeController {
*/ */
@PostMapping("/updateExamine") @PostMapping("/updateExamine")
public void updateExamine(@RequestBody Examine examine) { 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<Entrust> entrustWrapper = new LambdaUpdateWrapper<>();
//entrust_status -0.5 待重订
entrustWrapper.eq(Entrust::getId,entrustId).set(Entrust::getEntrustStatus, -0.5);
service.update(entrustWrapper);
}
} }
/** /**

Loading…
Cancel
Save