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

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

@@ -191,6 +191,7 @@ public class  EntrustInfoController extends BladeController {
 		} else {
 			reportDetail = entrustInfoService.getReportDetail(id);
 		}
+		reportDetail.setEntrustNo(entrustInfo.getEntrustNo());
 		return R.data(reportDetail);
 	}