试验系统样品处理、获取委托单编号

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/EntrustInfo.java

@@ -112,7 +112,7 @@ public class EntrustInfo extends BaseEntity {
 	 * 试验检测时间
 	 */
 	@ApiModelProperty(value = "处理方式")
-	private int repealType;
+	private Integer repealType;
 
 	/**
 	 * 留样开始时间

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/EntrustDataInfoVO.java

@@ -40,6 +40,11 @@ public class EntrustDataInfoVO {
 	 */
 	@ApiModelProperty("委托单位")
 	private String entrustInfo;
+	/**
+	 * 委托单编号
+	 */
+	@ApiModelProperty("委托单编号")
+	private String entrustNo;
 	/**
 	 * 委托单位名称
 	 */

blade-service/blade-business/src/main/java/org/springblade/business/controller/EntrustInfoController.java

@@ -18,6 +18,7 @@ package org.springblade.business.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
@@ -120,7 +121,16 @@ public class  EntrustInfoController extends BladeController {
 	@ApiOperation(value = "修改", notes = "传入entrustInfo")
 	@Transactional
 	public R update(@Valid @RequestBody EntrustInfo entrustInfo) {
-			// rfid--绑定 需要判断 委托单的状态和创建情况
+		EntrustInfo info = entrustInfoService.getById(entrustInfo.getId());
+		if (info ==  null) {
+			// 前端样品处理页面传递的是样品id
+			List<EntrustInfo> list = entrustInfoService.list(Wrappers.<EntrustInfo>lambdaQuery().eq(EntrustInfo::getSampleId, entrustInfo.getId()));
+			if (list == null || list.isEmpty()) {
+				return R.fail("委托单不存在");
+			}
+			entrustInfo.setId(list.get(0).getId());
+		}
+		// rfid--绑定 需要判断 委托单的状态和创建情况
 			if(Func.isNotEmpty(entrustInfo.getRepealType()) && entrustInfo.getRepealType()==1){
 				entrustInfo.setSampleStatus("6");
 				entrustInfo.setRepealTime(new Date());
@@ -191,6 +201,7 @@ public class  EntrustInfoController extends BladeController {
 		} else {
 			reportDetail = entrustInfoService.getReportDetail(id);
 		}
+		reportDetail.setEntrustNo(entrustInfo.getEntrustNo());
 		return R.data(reportDetail);
 	}