委托管理完成

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

@@ -7,6 +7,7 @@ import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.*;
 import cn.wise.sc.cement.business.model.vo.EntrustVo;
 import cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo;
+import cn.wise.sc.cement.business.model.vo.SampleTeamGroupVo;
 import cn.wise.sc.cement.business.model.vo.SampleVo;
 import cn.wise.sc.cement.business.service.IEntrustService;
 import cn.wise.sc.cement.business.util.WordUtil;
@@ -53,7 +54,7 @@ public class EntrustController {
 					value = "状态(0未评审，1已通过，2未通过，" +
 							"3样品处理中，4样品处理完成，" +
 							"5样品检测中，6样品检测完成，" +
-							"7校核中，8校核完成)", paramType = "query", dataType = "Integer"),
+							"7校核中，8校核完成,9修改待确认)", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "clientName", value = "委托单位id", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "projectCode", value = "项目编号", paramType = "query", dataType = "String"),
@@ -106,6 +107,17 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "修改委托")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody EntrustUpdateQuery query) {
+		try {
+			return entrustService.update(query);
+		} catch (Exception e) {
+			log.debug("修改委托{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
 	@ApiOperation(value = "评审时删除委托样品")
 	@PostMapping("/deleteSample/{sampleId}")
 	public BaseResponse deleteSample(@PathVariable Integer sampleId) {
@@ -128,41 +140,6 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@PostMapping("/export/{entrustId}")
-	@ApiOperation("导出委托单")
-	public void getReportDetail(@PathVariable("entrustId") Integer entrustId,
-	                            HttpServletResponse response) {
-//		EntrustVo entrustVo = entrustService.getDetailCapacity(entrustId).getData();
-		EntrustVo entrustVo = entrustService.getBaseDtail(entrustId).getData();
-		if (entrustVo == null) {
-			return;
-		}
-		Map<String, Object> beanParams = new HashMap<>(7);
-		beanParams.put("clientName", entrustVo.getClientName()==null?"":entrustVo.getClientName());
-		beanParams.put("entrustCode", entrustVo.getEntrustCode()==null?"":entrustVo.getEntrustCode());
-		beanParams.put("userName", entrustVo.getUserName()==null?"":entrustVo.getUserName());
-		beanParams.put("userPhone", entrustVo.getUserPhone()==null?"":entrustVo.getUserPhone());
-		beanParams.put("userFax", entrustVo.getUserFax()==null?"":entrustVo.getUserFax());
-		beanParams.put("projectName", entrustVo.getProjectName()==null?"":entrustVo.getProjectName());
-		beanParams.put("sampleNum", entrustVo.getSampleNum()==null?"":entrustVo.getSampleNum());
-
-		//获取委托单样品列表(不包含平行样)
-		List<SampleVo> sampleList = new ArrayList<>(entrustVo.getSampleList().size());
-		entrustVo.getSampleList()
-				.stream()
-				.filter(arg -> arg.getCementCode().equals(arg.getParallelCode()) )
-				.forEach(arg -> {
-					List<SampleDistributionTeamVo> teamVoList = arg.getSampleDistributionTeamVoList();
-					arg.setTeamName(getTeamName(teamVoList));
-					sampleList.add(arg);
-				});
-		beanParams.put("list", sampleList);
-
-		WordUtil.writeWordReportSXB(entrustVo.getEntrustCode() +"-"+ entrustVo.getProjectName() + "-委托单", "entrust2.ftl",
-				beanParams, response, FileExt.DOC);
-
-	}
-
 	@ApiOperation(value = "获取样品表里最大的本所编号")
 	@GetMapping("/getMaxCementCode")
 	public BaseResponse getMaxCementCode() {
@@ -185,6 +162,19 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "委托人确认修改信息+发送样品处理任务")
+	@PostMapping("/sureUpdate")
+	public BaseResponse sureUpdate(@RequestBody sureUpdateQuery query) {
+		try {
+			return entrustService.sureUpdate(query);
+		} catch (Exception e) {
+			log.debug("委托人确认修改信息+发送样品处理任务{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+
 	/*@ApiOperation(value = "发送样品处理任务")
 	@PostMapping("/handle")
 	public BaseResponse handle(@RequestBody HandleQuery query) {
@@ -242,13 +232,13 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "数据上传列表")
+	@ApiOperation(value = "样品处理附件列表")
 	@GetMapping("/getSampleHandleEnclosureList")
 	public BaseResponse getSampleHandleEnclosureList(Integer sampleHandleId) {
 		try {
 			return entrustService.getSampleHandleEnclosureList(sampleHandleId);
 		} catch (Exception e) {
-			log.debug("数据上传列表{}", e);
+			log.debug("样品处理附件列表{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
@@ -277,22 +267,54 @@ public class EntrustController {
 
 	@ApiOperation(value = "完成样品处理任务")
 	@PostMapping("/finishHandle")
-	public BaseResponse finishHandle(@RequestBody Integer[] ids) {
+	public BaseResponse finishHandle(Integer id) {
 		try {
-			return entrustService.finishHandle(ids);
+			return entrustService.finishHandle(id);
 		} catch (Exception e) {
 			log.debug("完成样品处理任务{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "派发检测项目任务")
-	@PostMapping("/distribution")
-	public BaseResponse distribution(@RequestBody DistributionQuery query) {
+	@ApiOperation(value = "样品处理任务退回")
+	@PostMapping("/returnHandle")
+	public BaseResponse returnHandle(@RequestBody ReturnQuery query) {
 		try {
-			return entrustService.distribution(query);
+			return entrustService.returnHandle(query);
 		} catch (Exception e) {
-			log.debug("派发检测项目任务{}", e);
+			log.debug("样品处理任务退回{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@ApiOperation(value = "样品处理退回任务分页")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "userId", value = "接受人id", paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "clientName", value = "委托单位id", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "projectCode", value = "项目编号", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "isUrgent", value = "（1加急，0不加急）", paramType = "query", dataType = "Integer")
+	})
+	@GetMapping("/getSampleReturnHandlePage")
+	public BaseResponse getSampleReturnHandlePage(PageQuery pageQuery, String entrustCode, Integer userId,
+	                                        String clientName, String projectName, String projectCode, Integer isUrgent) {
+		try {
+			return entrustService.getSampleReturnHandlePage(pageQuery, entrustCode, userId, clientName, projectName, projectCode, isUrgent);
+		} catch (Exception e) {
+			log.debug("样品处理退回任务分页{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "重新派发样品处理任务")
+	@PostMapping("/handleAgain")
+	public BaseResponse handleAgain(@RequestBody HandleAgainQuery query) {
+		try {
+			return entrustService.handleAgain(query);
+		} catch (Exception e) {
+			log.debug("重新派发样品处理任务{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
@@ -333,6 +355,19 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "派发检测项目任务")
+	@PostMapping("/distribution")
+	public BaseResponse distribution(@RequestBody DistributionQuery query) {
+		try {
+			return entrustService.distribution(query);
+		} catch (Exception e) {
+			log.debug("派发检测项目任务{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+
 	@ApiOperation(value = "详情-基本信息")
 	@GetMapping("/getBaseDtail/{id}")
 	public BaseResponse getBaseDtail(@PathVariable Integer id) {
@@ -399,9 +434,20 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "检测项目上传附件")
+	@ApiOperation(value = "样品检测附件列表")
+	@GetMapping("/getSampleDistributionEnclosureList")
+	public BaseResponse getSampleDistributionEnclosureList(Integer sampleDistributionId) {
+		try {
+			return entrustService.getSampleDistributionEnclosureList(sampleDistributionId);
+		} catch (Exception e) {
+			log.debug("样品检测数据上传列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "样品检测上传附件")
 	@PostMapping("/uploadEnclosurePF")
-	public BaseResponse uploadEnclosurePF(SampleDistributionEnclosureQuery query) {
+	public BaseResponse uploadEnclosurePF(SampleHandleEnclosureQuery query) {
 		try {
 			return entrustService.uploadEnclosurePF(query);
 		} catch (Exception e) {
@@ -410,17 +456,19 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "完成检测项目任务")
+
+	@ApiOperation(value = "完成检测项目任务（按组完成）+重新检测")
 	@PostMapping("/finishDistribution")
-	public BaseResponse finishDistribution(@RequestBody Integer[] ids) {
+	public BaseResponse finishDistribution(@RequestBody FinishCheckGroupQuery query) {
 		try {
-			return entrustService.finishDistribution(ids);
+			return entrustService.finishDistribution(query);
 		} catch (Exception e) {
 			log.debug("完成检测项目任务{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
+
 	@ApiOperation(value = "数据校核分页")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
@@ -453,39 +501,65 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "样品检测项校核详情")
-	@GetMapping("/getCheckDetail")
-	public BaseResponse getCheckDetail(String cementCode) {
-		try {
-			return entrustService.getCheckDetail(cementCode);
-		} catch (Exception e) {
-			log.debug("样品检测项校核详情{}", e);
-		}
-		return BaseResponse.errorMsg("失败!");
-	}
 
-	@ApiOperation(value = "查询任务检测附件信息")
-	@GetMapping("/getEnclosureList")
-	public BaseResponse getEnclosureList(Integer sampleId, Integer teamGroupId, Integer userId) {
+	@ApiOperation(value = "数据校核结果查看")
+	@GetMapping("/getCheckResult")
+	public BaseResponse getCheckResult(Integer entrustId, Integer userId) {
 		try {
-			return entrustService.getEnclosureList(sampleId, teamGroupId, userId);
+			return entrustService.getCheckResult(entrustId, userId);
 		} catch (Exception e) {
-			log.debug("查询任务检测附件信息{}", e);
+			log.debug("数据校核结果查看{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
 	@ApiOperation(value = "校核计算")
 	@PostMapping("/checkCount")
-	public BaseResponse checkCount(@RequestBody CheckCountQuery query) {
+	public BaseResponse checkCount(@RequestBody CheckCountNewQuery query) {
 		try {
-			return entrustService.checkCount(query);
+			return entrustService.checkCountNew(query);
 		} catch (Exception e) {
 			log.debug("校核计算{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@PostMapping("/export/{entrustId}")
+	@ApiOperation("导出委托单")
+	public void getReportDetail(@PathVariable("entrustId") Integer entrustId,
+	                            HttpServletResponse response) {
+		EntrustVo entrustVo = entrustService.getBaseDtail(entrustId).getData();
+		if (entrustVo == null) {
+			return;
+		}
+		Map<String, Object> beanParams = new HashMap<>(7);
+		beanParams.put("clientName", entrustVo.getClientName()==null?"":entrustVo.getClientName());
+		beanParams.put("entrustCode", entrustVo.getEntrustCode()==null?"":entrustVo.getEntrustCode());
+		beanParams.put("userName", entrustVo.getUserName()==null?"":entrustVo.getUserName());
+		beanParams.put("userPhone", entrustVo.getUserPhone()==null?"":entrustVo.getUserPhone());
+		beanParams.put("userFax", entrustVo.getUserFax()==null?"":entrustVo.getUserFax());
+		beanParams.put("projectName", entrustVo.getProjectName()==null?"":entrustVo.getProjectName());
+		beanParams.put("sampleNum", entrustVo.getSampleNum()==null?"":entrustVo.getSampleNum());
+
+		//获取委托单样品列表(不包含平行样)
+		List<SampleVo> sampleList = new ArrayList<>(entrustVo.getSampleList().size());
+		entrustVo.getSampleList()
+				.stream()
+				.filter(arg -> arg.getCementCode().equals(arg.getParallelCode()) )
+				.forEach(arg -> {
+					List<SampleTeamGroupVo> teamVoList = arg.getSampleTeamGroupVoList();
+					teamVoList.forEach(args ->{
+						List<SampleDistributionTeamVo> teamVoList2 = args.getSampleDistributionTeamVoList();
+						arg.setTeamName(getTeamName(teamVoList2));
+					});
+					sampleList.add(arg);
+				});
+		beanParams.put("list", sampleList);
+
+		WordUtil.writeWordReportSXB(entrustVo.getEntrustCode() +"-"+ entrustVo.getProjectName() + "-委托单", "entrust2.ftl",
+				beanParams, response, FileExt.DOC);
+
+	}
 
    /* @ApiOperation(value = "数据校核")
     @PostMapping("/check")

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EquipmentController.java

 package cn.wise.sc.cement.business.controller;
 
 import cn.wise.sc.cement.business.entity.Equipment;
+import cn.wise.sc.cement.business.entity.EquipmentType;
 import cn.wise.sc.cement.business.entity.SysPost;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -326,5 +327,96 @@ public class EquipmentController {
 		}
 	}
 
+	//*********************************************************************
+
+	@ApiOperation(value = "设备分类分页列表")
+	@GetMapping("/getTypePage")
+	public BaseResponse getTypePage(PageQuery pageQuery) {
+		try {
+			return equipmentService.getTypePage(pageQuery);
+		} catch (Exception e) {
+			log.debug("设备分类分页列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "新增设备分类")
+	@PostMapping("/createType")
+	public BaseResponse createType(@RequestBody EquipmentType equipmentType) {
+		try {
+			return equipmentService.createType(equipmentType);
+		} catch (Exception e) {
+			log.debug("新增设备分类{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "修改设备分类")
+	@PostMapping("/updateType")
+	public BaseResponse updateType(@RequestBody EquipmentType equipmentType) {
+		try {
+			return equipmentService.updateType(equipmentType);
+		} catch (Exception e) {
+			log.debug("修改设备分类{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "禁用启用分类")
+	@PostMapping("/statusType")
+	public BaseResponse statusType(Integer status, Integer id) {
+		try {
+			return equipmentService.statusType(status, id);
+		} catch (Exception e) {
+			log.debug("禁用启用分类{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@ApiOperation(value = "删除分类")
+	@PostMapping("/deleteType")
+	public BaseResponse deleteType(Integer id) {
+		try {
+			return equipmentService.deleteType( id);
+		} catch (Exception e) {
+			log.debug("删除分类{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "分类列表")
+	@GetMapping("/getTypeList")
+	public BaseResponse getTypeList() {
+		try {
+			return equipmentService.getTypeList();
+		} catch (Exception e) {
+			log.debug("分类列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "分类选择设备列表")
+	@GetMapping("/getEquipmentList")
+	public BaseResponse getEquipmentList() {
+		try {
+			return equipmentService.getEquipmentList();
+		} catch (Exception e) {
+			log.debug("分类选择设备列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@ApiOperation(value = "转移分类")
+	@PostMapping("/changeType")
+	public BaseResponse changeType(Integer id, Integer typeId) {
+		try {
+			return equipmentService.changeType(id, typeId);
+		} catch (Exception e) {
+			log.debug("转移分类{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
 }
 

cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamController.java

@@ -137,8 +137,6 @@ public class TeamController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-
-
 	@ApiOperation(value = "获取检测项目列表")
 	@GetMapping("/getTeamNameList")
 	public BaseResponse getTeamNameList() {
@@ -150,6 +148,19 @@ public class TeamController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "根据检测组id获取本组序号列表")
+	@GetMapping("/getSortByGroup")
+	public BaseResponse getSortByGroup(Integer gruopId) {
+		try {
+			return teamService.getSortByGroup(gruopId);
+		} catch (Exception e) {
+			log.debug("根据检测组id获取本组序号列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+
 
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Entrust.java

@@ -75,7 +75,7 @@ public class Entrust implements Serializable {
 	private Integer handleMethod;
 
 	@ApiModelProperty("状态（0未评审，1已通过，2未通过，3样品处理中，4样品处理完成，" +
-			"5样品检测中，6样品检测完成，7校核中，8校核完成）")
+			"5样品检测中，6样品检测完成，7校核中，8校核完成,9修改待确认,10已作废）")
 	private Integer status;
 
 	@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Equipment.java

@@ -34,8 +34,8 @@ public class Equipment implements Serializable {
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 
-	@ApiModelProperty("设备分类（A、B）")
-	private String type;
+	@ApiModelProperty("设备分类表id")
+	private Integer type;
 
 	@ApiModelProperty("是否已检定（1是，0否）")
 	private Integer isChecked;

cement-business/src/main/java/cn/wise/sc/cement/business/entity/EquipmentType.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-01-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EquipmentType implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("分类名称")
+    private String name;
+
+    @ApiModelProperty("状态 0:禁用 1:激活")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistribution.java

@@ -32,6 +32,9 @@ public class SampleDistribution implements Serializable {
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 
+	@ApiModelProperty("委托表id")
+	private Integer entrustId;
+
 	@ApiModelProperty("样品表d")
 	private Integer sampleId;
 
@@ -44,7 +47,7 @@ public class SampleDistribution implements Serializable {
 	@ApiModelProperty("处理人id")
 	private Integer userId;
 
-	@ApiModelProperty("（0未接受，1接受，2完成）")
+	@ApiModelProperty("（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
 	private Integer status;
 
 	@ApiModelProperty("接受时间")
@@ -59,16 +62,15 @@ public class SampleDistribution implements Serializable {
 	@ApiModelProperty("备注")
 	private String remark;
 
-	@ApiModelProperty("附件地址")
-	private String enclosureUrl;
+	@ApiModelProperty("检测结果")
+	private String distributionResult;
+
+	@ApiModelProperty("校核输入表id")
+	private Integer checkInputId;
 
-	@ApiModelProperty("文件名")
-	private String alias;
+	@ApiModelProperty("校核结果表id")
+	private Integer checkId;
 
-	@ApiModelProperty("扩展名")
-	private String extName;
 
-	@ApiModelProperty("上传图片时间")
-	private LocalDateTime updateTime;
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistributionCheck.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SampleDistributionCheck implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 检测误差
+     */
+    private String distributionError;
+
+    /**
+     * 最终结果
+     */
+    private String lastResult;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistributionCheckinput.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sample_distribution_checkinput")
+public class SampleDistributionCheckinput implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 委托表id
+     */
+    private Integer entrustId;
+
+    /**
+     * 样品表d
+     */
+    private Integer sampleId;
+
+    /**
+     * 检测组id
+     */
+    private Integer teamGroupId;
+
+    /**
+     * 处理人id
+     */
+    private Integer userId;
+
+    /**
+     * 校核人id
+     */
+    private Integer checkUserId;
+
+    /**
+     * 检测结果 输入的 信息 json串
+
+{"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
+     */
+    private String inputResult;
+
+    /**
+     * 状态（1通过，0退回）
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 最后一次校核时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistributionEnclosure.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SampleDistributionEnclosure implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 样品检测表id
+     */
+    private Integer sampleDistributionId;
+
+    /**
+     * 处理项表id
+     */
+    private Integer teamId;
+
+    /**
+     * 操作人id
+     */
+    private Integer userId;
+
+    /**
+     * 附件地址
+     */
+    private String enclosureUrl;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 上传图片时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 状态(0未上传，1成功，2上传失败)
+     */
+    private Integer status;
+
+    /**
+     * 文件名
+     */
+    private String alias;
+
+    /**
+     * 扩展名
+     */
+    private String extName;
+
+    /**
+     * pdf地址
+     */
+    private String pdfUrl;
+
+    /**
+     * 是否允许委托人查看 是否公开 （0不公开，1公开）
+     */
+    private Integer isPublic;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistributionEquipment.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SampleDistributionEquipment implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 样品表d
+     */
+    private Integer distributionId;
+
+    /**
+     * 检测组id
+     */
+    private Integer equipmentId;
+
+    /**
+     * 检测设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 处理人id
+     */
+    private Integer userId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistributionReturn.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SampleDistributionReturn implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 样品处理表id
+     */
+    private Integer sampleDistributionId;
+
+    /**
+     * 处理人id
+     */
+    private Integer userId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 退回原因
+     */
+    private String returnReason;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleHandle.java

@@ -47,7 +47,7 @@ public class SampleHandle implements Serializable {
 	@ApiModelProperty("要求完成日期(计划完成日期)")
 	private LocalDate planFinishDate;
 
-	@ApiModelProperty("（0未接受，1接受，2完成）")
+	@ApiModelProperty("（0未接受，1接受，2完成，3退回）")
 	private Integer status;
 
 	@ApiModelProperty("接受时间")

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleHandleReturn.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SampleHandleReturn implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 样品处理表id
+     */
+    private Integer sampleHandleId;
+
+    /**
+     * 处理人id
+     */
+    private Integer userId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 退回原因
+     */
+    private String returnReason;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Team.java

@@ -73,7 +73,15 @@ public class Team extends BaseEntity implements Serializable {
 	@ApiModelProperty("备注")
 	private String remark;
 
-	@ApiModelProperty("处理项表id")
-	private Integer handleId;
+	@ApiModelProperty("处理项表id 1、2、3")
+	private String handleId;
 
+	@ApiModelProperty("处理项名称 a、b、c")
+	private String handleName;
+
+	@ApiModelProperty("本组序号 12345")
+	private Integer sortNo;
+
+	@ApiModelProperty("是否需要平行（0否，1是）")
+	private Integer isParallel;
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EntrustMapper.java

@@ -5,6 +5,7 @@ import cn.wise.sc.cement.business.entity.EntrustReport;
 import cn.wise.sc.cement.business.entity.QualityDetail;
 import cn.wise.sc.cement.business.model.vo.EntrustVo;
 import cn.wise.sc.cement.business.model.vo.ProjectVo;
+import cn.wise.sc.cement.business.model.vo.SampleReturnHandleVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,4 +44,8 @@ public interface EntrustMapper extends BaseMapper<Entrust> {
 
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
+	//*************************************
+	IPage<SampleReturnHandleVo> getSampleReturnHandlePage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
+	IPage<SampleReturnHandleVo> getSampleReturnDistributioPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EquipmentMapper.java

@@ -23,6 +23,8 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
 
 	IPage<EquipmentVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
 
+	List<EquipmentVo> getEQList();
+
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
 	List<Map<String, Object>> exportTestList(@Param("params") Map<String, Object> params);

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EquipmentTypeMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.EquipmentType;
+import cn.wise.sc.cement.business.model.vo.EquipmentTypeVo;
+import cn.wise.sc.cement.business.model.vo.GroupVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-01-28
+ */
+public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
+
+	IPage<EquipmentTypeVo> getPage(@Param("page") Page page);
+
+	List<EquipmentTypeVo> getEqTypeList();
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionCheckMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-05
+ */
+public interface SampleDistributionCheckMapper extends BaseMapper<SampleDistributionCheck> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionCheckinputMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionCheckinput;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-06
+ */
+public interface SampleDistributionCheckinputMapper extends BaseMapper<SampleDistributionCheckinput> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionEnclosureMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEnclosure;
+import cn.wise.sc.cement.business.model.vo.SampleDistributionEnclosureVo;
+import cn.wise.sc.cement.business.model.vo.SampleHandleEnclosureVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface SampleDistributionEnclosureMapper extends BaseMapper<SampleDistributionEnclosure> {
+
+	List<SampleDistributionEnclosureVo> getList(@Param("params") Map<String, Object> params);
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionEquipmentMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface SampleDistributionEquipmentMapper extends BaseMapper<SampleDistributionEquipment> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionMapper.java

@@ -39,4 +39,8 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
 	List<EntrustSample> getEntrustSample();
 
 	List<EntrustSample> getSampleDistribution(@Param("params") Map<String, Object> param);
+
+
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionReturnMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionReturn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface SampleDistributionReturnMapper extends BaseMapper<SampleDistributionReturn> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleHandleReturnMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SampleHandleReturn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-03
+ */
+public interface SampleHandleReturnMapper extends BaseMapper<SampleHandleReturn> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleMapper.java

@@ -69,6 +69,11 @@ public interface SampleMapper extends BaseMapper<Sample> {
      */
     List<SampleWord> exportWordList(@Param("params") Map<String, Object> params);
 
+    //获取该样品的其他平行样样品
+    @Select("select * from sample where entrust_id = #{entrustId}  and  cement_code= #{cementCode} and id !=#{sampleId} ")
+    List<Sample> getOtherSampleList(@Param("entrustId") Integer entrustId, @Param("cementCode") String cementCode,
+                                     @Param("sampleId") Integer sampleId);
+
 
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/TeamMapper.java

@@ -37,4 +37,6 @@ public interface TeamMapper extends BaseMapper<Team> {
 
 
 
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml

@@ -54,6 +54,7 @@
         WHEN 6 THEN '样品检测完成'
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
+        WHEN 9 THEN '修改待确认'
         ELSE ''
         END
         ) as statusValue
@@ -95,6 +96,7 @@
         WHEN 6 THEN '样品检测完成'
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
+        WHEN 9 THEN '修改待确认'
         ELSE ''
         END
         ) as 状态
@@ -121,6 +123,7 @@
         WHEN 6 THEN '样品检测完成'
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
+        WHEN 9 THEN '修改待确认'
         ELSE ''
         END
         ) as statusValue,
@@ -148,6 +151,7 @@
         WHEN 6 THEN '样品检测完成'
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
+        WHEN 9 THEN '修改待确认'
         ELSE ''
         END
         ) as statusValue,
@@ -203,6 +207,7 @@
         WHEN 6 THEN '样品检测完成'
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
+        WHEN 9 THEN '修改待确认'
         ELSE ''
         END
         ) as statusValue,
@@ -257,6 +262,7 @@
         WHEN 6 THEN '样品检测完成'
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
+        WHEN 9 THEN '修改待确认'
         ELSE ''
         END
         ) as statusValue
@@ -325,4 +331,101 @@
         </where>
     </sql>
 
+
+
+    <select id="getSampleReturnHandlePage" resultType="cn.wise.sc.cement.business.model.vo.SampleReturnHandleVo">
+        select t.id as id, e.id as entrustId,  e.entrust_code as entrustCode,p.id as projectId, p.name as projectName, p.code as projectCode,
+        e.client_id as  clientId, c.name as clientName, e.is_urgent as isUrgent, e.project_type as projectType,
+        t.user_id as userId, su.name as userName,t.status as status,
+        (
+        CASE t.status
+        WHEN 0 THEN '未接受'
+        WHEN 1 THEN '接受'
+        WHEN 2 THEN '待校核'
+        WHEN 3 THEN '退回'
+        WHEN 4 THEN '校核通过'
+        WHEN 5 THEN '校核退回'
+        ELSE ''
+        END
+        ) as statusValue,
+        t.remark as returnReason
+        from sample_handle t
+        left join sys_user su on su.id = t.user_id
+        left join sample s on s.id = t.sample_id
+        left join entrust e on e.id = s.entrust_id
+        left join project p on p.id = e.project_id
+        left join client c on c.id = e.client_id
+        where e.is_delete = 1 and t.status = 3
+        <if test="params.userId != null">
+            and t.user_id = #{params.userId}
+        </if>
+        <if test="params.entrustCode != null and params.entrustCode != ''">
+            and e.entrust_code like concat('%', #{params.entrustCode}, '%')
+        </if>
+        <if test="params.projectName != null and params.projectName != ''">
+            and p.name like concat('%', #{params.projectName}, '%')
+        </if>
+        <if test="params.projectCode != null and params.projectCode != ''">
+            and p.code like concat('%', #{params.projectCode}, '%')
+        </if>
+        <if test="params.projectType != null and params.projectType != ''">
+            and e.project_type = #{params.projectType}
+        </if>
+        <if test="params.clientName != null and params.clientName != ''">
+            and c.name like concat('%', #{params.clientName}, '%')
+        </if>
+        <if test="params.isUrgent != null">
+            and e.is_urgent = #{params.isUrgent}
+        </if>
+        order by e.update_time desc
+    </select>
+
+    <select id="getSampleReturnDistributioPage" resultType="cn.wise.sc.cement.business.model.vo.SampleReturnHandleVo">
+        select t.id as id, e.id as entrustId,  e.entrust_code as entrustCode,p.id as projectId, p.name as projectName, p.code as projectCode,
+        e.client_id as  clientId, c.name as clientName, e.is_urgent as isUrgent, e.project_type as projectType,
+        t.user_id as userId, su.name as userName,t.status as status,
+        (
+        CASE t.status
+        WHEN 0 THEN '未接受'
+        WHEN 1 THEN '接受'
+        WHEN 2 THEN '待校核'
+        WHEN 3 THEN '退回'
+        WHEN 4 THEN '校核通过'
+        WHEN 5 THEN '校核退回'
+        ELSE ''
+        END
+        ) as statusValue,
+        t.remark as returnReason
+        from sample_distribution t
+        left join sys_user su on su.id = t.user_id
+        left join sample s on s.id = t.sample_id
+        left join entrust e on e.id = s.entrust_id
+        left join project p on p.id = e.project_id
+        left join client c on c.id = e.client_id
+        where e.is_delete = 1 and t.status = 3
+        <if test="params.userId != null">
+            and t.user_id = #{params.userId}
+        </if>
+        <if test="params.entrustCode != null and params.entrustCode != ''">
+            and e.entrust_code like concat('%', #{params.entrustCode}, '%')
+        </if>
+        <if test="params.projectName != null and params.projectName != ''">
+            and p.name like concat('%', #{params.projectName}, '%')
+        </if>
+        <if test="params.projectCode != null and params.projectCode != ''">
+            and p.code like concat('%', #{params.projectCode}, '%')
+        </if>
+        <if test="params.projectType != null and params.projectType != ''">
+            and e.project_type = #{params.projectType}
+        </if>
+        <if test="params.clientName != null and params.clientName != ''">
+            and c.name like concat('%', #{params.clientName}, '%')
+        </if>
+        <if test="params.isUrgent != null">
+            and e.is_urgent = #{params.isUrgent}
+        </if>
+        order by e.update_time desc
+    </select>
+
+
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentMapper.xml

@@ -13,27 +13,39 @@
             <if test="params.name != null and params.name != ''">
                 and t.name like concat('%', #{params.name}, '%')
             </if>
-            <if test="params.type != null and params.type != ''">
-                and t.type like concat('%', #{params.type}, '%')
+            <if test="params.type != null">
+                and t.type = #{params.type}
             </if>
 
         </where>
     </sql>
 
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EquipmentVo">
-        SELECT t.*, s.name as supplierName
+        SELECT t.*, s.name as supplierName, et.name as typeName
         FROM equipment t
         left join supplier s on s.id = t.supplier_id
+        left join equipment_type et on et.id = t.type
         <include refid="where"/>
         ORDER BY t.id DESC
     </select>
 
 
+    <select id="getEQList" resultType="cn.wise.sc.cement.business.model.vo.EquipmentVo">
+        SELECT t.*, s.name as supplierName, et.name as typeName
+        FROM equipment t
+        left join supplier s on s.id = t.supplier_id
+        left join equipment_type et on et.id = t.type
+        where t.status = 1
+        ORDER BY t.id DESC
+    </select>
+
+
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
         t.name as 设备名称,
         t.code as 设备编号,
+        et.name as 设备分类,
         t.brand as 设备品牌,
         t.model as '规格/型号',
         s.name as 供应商,
@@ -41,6 +53,7 @@
         t.purchase_date as 购买日期
         FROM equipment t
         left join supplier s on s.id = t.supplier_id
+        left join equipment_type et on et.id = t.type
         ,(select @i:=0)t
         <include refid="where"/>
     </select>
@@ -63,9 +76,10 @@
 
 
     <select id="getDetail" resultType="cn.wise.sc.cement.business.model.vo.EquipmentVo">
-        SELECT t.*, s.name as supplierName
+        SELECT t.*, s.name as supplierName, et.name as typeName
         FROM equipment t
         left join supplier s on s.id = t.supplier_id
+        left join equipment_type et on et.id = t.type
         where t.id = #{id}
     </select>
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.EquipmentTypeMapper">
+
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EquipmentTypeVo">
+        select et.*,
+        (select count(*) from equipment e
+        where e.type = et.id
+        ) as members
+        from equipment_type et
+    </select>
+
+
+    <select id="getEqTypeList" resultType="cn.wise.sc.cement.business.model.vo.EquipmentTypeVo">
+        select et.*,
+        (select count(*) from equipment e
+        where e.type = et.id
+        ) as members
+        from equipment_type et
+        where et.status = 1
+    </select>
+
+
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionCheckMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.SampleDistributionCheckMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionCheckinputMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.SampleDistributionCheckinputMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionEnclosureMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.SampleDistributionEnclosureMapper">
+
+    <select id="getList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionEnclosureVo">
+        select t.*,
+        su.name as userName,
+        (
+        CASE t.status
+        WHEN 0 THEN '未上传'
+        WHEN 1 THEN '成功'
+        WHEN 2 THEN '上传失败'
+        ELSE ''
+        END
+        ) as statusValue
+        from sample_distribution_enclosure t
+        left join sys_user su on su.id = t.user_id
+        where t.sample_distribution_id = #{params.sampleDistributionId}
+        order by t.id ASC
+    </select>
+
+
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionEquipmentMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.SampleDistributionEquipmentMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionMapper.xml

@@ -54,13 +54,15 @@
     <select id="getDistributionTeamList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo">
         select t.id as distributionId, su.id as userId, su.name as userName,
         t.team_group_id as teamGroupId, tg.name as teamGroupName, s.id as teamId, s.name as teamName,
-        t.enclosure_url as enclosureUrl, t.alias as alias, t.ext_name as extName,
         t.status as status,
         (
         CASE t.status
         WHEN 0 THEN '未接受'
-        WHEN 1 THEN '已接受'
-        WHEN 2 THEN '已完成'
+        WHEN 1 THEN '接受'
+        WHEN 2 THEN '待校核'
+        WHEN 3 THEN '退回'
+        WHEN 4 THEN '校核通过'
+        WHEN 5 THEN '校核退回'
         ELSE ''
         END
         ) as statusValue
@@ -125,4 +127,5 @@
         <include refid="sampleDisWhere"/>
     </select>
 
+
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionReturnMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.SampleDistributionReturnMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleHandleMapper.xml

@@ -53,6 +53,7 @@
         WHEN 0 THEN '未接受'
         WHEN 1 THEN '已接受'
         WHEN 2 THEN '已完成'
+        WHEN 3 THEN '退回'
         ELSE ''
         END
         ) as statusValue
@@ -77,6 +78,7 @@
         WHEN 0 THEN '未接受'
         WHEN 1 THEN '已接受'
         WHEN 2 THEN '已完成'
+        WHEN 3 THEN '退回'
         ELSE ''
         END
         ) as statusValue

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleHandleReturnMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.SampleHandleReturnMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml

@@ -26,11 +26,9 @@
         WHEN 1 THEN '资质内'
         ELSE ''
         END
-        ) as qualificationsValue,
-        h.name as handleName
+        ) as qualificationsValue
         FROM team t
         left join team_group tg on tg.id = t.group_id
-        left join handle h on h.id = t.handle_id
         <include refid="where"/>
         ORDER BY t.create_time desc
     </select>
@@ -72,11 +70,9 @@
         WHEN 1 THEN '资质范围内'
         ELSE ''
         END
-        ) as qualificationsValue,
-        h.name as handleName
+        ) as qualificationsValue
         FROM team t
         left join team_group tg on tg.id = t.group_id
-        left join handle h on h.id = t.handle_id
         where t.id = #{id}
     </select>
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ApprovalQuery.java

@@ -30,7 +30,7 @@ public class ApprovalQuery {
 	@ApiModelProperty("是否同意 1同意，2拒绝")
 	private Integer isAgree;
 
-	@ApiModelProperty("审批意见")
+	@ApiModelProperty("审批意见/驳回原因")
 	private String auditReason;
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/CheckCountDistributionNewQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-02-06
+ **/
+@Data
+@ApiModel("数据校核-校核计算结果")
+public class CheckCountDistributionNewQuery {
+
+	@ApiModelProperty("样品检测表id")
+	private Integer distributionId;
+
+	@ApiModelProperty("检测结果")
+	private String distributionResult;
+
+	@ApiModelProperty("检测误差")
+	private String distributionError;
+
+	@ApiModelProperty("最终结果")
+	private String lastResult;
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/CheckCountNewQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-02-06
+ **/
+@Data
+@ApiModel("数据校核-校核请求（最新需求：通过，退回）")
+public class CheckCountNewQuery {
+
+	@ApiModelProperty("委托表id")
+	private Integer entrustId;
+
+	@ApiModelProperty("样品表id")
+	private Integer smapleId;
+
+	@ApiModelProperty("检测组表id")
+	private Integer teamGroupId;
+
+	@ApiModelProperty("检测人员id")
+	private Integer userId;
+
+	@ApiModelProperty("是否通过 1通过，2退回")
+	private Integer isAgree;
+
+	@ApiModelProperty("退回原因")
+	private String auditReason;
+
+	@ApiModelProperty("输入信息集合")
+	private Map<String, String> intputResult;
+
+	@ApiModelProperty("计算结果信息列表")
+	List<CheckCountDistributionNewQuery> checkCountDistributionNewQueryList;
+
+
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/EntrustQuery.java

@@ -59,5 +59,4 @@ public class EntrustQuery {
 	@ApiModelProperty("样品及检测项列表")
 	private List<SampleTmpQuery> sampleTmpList;
 
-
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/EntrustUpdateQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: qh
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("委托修改请求")
+public class EntrustUpdateQuery {
+
+	@ApiModelProperty("委托表id")
+	private Integer id;
+
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
+	@ApiModelProperty("项目名称")
+	private String projectName;
+
+	@ApiModelProperty("项目编号")
+	private String projectCode;
+
+	@ApiModelProperty("委托单位id")
+	private Integer clientId;
+
+	@ApiModelProperty("送样人")
+	private String sendName;
+
+	@ApiModelProperty("送样人电话")
+	private String sendPhone;
+
+	@ApiModelProperty("委托日期")
+	private LocalDate entrustDate;
+
+	@ApiModelProperty("拟定完成日期")
+	private LocalDate finishDate;
+
+	@ApiModelProperty("样品数量")
+	private Integer sampleNum;
+
+	@ApiModelProperty("（1加急，0不加急）")
+	private Integer isUrgent;
+
+	@ApiModelProperty("剩余样品处理方法（0,取回，1由本所统一处置）")
+	private Integer handleMethod;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+//	@ApiModelProperty("样品及检测项列表")
+//	private List<SampleTmpQuery> sampleTmpList;
+
+	@ApiModelProperty("样品及检测项列表")
+	private List<SampleQuery> sampleList;
+
+	@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")
+	private String projectType;
+
+	@ApiModelProperty("审批意见")
+	private String auditReason;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/EquipmentQuery.java

@@ -20,8 +20,8 @@ public class EquipmentQuery {
 
 	private Integer id;
 
-	@ApiModelProperty("设备分类（A、B）")
-	private String type;
+	@ApiModelProperty("设备分类表id")
+	private Integer type;
 
 	@ApiModelProperty("设备名称")
 	private String name;

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/FinishCheckGroupQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("委托-检测组完成请求")
+public class FinishCheckGroupQuery {
+
+
+
+	@ApiModelProperty("样品表id")
+	private Integer sampleId;
+
+	@ApiModelProperty("检测组id")
+	private Integer teamGroupId;
+
+	@ApiModelProperty("检测项完成列表")
+	private List<FinishCheckQuery> finishCheckQueryList;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/FinishCheckQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("委托-检测项完成请求")
+public class FinishCheckQuery {
+
+	@ApiModelProperty("样品派发表id")
+	private Integer distributionId;
+
+	@ApiModelProperty("选择设备id集合(只传当前时使用的设备 历史设备的id不用传)")
+	private List<Integer> equipmentIdList;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/HandleAgainQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("重新派发请求")
+public class HandleAgainQuery {
+
+	@ApiModelProperty("处理表id/检测项表id")
+	private Integer id;
+
+
+	@ApiModelProperty("接收人id")
+	private Integer userId;
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ReturnDistributionQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-3
+ **/
+@Data
+@ApiModel("样品检测回退请求")
+public class ReturnDistributionQuery {
+	@ApiModelProperty("样品表id")
+	private Integer sampleId;
+
+	@ApiModelProperty("检测组id")
+	private Integer teamGroupId;
+
+	@ApiModelProperty("检测项表id列表")
+	private List<Integer> distributionid;
+
+	@ApiModelProperty("退回原因")
+	private String returnReason;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ReturnQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-3
+ **/
+@Data
+@ApiModel("回退请求")
+public class ReturnQuery {
+	@ApiModelProperty("样品处理表id/检测表id")
+	private Integer id;
+
+	@ApiModelProperty("退回原因")
+	private String returnReason;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleHandleEnclosureQuery.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 @ApiModel("委托-样品处理项数据上传附件请求")
 public class SampleHandleEnclosureQuery {
 
-	@ApiModelProperty("样品处理附件表id")
+	@ApiModelProperty("样品处理表id/样品检测表id")
 	private Integer id;
 
 	@ApiModelProperty("文件名")

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/TeamQuery.java

@@ -36,7 +36,13 @@ public class TeamQuery {
 	@ApiModelProperty("是否可见 0:不可见 1:可见")
 	private Integer isDisplay;
 
-	@ApiModelProperty("处理项表id")
-	private Integer handleId;
+	@ApiModelProperty("处理项表id 1、2、3")
+	private String handleId;
+
+	@ApiModelProperty("本组序号 12345")
+	private Integer sortNo;
+
+	@ApiModelProperty("是否需要平行（0否，1是）")
+	private Integer isParallel;
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/sureUpdateQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-3 14:58
+ **/
+@Data
+@ApiModel("委托人更新确认请求")
+public class sureUpdateQuery {
+	@ApiModelProperty("委托表id")
+	private Integer id;
+
+	@ApiModelProperty("是否同意 1同意，2拒绝")
+	private Integer isAgree;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckSampleResultVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核结果-样品Vo")
+public class CheckSampleResultVo {
+
+	@ApiModelProperty("样品表id")
+	private Integer sampleId;
+
+	@ApiModelProperty("来样编号")
+	private String sampleCode;
+
+	@ApiModelProperty("样品名")
+	private String name;
+
+	@ApiModelProperty("样品状态（粉、块状)")
+	private String sampleForm;
+
+	@ApiModelProperty("样品照片")
+	private String samplePhoto;
+
+	@ApiModelProperty("样品重量")
+	private BigDecimal weight;
+
+	@ApiModelProperty("样品重量计量单位（1微克，2毫克，3克，4千克，5吨）")
+	private Integer weightType;
+
+	@ApiModelProperty("平行样编号")
+	private String parallelCode;
+
+	@ApiModelProperty("本所编号")
+	private String cementCode;
+
+	@ApiModelProperty("产地")
+	private String origin;
+
+
+
+	@ApiModelProperty("委托表id")
+	private Integer entrustId;
+
+	@ApiModelProperty("委托编号")
+	private String entrustCode;
+
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
+	@ApiModelProperty("项目名称")
+	private String projectName;
+
+	@ApiModelProperty("项目编号")
+	private String projectCode;
+
+	@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")
+	private String projectType;
+
+	@ApiModelProperty("委托人id")
+	private Integer userId;
+
+	@ApiModelProperty("委托人姓名")
+	private String userName;
+
+	@ApiModelProperty("委托人手机号码")
+	private String userPhone;
+
+	@ApiModelProperty("委托人传真")
+	private String userFax;
+
+	@ApiModelProperty("委托单位Id")
+	private Integer clientId;
+
+	@ApiModelProperty("委托单位姓名")
+	private String clientName;
+
+
+	@ApiModelProperty("校核人员输入检测结果")
+	private String inputResult;
+
+	@ApiModelProperty("计算结果 json串")
+	private String countResult;
+
+
+
+	@ApiModelProperty("委托-校核结果-检测项列表")
+	private List<CheckTeamResultVo> checkTeamResultVoList;
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckSampleVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核-样品Vo")
+public class CheckSampleVo {
+
+	@ApiModelProperty("样品表id")
+	private Integer sampleId;
+
+	@ApiModelProperty("来样编号")
+	private String sampleCode;
+
+	@ApiModelProperty("样品名")
+	private String name;
+
+	@ApiModelProperty("样品状态（粉、块状)")
+	private String sampleForm;
+
+	@ApiModelProperty("样品照片")
+	private String samplePhoto;
+
+	@ApiModelProperty("样品重量")
+	private BigDecimal weight;
+
+	@ApiModelProperty("样品重量计量单位（1微克，2毫克，3克，4千克，5吨）")
+	private Integer weightType;
+
+	@ApiModelProperty("平行样编号")
+	private String parallelCode;
+
+	@ApiModelProperty("本所编号")
+	private String cementCode;
+
+	@ApiModelProperty("产地")
+	private String origin;
+
+	@ApiModelProperty("委托-校核-检测组列表")
+	private List<CheckTeamGroupVo> checkTeamGroupVoList;
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckTeamGroupResultVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核结果-检测组Vo")
+public class CheckTeamGroupResultVo {
+
+	@ApiModelProperty("检测组id")
+	private Integer teamGroupId;
+
+	@ApiModelProperty("检测组名称")
+	private String teamGroupName;
+
+	@ApiModelProperty("委托-校核结果-样品列表")
+	private List<CheckSampleResultVo> checkSampleResultVoList;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckTeamGroupVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核-检测组Vo")
+public class CheckTeamGroupVo {
+
+	@ApiModelProperty("检测组id")
+	private Integer teamGroupId;
+
+	@ApiModelProperty("检测组名称")
+	private String teamGroupName;
+
+	@ApiModelProperty("委托-校核-检测项列表")
+	private List<CheckTeamVo> checkTeamVoList;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckTeamResultVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核结果-检测项Vo")
+public class CheckTeamResultVo {
+
+	@ApiModelProperty("派发表id")
+	private Integer distributionId;
+
+	@ApiModelProperty("检测项id")
+	private Integer teamId;
+
+	@ApiModelProperty("检测项名称")
+	private String teamName;
+
+	@ApiModelProperty("本组序号 12345")
+	private Integer sortNo;
+
+	@ApiModelProperty("状态（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
+	private Integer status;
+
+	@ApiModelProperty(" 状态值（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
+	private String statusValue;
+
+	@ApiModelProperty("检测依据表id  1、2、3")
+	private String methodId;
+
+	@ApiModelProperty("检测依据名称  a、b、c")
+	private String methodName;
+
+	@ApiModelProperty("检测依据编号 11、22、33")
+	private String number;
+
+	@ApiModelProperty("检测设备列表")
+	List<SampleDistributionEquipment> sampleDistributionEquipmentList;
+
+	@ApiModelProperty("检测结果")
+	private String distributionResult;
+
+	@ApiModelProperty("检测误差")
+	private String distributionError;
+
+	@ApiModelProperty("最终结果")
+	private String lastResult;
+
+	@ApiModelProperty("其他人的检测结果")
+	List<String> ortherUserResult;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckTeamVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核-检测项Vo")
+public class CheckTeamVo {
+
+	@ApiModelProperty("派发表id")
+	private Integer distributionId;
+
+	@ApiModelProperty("检测项id")
+	private Integer teamId;
+
+	@ApiModelProperty("检测项名称")
+	private String teamName;
+
+	@ApiModelProperty("本组序号 12345")
+	private Integer sortNo;
+
+	@ApiModelProperty("状态（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
+	private Integer status;
+
+	@ApiModelProperty(" 状态值（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
+	private String statusValue;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckUserResultVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核结果-检测人Vo")
+public class CheckUserResultVo {
+
+	@ApiModelProperty("检测人员id")
+	private Integer userId;
+
+	@ApiModelProperty("检测人员姓名")
+	private String userName;
+
+	@ApiModelProperty("检测人员id")
+	private Integer entrustId;
+
+	@ApiModelProperty("委托编号")
+	private String entrustCode;
+
+	@ApiModelProperty("委托-校核结果-检测组列表")
+	private List<CheckTeamGroupResultVo> checkTeamGroupResultVoList;
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckUserVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核-检测人Vo")
+public class CheckUserVo {
+
+	@ApiModelProperty("检测人员id")
+	private Integer userId;
+
+	@ApiModelProperty("检测人员姓名")
+	private String userName;
+
+	@ApiModelProperty("委托-校核-样品列表")
+	private List<CheckSampleVo> checkSampleVoList;
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-2-5
+ **/
+@Data
+@ApiModel("委托-校核Vo")
+public class CheckVo {
+
+	@ApiModelProperty("委托表id")
+	private Integer entrustId;
+
+	@ApiModelProperty("委托编号")
+	private String entrustCode;
+
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
+	@ApiModelProperty("项目名称")
+	private String projectName;
+
+	@ApiModelProperty("项目编号")
+	private String projectCode;
+
+	@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")
+	private String projectType;
+
+	@ApiModelProperty("委托人id")
+	private Integer userId;
+
+	@ApiModelProperty("委托人姓名")
+	private String userName;
+
+	@ApiModelProperty("委托人手机号码")
+	private String userPhone;
+
+	@ApiModelProperty("委托人传真")
+	private String userFax;
+
+	@ApiModelProperty("委托单位Id")
+	private Integer clientId;
+
+	@ApiModelProperty("委托单位姓名")
+	private String clientName;
+
+	@ApiModelProperty("委托日期")
+	private LocalDate entrustDate;
+
+	@ApiModelProperty("样品数量")
+	private Integer sampleNum;
+
+	@ApiModelProperty("状态（0未评审，1已通过，2未通过，3样品处理中，4样品处理完成，" +
+			"5样品检测中，6样品检测完成，7校核中，8校核完成,9修改待确认）")
+	private Integer status;
+
+	@ApiModelProperty("状态")
+	private String statusValue;
+
+	@ApiModelProperty("送样人姓名")
+	private String sendName;
+
+	@ApiModelProperty("送样人电话")
+	private String sendPhone;
+
+	@ApiModelProperty("拟定完成日期")
+	private LocalDate finishDate;
+
+	@ApiModelProperty("（1加急，0不加急）")
+	private Integer isUrgent;
+
+	@ApiModelProperty(" 剩余样品处理方法（0,取回，1由本所统一处置）")
+	private Integer handleMethod;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+	//*************************************************
+
+	@ApiModelProperty("委托-校核-检测人Vo列表")
+	private List<CheckUserVo> checkUserVoList;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EntrustVo.java

@@ -66,7 +66,7 @@ public class EntrustVo {
 	private Integer sampleNum;
 
 	@ApiModelProperty("状态（0未评审，1已通过，2未通过，3样品处理中，4样品处理完成，" +
-			"5样品检测中，6样品检测完成，7校核中，8校核完成）")
+			"5样品检测中，6样品检测完成，7校核中，8校核完成,9修改待确认）")
 	private Integer status;
 
 	@ApiModelProperty("状态")

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EquipmentTypeVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import cn.wise.sc.cement.business.entity.Equipment;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("设备分类Vo")
+public class EquipmentTypeVo {
+
+	private Integer id;
+
+	@ApiModelProperty("设备分类名称")
+	private String name;
+
+	@ApiModelProperty("状态 0:禁用 1:激活")
+	private Integer status;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+	@ApiModelProperty("设备数量")
+	private Integer members;
+
+	@ApiModelProperty("设备列表")
+	List<EquipmentVo> equipmentList;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EquipmentVo.java

@@ -25,8 +25,11 @@ public class EquipmentVo {
 	private Integer id;
 
 
-	@ApiModelProperty("设备分类（A、B）")
-	private String type;
+	@ApiModelProperty("设备分类表id")
+	private Integer type;
+
+	@ApiModelProperty("设备分类名称")
+	private String typeName;
 
 	@ApiModelProperty("是否已检定（1是，0否）")
 	private Integer isChecked;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionEnclosureVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-14
+ */
+@Data
+@ApiModel("样品检测-数据上传Vo")
+public class SampleDistributionEnclosureVo {
+
+	private Integer id;
+
+	@ApiModelProperty("样品检测表id")
+	private Integer sampleDistributionId;
+
+	@ApiModelProperty("检测项表id")
+	private Integer teamId;
+
+	@ApiModelProperty("操作人id")
+	private Integer userId;
+
+	@ApiModelProperty("操作人姓名")
+	private String userName;
+
+	@ApiModelProperty("附件地址")
+	private String enclosureUrl;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("上传图片时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty("状态(0未上传，1成功，2上传失败)")
+	private Integer status;
+
+	@ApiModelProperty(" 状态值（0未接受，1接受，2完成）")
+	private String statusValue;
+
+	@ApiModelProperty("文件名")
+	private String alias;
+
+	@ApiModelProperty("扩展名")
+	private String extName;
+
+	@ApiModelProperty("pdf地址")
+	private String pdfUrl;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionTeamVo.java

@@ -10,18 +10,12 @@ import lombok.Data;
  * @create: 2020-08-07 14:58
  **/
 @Data
-@ApiModel("委托-样品派发Vo")
+@ApiModel("委托-检测项Vo")
 public class SampleDistributionTeamVo {
 
 	@ApiModelProperty("派发表id")
 	private Integer distributionId;
 
-	@ApiModelProperty("检测组id")
-	private Integer teamGroupId;
-
-	@ApiModelProperty("检测组名称")
-	private String teamGroupName;
-
 	@ApiModelProperty("检测项id")
 	private Integer teamId;
 
@@ -34,19 +28,11 @@ public class SampleDistributionTeamVo {
 	@ApiModelProperty("检测人员姓名")
 	private String userName;
 
-	@ApiModelProperty("（0未接受，1接受，2完成）")
+	@ApiModelProperty("（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
 	private Integer status;
 
-	@ApiModelProperty(" 状态值（0未接受，1已接受，2已完成）")
+	@ApiModelProperty(" 状态值（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
 	private String statusValue;
 
-	@ApiModelProperty("附件地址")
-	private String enclosureUrl;
-
-	@ApiModelProperty("文件名")
-	private String alias;
-
-	@ApiModelProperty("扩展名")
-	private String extName;
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleReturnHandleVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-02-03 14:58
+ **/
+@Data
+@ApiModel("样品处理/检测退回任务列表Vo")
+public class SampleReturnHandleVo {
+	@ApiModelProperty("样品处理表id/样品检测表id")
+	private Integer id;
+
+	@ApiModelProperty("委托表id")
+	private String entrustId;
+
+	@ApiModelProperty("委托编号")
+	private String entrustCode;
+
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
+	@ApiModelProperty("项目名称")
+	private String projectName;
+
+	@ApiModelProperty("项目编号")
+	private String projectCode;
+
+	@ApiModelProperty("委托单位Id")
+	private Integer clientId;
+
+	@ApiModelProperty("委托单位姓名")
+	private String clientName;
+
+	@ApiModelProperty("（1加急，0不加急）")
+	private Integer isUrgent;
+
+	@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")
+	private String projectType;
+
+
+	@ApiModelProperty("接受人id")
+	private Integer userId;
+
+	@ApiModelProperty("接受人姓名")
+	private String userName;
+
+	@ApiModelProperty("状态0未接受，1接受，2完成，3退回）")
+	private Integer status;
+
+	@ApiModelProperty("状态0未接受，1接受，2完成，3退回）")
+	private String statusValue;
+
+	@ApiModelProperty("退回原因")
+	private String returnReason;
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleTeamGroupVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("委托-样品派发Vo")
+public class SampleTeamGroupVo {
+
+	@ApiModelProperty("检测组id")
+	private Integer teamGroupId;
+
+	@ApiModelProperty("检测组名称")
+	private String teamGroupName;
+
+	@ApiModelProperty("检测项列表")
+	private List<SampleDistributionTeamVo> sampleDistributionTeamVoList;
+
+	@ApiModelProperty("（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
+	private Integer status;
+
+	@ApiModelProperty(" 状态值（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
+	private String statusValue;
+
+	@ApiModelProperty("校核被退回原因")
+	private String returnReason;
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleVo.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @create: 2020-08-07 14:58
  **/
 @Data
-@ApiModel("样品及检测项 正式表Vo")
+@ApiModel("委托-样品Vo")
 public class SampleVo {
 
 	@ApiModelProperty("样品表id")
@@ -66,8 +66,8 @@ public class SampleVo {
 	@ApiModelProperty("委托表id")
 	private Integer entrustId;
 
-	@ApiModelProperty("检测项目列表")
-	private List<SampleDistributionTeamVo> sampleDistributionTeamVoList;
+	@ApiModelProperty("检测组列表")
+	private List<SampleTeamGroupVo> sampleTeamGroupVoList;
 
 	//样品管理列表信息
 	@ApiModelProperty("样品登记操作人id")

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/TeamVo.java

@@ -60,10 +60,16 @@ public class TeamVo {
 	private Integer isDisplay;
 
 	@ApiModelProperty("处理项表id")
-	private Integer handleId;
+	private String handleId;
 
 	@ApiModelProperty("处理项名称")
 	private String handleName;
 
+	@ApiModelProperty("本组序号 12345")
+	private Integer sortNo;
+
+	@ApiModelProperty("是否需要平行（0否，1是）")
+	private Integer isParallel;
+
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java

 package cn.wise.sc.cement.business.service;
 
-import cn.wise.sc.cement.business.entity.Entrust;
-import cn.wise.sc.cement.business.entity.EntrustReport;
-import cn.wise.sc.cement.business.entity.SampleDistribution;
-import cn.wise.sc.cement.business.entity.SampleHandleEnclosure;
+import cn.wise.sc.cement.business.entity.*;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.IndustrialReport;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -28,6 +25,7 @@ import java.util.Map;
  */
 public interface IEntrustService extends IService<Entrust> {
 
+	//委托新增 修改 评审
 	BaseResponse<IPage<EntrustVo>> getPage(PageQuery pageQuery, String entrustCode, String startDate, String endDate, Integer status,
 	                                       String clientName, String projectName, String projectCode, Integer isUrgent);
 
@@ -35,18 +33,21 @@ public interface IEntrustService extends IService<Entrust> {
 
 	BaseResponse<Entrust> create(EntrustQuery query);
 
+	BaseResponse<Entrust> update(EntrustUpdateQuery query);
+
 	BaseResponse<String> deleteSample(Integer sampleId);
 
 	BaseResponse<EntrustVo> getDtail(Integer id);
 
-	BaseResponse<EntrustVo> getDetailCapacity(Integer id);
-
 	BaseResponse<String> getMaxCementCode();
 
 	BaseResponse<String> approval(ApprovalQuery query);
 
+	BaseResponse<String> sureUpdate(sureUpdateQuery query);
+
 //	BaseResponse<String> handle(HandleQuery query);
 
+	//派发处理
 	BaseResponse<IPage<EntrustVo>> getSampleHandlePage(PageQuery pageQuery, String entrustCode, Integer status,
 	                                                   String clientName, String projectName, String projectCode, Integer isUrgent);
 
@@ -60,7 +61,16 @@ public interface IEntrustService extends IService<Entrust> {
 
 	BaseResponse<SampleHandleVo> getHandleDtail(Integer id);
 
-	BaseResponse<String> finishHandle(Integer[] ids);
+	BaseResponse<String> finishHandle(Integer id);
+
+	BaseResponse<String> returnHandle(ReturnQuery query);
+
+	BaseResponse<IPage<SampleReturnHandleVo>> getSampleReturnHandlePage(PageQuery pageQuery, String entrustCode, Integer userId,
+	                                                                    String clientName, String projectName, String projectCode, Integer isUrgent);
+
+	BaseResponse<String> handleAgain(HandleAgainQuery query);
+
+	//派发检测
 
 	BaseResponse<String> distribution(DistributionQuery query);
 
@@ -71,20 +81,38 @@ public interface IEntrustService extends IService<Entrust> {
 
 	BaseResponse<String> acceptDistribution(Integer[] ids);
 
-	BaseResponse<SampleDistribution> uploadEnclosurePF(SampleDistributionEnclosureQuery query);
+	BaseResponse<List<SampleDistributionEnclosureVo>> getSampleDistributionEnclosureList(Integer sampleDistributionId);
+
+	BaseResponse<SampleDistributionEnclosure> uploadEnclosurePF(SampleHandleEnclosureQuery query);
+
+//	BaseResponse<SampleDistribution> uploadEnclosurePF(SampleDistributionEnclosureQuery query);
+
+	BaseResponse<String> finishDistribution(FinishCheckGroupQuery query);
+
+	BaseResponse<String> returnDistribution(ReturnDistributionQuery query);
+
+	BaseResponse<IPage<SampleReturnHandleVo>> getSampleReturnDistributioPage(PageQuery pageQuery, String entrustCode, Integer userId,
+	                                                                         String clientName, String projectName, String projectCode, Integer isUrgent);
+
+	BaseResponse<String> distributioAgain(HandleAgainQuery query);
+
+
+
+
+
+	//校核
 
-	BaseResponse<String> finishDistribution(Integer[] ids);
 
 	BaseResponse<IPage<EntrustVo>> getCheckPage(PageQuery pageQuery, String startDate, String endDate, Integer status,
 	                                            Integer clientId, String projectName, String projectCode);
 
-	BaseResponse<Map<String, Object>> getCheckList(Integer id);
+	BaseResponse<CheckVo> getCheckList(Integer id);
 
-	BaseResponse<List<SampleCheckVo>> getCheckDetail(String cementCode);
+	BaseResponse<CheckUserResultVo> getCheckResult(Integer entrustId, Integer userId);
 
-	BaseResponse<List<SampleDistribution>> getEnclosureList(Integer sampleId, Integer teamGroupId, Integer userId);
+	BaseResponse<List<SampleCheckVo>> getCheckDetail(String cementCode);
 
-	BaseResponse<Map<String, Object>> checkCount(CheckCountQuery query);
+	BaseResponse<String> checkCountNew(CheckCountNewQuery query);
 
 	/*BaseResponse<String> check(CheckQuery query);*/
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/IEquipmentService.java

 package cn.wise.sc.cement.business.service;
 
 import cn.wise.sc.cement.business.entity.Equipment;
+import cn.wise.sc.cement.business.entity.EquipmentType;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.*;
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -64,4 +66,24 @@ public interface IEquipmentService extends IService<Equipment> {
 
 	void exportUse(String brand, Integer supplierId, String name, String code, String fileName, HttpServletResponse response);
 
+	//***************************************************、
+
+	BaseResponse<IPage<EquipmentTypeVo>> getTypePage(PageQuery pageQuery);
+
+	BaseResponse<EquipmentType> createType(EquipmentType query);
+
+	BaseResponse<EquipmentType> updateType(EquipmentType query);
+
+	BaseResponse<String> statusType(Integer status, Integer id);
+
+	BaseResponse<String> deleteType(Integer id);
+
+	BaseResponse<List<EquipmentType>> getTypeList();
+
+	BaseResponse<List<EquipmentTypeVo>> getEquipmentList();
+
+	BaseResponse<String> changeType(Integer id, Integer typeId);
+
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/IEquipmentTypeService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.EquipmentType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-01-28
+ */
+public interface IEquipmentTypeService extends IService<EquipmentType> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleDistributionCheckService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionCheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-05
+ */
+public interface ISampleDistributionCheckService extends IService<SampleDistributionCheck> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleDistributionCheckinputService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionCheckinput;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-06
+ */
+public interface ISampleDistributionCheckinputService extends IService<SampleDistributionCheckinput> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleDistributionEnclosureService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEnclosure;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface ISampleDistributionEnclosureService extends IService<SampleDistributionEnclosure> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleDistributionEquipmentService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface ISampleDistributionEquipmentService extends IService<SampleDistributionEquipment> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleDistributionReturnService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionReturn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface ISampleDistributionReturnService extends IService<SampleDistributionReturn> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleHandleReturnService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SampleHandleReturn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-03
+ */
+public interface ISampleHandleReturnService extends IService<SampleHandleReturn> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ITeamService.java

@@ -39,4 +39,5 @@ public interface ITeamService extends IService<Team> {
 
 	BaseResponse<List<String>> getByGroup(Integer id);
 
+	BaseResponse<List<Integer>> getSortByGroup(Integer groupId);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java

@@ -68,6 +68,10 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 	@Value("${weixin.systemUrl}")
 	private String systemUrl;
 
+	@Resource
+	private EquipmentTypeMapper equipmentTypeMapper;
+
+
 	/**
 	 * 设备分页查询
 	 *
@@ -112,11 +116,12 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 			headers[0] = "序号";
 			headers[1] = "设备名称";
 			headers[2] = "设备编号";
-			headers[3] = "设备品牌";
-			headers[4] = "规格/型号";
-			headers[5] = "供应商";
-			headers[6] = "位置";
-			headers[7] = "购买日期";
+			headers[3] = "设备分类";
+			headers[4] = "设备品牌";
+			headers[5] = "规格/型号";
+			headers[6] = "供应商";
+			headers[7] = "位置";
+			headers[8] = "购买日期";
 			List<Object[]> datas = new ArrayList<>(list.size());
 			for (Map<String, Object> m : list) {
 				Object[] objects = new Object[headers.length];
@@ -710,4 +715,201 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 		}
 	}
 
+
+	//*********************************************************************
+
+	/**
+	 * 设备分类分页列表
+	 * @param pageQuery
+	 * @return
+	 */
+	@Override
+	public BaseResponse<IPage<EquipmentTypeVo>> getTypePage(PageQuery pageQuery) {
+		Page<EquipmentTypeVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<EquipmentTypeVo> pages = equipmentTypeMapper.getPage(page);
+		return BaseResponse.okData(pages);
+	}
+
+
+	/**
+	 * 新增设备分类
+	 * @param query
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<EquipmentType> createType(EquipmentType query) {
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("分类名称不能为空!");
+		}
+		QueryWrapper<EquipmentType> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		int count = equipmentTypeMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		query.setCreateTime(LocalDateTime.now());
+		query.setStatus(1);
+		equipmentTypeMapper.insert(query);
+		return BaseResponse.okData(query);
+	}
+
+	/**
+	 * 修改设备分类
+	 * @param query
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<EquipmentType> updateType(EquipmentType query) {
+		if (query.getId() == null) {
+			return BaseResponse.errorMsg("参数错误!");
+		}
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("分类名称不能为空!");
+		}
+		QueryWrapper<EquipmentType> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		qw.ne("id", query.getId());
+		int count = equipmentTypeMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		equipmentTypeMapper.updateById(query);
+		return BaseResponse.okData(query);
+	}
+
+
+	/**
+	 * 禁用启用分类
+	 *
+	 * @param status
+	 * @param id
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<String> statusType(Integer status, Integer id) {
+		if (status == null || id == null) {
+			return BaseResponse.errorMsg("参数错误!");
+		}
+		EquipmentType type = equipmentTypeMapper.selectById(id);
+		if (type == null) {
+			return BaseResponse.errorMsg("数据错误!");
+		}
+		QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
+		equipmentQueryWrapper.eq("type", id);
+		Integer conunts = equipmentMapper.selectCount(equipmentQueryWrapper);
+		if (conunts != 0 && conunts > 0) {
+			return BaseResponse.errorMsg(conunts + "个设备正在使用!");
+		}
+
+		type.setStatus(status);
+		equipmentTypeMapper.updateById(type);
+		String result = "";
+		if (type.getStatus() == 1) {
+			result = "已启用";
+		} else {
+			result = "已禁用";
+		}
+		return BaseResponse.okData(result);
+	}
+
+
+	/**
+	 * 删除分类
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<String> deleteType(Integer id) {
+		if(id == null){
+			return BaseResponse.errorMsg("参数错误!");
+		}
+		EquipmentType type = equipmentTypeMapper.selectById(id);
+		if (type == null) {
+			return BaseResponse.errorMsg("信息错误!");
+		}
+
+		QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
+		equipmentQueryWrapper.eq("type", id);
+		Integer conunts = equipmentMapper.selectCount(equipmentQueryWrapper);
+		if (conunts != 0 && conunts > 0) {
+			return BaseResponse.errorMsg(conunts + "个设备正在使用!");
+		}
+		equipmentTypeMapper.deleteById(id);
+		return BaseResponse.okData("删除成功");
+	}
+
+	/**
+	 * 分类列表
+	 * @return
+	 */
+	@Override
+	public BaseResponse<List<EquipmentType>> getTypeList() {
+		QueryWrapper<EquipmentType> qw = new QueryWrapper<>();
+		qw.eq("status", 1);
+		List<EquipmentType> list = equipmentTypeMapper.selectList(qw);
+		return BaseResponse.okData(list);
+	}
+
+	/**
+	 * 分类选择设备列表
+	 * @return
+	 */
+	@Override
+	public BaseResponse<List<EquipmentTypeVo>> getEquipmentList() {
+		List<EquipmentTypeVo> listType = equipmentTypeMapper.getEqTypeList();
+		List<EquipmentVo> listEQ = equipmentMapper.getEQList();
+		if(listType != null && listType.size()>0){
+			for(EquipmentTypeVo listTypevo : listType){
+				List<EquipmentVo> listVo = new ArrayList<>();
+				for(EquipmentVo equipmentVo : listEQ){
+					if(equipmentVo.getType() == listTypevo.getId() ){
+						listVo.add(equipmentVo);
+					}
+				}
+				listTypevo.setEquipmentList(listVo);
+			}
+		}
+		return BaseResponse.okData(listType);
+	}
+
+	/**
+	 * 转移分类
+	 *
+	 * @param id
+	 * @param typeId
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<String> changeType(Integer id, Integer typeId) {
+		if (typeId == null || id == null) {
+			return BaseResponse.errorMsg("参数错误!");
+		}
+		EquipmentType type = equipmentTypeMapper.selectById(id);
+		EquipmentType typeNew = equipmentTypeMapper.selectById(typeId);
+		if (type == null || typeNew == null) {
+			return BaseResponse.errorMsg("数据错误!");
+		}
+		QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
+		equipmentQueryWrapper.eq("type", id);
+		List<Equipment> equipmentList = equipmentMapper.selectList(equipmentQueryWrapper);
+		if(equipmentList != null && equipmentList.size()>0){
+			for(Equipment equipment : equipmentList){
+				equipment.setType(typeId);
+			}
+			this.updateBatchById(equipmentList);
+		}
+		return BaseResponse.okData("转移成功");
+	}
+
+
+
+
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentTypeServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.EquipmentType;
+import cn.wise.sc.cement.business.mapper.EquipmentTypeMapper;
+import cn.wise.sc.cement.business.service.IEquipmentTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-01-28
+ */
+@Service
+public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, EquipmentType> implements IEquipmentTypeService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleDistributionCheckServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionCheck;
+import cn.wise.sc.cement.business.mapper.SampleDistributionCheckMapper;
+import cn.wise.sc.cement.business.service.ISampleDistributionCheckService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-05
+ */
+@Service
+public class SampleDistributionCheckServiceImpl extends ServiceImpl<SampleDistributionCheckMapper, SampleDistributionCheck> implements ISampleDistributionCheckService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleDistributionCheckinputServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionCheckinput;
+import cn.wise.sc.cement.business.mapper.SampleDistributionCheckinputMapper;
+import cn.wise.sc.cement.business.service.ISampleDistributionCheckinputService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-06
+ */
+@Service
+public class SampleDistributionCheckinputServiceImpl extends ServiceImpl<SampleDistributionCheckinputMapper, SampleDistributionCheckinput> implements ISampleDistributionCheckinputService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleDistributionEnclosureServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEnclosure;
+import cn.wise.sc.cement.business.mapper.SampleDistributionEnclosureMapper;
+import cn.wise.sc.cement.business.service.ISampleDistributionEnclosureService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Service
+public class SampleDistributionEnclosureServiceImpl extends ServiceImpl<SampleDistributionEnclosureMapper, SampleDistributionEnclosure> implements ISampleDistributionEnclosureService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleDistributionEquipmentServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
+import cn.wise.sc.cement.business.mapper.SampleDistributionEquipmentMapper;
+import cn.wise.sc.cement.business.service.ISampleDistributionEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Service
+public class SampleDistributionEquipmentServiceImpl extends ServiceImpl<SampleDistributionEquipmentMapper, SampleDistributionEquipment> implements ISampleDistributionEquipmentService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleDistributionReturnServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionReturn;
+import cn.wise.sc.cement.business.mapper.SampleDistributionReturnMapper;
+import cn.wise.sc.cement.business.service.ISampleDistributionReturnService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Service
+public class SampleDistributionReturnServiceImpl extends ServiceImpl<SampleDistributionReturnMapper, SampleDistributionReturn> implements ISampleDistributionReturnService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleHandleReturnServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SampleHandleReturn;
+import cn.wise.sc.cement.business.mapper.SampleHandleReturnMapper;
+import cn.wise.sc.cement.business.service.ISampleHandleReturnService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-03
+ */
+@Service
+public class SampleHandleReturnServiceImpl extends ServiceImpl<SampleHandleReturnMapper, SampleHandleReturn> implements ISampleHandleReturnService {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysApprovalServiceImpl.java

@@ -55,7 +55,10 @@ public class SysApprovalServiceImpl extends ServiceImpl<SysApprovalMapper, SysAp
 	@Override
 	public BaseResponse<SysApproval> create(SysApproval query) {
 		if (StringUtils.isEmpty(query.getName())) {
-			return BaseResponse.errorMsg("工作组名称不能为空!");
+			return BaseResponse.errorMsg("审批流程名称不能为空!");
+		}
+		if (query.getUserId() == null) {
+			return BaseResponse.errorMsg("请选择审批人!");
 		}
 		/*QueryWrapper<SysApproval> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
@@ -79,7 +82,10 @@ public class SysApprovalServiceImpl extends ServiceImpl<SysApprovalMapper, SysAp
 	public BaseResponse<SysApproval> update(SysApproval query) {
 
 		if (StringUtils.isEmpty(query.getName())) {
-			return BaseResponse.errorMsg("工作组名称不能为空!");
+			return BaseResponse.errorMsg("审批流程名称不能为空!");
+		}
+		if (query.getUserId() == null) {
+			return BaseResponse.errorMsg("请选择审批人!");
 		}
 		/*QueryWrapper<SysApproval> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java

 package cn.wise.sc.cement.business.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import cn.wise.sc.cement.business.entity.Handle;
 import cn.wise.sc.cement.business.entity.Method;
 import cn.wise.sc.cement.business.entity.Team;
 import cn.wise.sc.cement.business.entity.TeamGroup;
 import cn.wise.sc.cement.business.exception.BusinessExceptionEnum;
+import cn.wise.sc.cement.business.mapper.HandleMapper;
 import cn.wise.sc.cement.business.mapper.MethodMapper;
 import cn.wise.sc.cement.business.mapper.TeamMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
@@ -22,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.models.auth.In;
+import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -52,6 +55,8 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 	private TeamMapper teamMapper;
 	@Resource
 	private MethodMapper methodMapper;
+	@Resource
+	private HandleMapper handleMapper;
 
 	/**
 	 * 分页查询
@@ -75,6 +80,51 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		return BaseResponse.okData(pages);
 	}
 
+	/**
+	 * 检测依据id转为检测依据名称和检测依据编号
+	 * @return
+	 */
+	private Map<String, String> methodId2Name(String methodId){
+		Map<String, String> map = new HashMap<>();
+		String[] methodIds = methodId.split("、");
+		if(methodIds != null){
+			String methodNames = "";
+			String number = "";
+			for(String methodid:methodIds){
+				Method method = methodMapper.selectById(Integer.valueOf(methodid));
+				if(method != null){
+					methodNames = methodNames.equals("")?method.getName():methodNames+"、"+method.getName();
+					number = number.equals("")?method.getNumber():number+"、"+method.getNumber();
+				}
+			}
+			map.put("methodNames", methodNames);
+			map.put("number", number);
+			return map;
+		}
+		return null;
+	}
+
+	/**
+	 * 处理项id转为处理项名称
+	 * @return
+	 */
+	private Map<String, String> handleId2Name(String handleId){
+		Map<String, String> map = new HashMap<>();
+		String[] handleIds = handleId.split("、");
+		if(handleIds != null){
+			String handleNames = "";
+			for(String handleid:handleIds){
+				Handle handle = handleMapper.selectById(Integer.valueOf(handleid));
+				if(handle != null){
+					handleNames = handleNames.equals("")?handle.getName():handleNames+"、"+handle.getName();
+				}
+			}
+			map.put("handleNames", handleNames);
+			return map;
+		}
+		return null;
+	}
+
 	/**
 	 * 新增检测项
 	 *
@@ -100,10 +150,15 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		if (query.getIsDisplay() != 1 && query.getIsDisplay() != 0) {
 			return BaseResponse.errorMsg("委托是否可见参数错误");
 		}
-		if (query.getHandleId() == null) {
+		if (query.getHandleId() == null || query.getHandleId().equals("") ) {
 			return BaseResponse.errorMsg("请选择处理项");
 		}
-
+		if (query.getIsParallel() == null) {
+			return BaseResponse.errorMsg("请选择是否需要平行");
+		}
+		if (query.getIsParallel() != 1 && query.getIsParallel() != 0) {
+			return BaseResponse.errorMsg("是否需要平行参数错误");
+		}
 		QueryWrapper<Team> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		int count = teamMapper.selectCount(qw);
@@ -111,40 +166,24 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 			return BaseResponse.errorMsg(query.getName() + "已存在");
 		}
 		BeanUtils.copyProperties(query, create);
-		//检测依据id转成检测依据名称
-		Map<String, String> map = methodId2Name(create.getMethodId());
+		//检测依据id转为检测依据名称和检测依据编号
+		Map<String, String> mapMethod = methodId2Name(create.getMethodId());
+
+		//处理项id转成处理项名称
+		Map<String, String> mapHandle = handleId2Name(create.getHandleId());
+		QueryWrapper<Team> teamQueryWrapper = new QueryWrapper<>();
+		teamQueryWrapper.eq("group_id", query.getGroupId());
+		Integer numsForGroup = teamMapper.selectCount(teamQueryWrapper);
 		//no_check 标识校核计算的时候不显示计算的结果，因为没有公式
-		create.setMethodName(map.get("methodNames"))
-				.setNumber(map.get("number"))
+		create.setMethodName(mapMethod.get("methodNames"))
+				.setNumber(mapMethod.get("number"))
+				.setHandleName(mapHandle.get("handleNames"))
+				.setSortNo(numsForGroup+1)
 				.setStatus(1).setCreateTime(LocalDateTime.now()).setRemark("no_check");
 		teamMapper.insert(create);
 		return BaseResponse.okData(create);
 	}
 
-	/**
-	 * 检测依据编号转为检测依据名称
-	 * @return
-	 */
-	private Map<String, String> methodId2Name(String methodId){
-		Map<String, String> map = new HashMap<>();
-		String[] methodIds = methodId.split("、");
-		if(methodIds != null){
-			String methodNames = "";
-			String number = "";
-			for(String methodid:methodIds){
-				Method method = methodMapper.selectById(Integer.valueOf(methodid));
-				if(method != null){
-					methodNames = methodNames.equals("")?method.getName():methodNames+"、"+method.getName();
-					number = number.equals("")?method.getNumber():number+"、"+method.getNumber();
-				}
-			}
-			map.put("methodNames", methodNames);
-			map.put("number", number);
-			return map;
-		}
-		return null;
-	}
-
 
 
 	/**
@@ -169,9 +208,21 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		if (query.getMethodId() == null || query.getMethodId().equals("")) {
 			return BaseResponse.errorMsg("请选择检依据");
 		}
-		if (query.getHandleId() == null) {
+		if (query.getIsDisplay() == null) {
+			return BaseResponse.errorMsg("请选择委托是否可见");
+		}
+		if (query.getIsDisplay() != 1 && query.getIsDisplay() != 0) {
+			return BaseResponse.errorMsg("委托是否可见参数错误");
+		}
+		if (query.getHandleId() == null || query.getHandleId().equals("") ) {
 			return BaseResponse.errorMsg("请选择处理项");
 		}
+		if (query.getIsParallel() == null) {
+			return BaseResponse.errorMsg("请选择是否需要平行");
+		}
+		if (query.getIsParallel() != 1 && query.getIsParallel() != 0) {
+			return BaseResponse.errorMsg("是否需要平行参数错误");
+		}
 		QueryWrapper<Team> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		qw.ne("id", query.getId());
@@ -179,17 +230,40 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		if (count > 0) {
 			return BaseResponse.errorMsg(query.getName() + "已存在");
 		}
-		//检测依据id转成检测依据名称
-		Map<String, String> map = methodId2Name(query.getMethodId());
+		//检测依据id转为检测依据名称和检测依据编号
+		Map<String, String> mapMethod = methodId2Name(query.getMethodId());
+
+		//处理项id转成处理项名称
+		Map<String, String> mapHandle = handleId2Name(query.getHandleId());
+		if(query.getSortNo() != update.getSortNo()){
+			QueryWrapper<Team> teamQueryWrapper = new QueryWrapper<>();
+			teamQueryWrapper.eq("group_id", query.getGroupId());
+			Integer numsForGroup = teamMapper.selectCount(teamQueryWrapper);
+			if(update.getSortNo()>numsForGroup || update.getSortNo()<1){
+				return BaseResponse.errorMsg("编辑的本组序号有误或超过最大值");
+			}
+			//编辑时，下拉框展示，如果将1改为4，则原来的4 变为  邹继远 20210128
+			QueryWrapper<Team> teamQueryWrapperOld = new QueryWrapper<>();
+			teamQueryWrapperOld.eq("group_id", query.getGroupId());
+			teamQueryWrapperOld.eq("sort_no", query.getSortNo());
+			Team teamOld = teamMapper.selectOne(teamQueryWrapperOld);
+			if(teamOld != null){
+				teamOld.setSortNo(update.getSortNo());
+				teamMapper.updateById(teamOld);
+			}
+			update.setSortNo(query.getSortNo());
+		}
 		update.setGroupId(query.getGroupId())
 				.setMethodId(query.getMethodId())
-				.setMethodName(map.get("methodNames"))
-				.setNumber(map.get("number"))
+				.setMethodName(mapMethod.get("methodNames"))
+				.setNumber(mapMethod.get("number"))
+				.setHandleName(mapHandle.get("handleNames"))
 				.setCharge(query.getCharge())
 				.setName(query.getName())
 				.setIsDisplay(query.getIsDisplay())
 				.setQualifications(query.getQualifications())
-				.setHandleId(query.getHandleId());
+				.setHandleId(query.getHandleId())
+				.setIsParallel(query.getIsParallel());
 		teamMapper.updateById(update);
 		return BaseResponse.okData(update);
 	}
@@ -294,4 +368,28 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		return BaseResponse.okData(map);
 	}
 
+
+	public BaseResponse<List<Integer>> getSortByGroup(Integer groupId) {
+		List<Integer> listResult = new ArrayList<>();
+		QueryWrapper<Team> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("group_id", groupId);
+		queryWrapper.orderByAsc("sort_no");
+		List<Team> list = teamMapper.selectList(queryWrapper);
+		for(Team team: list){
+			listResult.add(team.getSortNo());
+		}
+		return BaseResponse.okData(listResult);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
 }

cement-business/src/main/resources/fastdfs-client.properties

@@ -4,7 +4,7 @@ fastdfs.charset=UTF-8
 fastdfs.http.tracker_http_port=8888
 fastdfs.http.anti_steal_token=no
 fastdfs.http.secret_key=FastDFS1234567890
-fastdfs.tracker_servers=192.168.110.85:22122
+fastdfs.tracker_servers=localhost:22122
 #fastdfs.tracker_servers=192.168.110.85:22122
 
 

mybatis-generator/src/main/java/cn/wise/sc/cement/mg/GeneratorApplication.java

@@ -47,7 +47,7 @@ public class GeneratorApplication {
 		AutoGenerator mpg = new AutoGenerator();
 		// 数据源配置
 		DataSourceConfig dsc = new DataSourceConfig();
-		dsc.setUrl("jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?useUnicode=true&useSSL=false&characterEncoding=utf8");
+		dsc.setUrl("jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?useUnicode=true&useSSL=false&characterEncoding=utf8");
 		dsc.setDriverName("com.mysql.jdbc.Driver");
 		dsc.setUsername("root");
 		dsc.setPassword("admin!@#123");