流程完成

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

@@ -258,7 +258,7 @@ public class EntrustController {
 	}
 
 
-	@ApiOperation(value = "样品处理退回任务分页（）")
+	@ApiOperation(value = "样品处理退回任务分页（评审人员查看）")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "userId", value = "接受人id", paramType = "query", dataType = "Integer"),
@@ -273,18 +273,18 @@ public class EntrustController {
 		try {
 			return entrustService.getSampleReturnHandlePage(pageQuery, entrustCode, userId, clientName, projectName, projectCode, isUrgent);
 		} catch (Exception e) {
-			log.debug("样品处理退回任务分页{}", e);
+			log.debug("样品处理退回任务分页（评审人员查看）{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "重新派发样品处理任务")
+	@ApiOperation(value = "重新派发样品处理任务（评审人员操作）")
 	@PostMapping("/handleAgain")
 	public BaseResponse handleAgain(@RequestBody HandleAgainQuery query) {
 		try {
 			return entrustService.handleAgain(query);
 		} catch (Exception e) {
-			log.debug("重新派发样品处理任务{}", e);
+			log.debug("重新派发样品处理任务（评审人员操作）{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
@@ -345,13 +345,13 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "检测通知单详情")
+	@ApiOperation(value = "检测通知单详情（派发的+校核退回）")
 	@GetMapping("/getSampleDistributionList/{id}")
 	public BaseResponse getSampleDistributionList(@PathVariable Integer id) {
 		try {
 			return entrustService.getSampleDistributionList(id);
 		} catch (Exception e) {
-			log.debug("检测通知单详情{}", e);
+			log.debug("检测通知单详情（派发的和校核退回）{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
@@ -389,8 +389,6 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-
-
 	@ApiOperation(value = "详情-检测任务信息")
 	@GetMapping("/getSampleCheckDtail/{id}")
 	public BaseResponse getSampleCheckDtail(@PathVariable Integer id) {
@@ -468,16 +466,17 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-
-
-
+	//*******************样品校核 ****************************************
 
 	@ApiOperation(value = "数据校核分页")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "status",
-					value = "状态(6样品检测完成，7校核中，8校核完成)", paramType = "query", dataType = "Integer"),
+					value = "状态(0未评审，1已通过，2未通过，" +
+							"3样品处理中，4样品处理完成，" +
+							"5样品检测中，6样品检测完成，" +
+							"7校核中，8校核完成)", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "projectCode", value = "项目编号", paramType = "query", dataType = "String")
@@ -504,7 +503,6 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-
 	@ApiOperation(value = "校核计算 立马返回数据")
 	@PostMapping("/checkCountFast")
 	public BaseResponse checkCountFast(@RequestBody CheckCountFastQuery query) {
@@ -539,8 +537,36 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "数据校核退回任务分页（处理人+检测人员查看）")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "status",
+					value = "状态(0未评审，1已通过，2未通过，" +
+							"3样品处理中，4样品处理完成，" +
+							"5样品检测中，6样品检测完成，" +
+							"7校核中，8校核完成)", 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"),
+			@ApiImplicitParam(name = "distributionStatus", value = "样品检测表状态（0未接受，1接受，2待校核，" +
+					"3退回，4校核通过，5校核退回）", paramType = "query", dataType = "Integer")
+	})
+	@GetMapping("/getSampleReturnCheckPage")
+	public BaseResponse getSampleReturnCheckPage(PageQuery pageQuery, String entrustCode, Integer status,
+	                                              String clientName, String projectName, String projectCode, Integer isUrgent,
+	                                              Integer distributionStatus ) {
+		try {
+			return entrustService.getSampleReturnCheckPage(pageQuery, entrustCode, status,
+					clientName, projectName, projectCode, isUrgent, distributionStatus);
+		} catch (Exception e) {
+			log.debug("数据校核退回任务分页（处理人+检测人员查看）{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
 
-	//附件功能**************************************************
+	//*********************附件功能**************************************************
 	@ApiOperation(value = "样品处理附件列表")
 	@GetMapping("/getSampleHandleEnclosureList")
 	public BaseResponse getSampleHandleEnclosureList(Integer sampleHandleId) {
@@ -620,26 +646,7 @@ public class EntrustController {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+	//*********************导出**************************************************
 
 	@PostMapping("/export/{entrustId}")
 	@ApiOperation("导出委托单")

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

@@ -25,7 +25,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/tcdri/weixin")
 public class WeiXinController {
-
+//
     private static final Logger log = LoggerFactory.getLogger("WeiXinController");
 
     @Autowired

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

@@ -48,4 +48,6 @@ public interface EntrustMapper extends BaseMapper<Entrust> {
 	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);
+
+	IPage<EntrustVo> getSampleReturnCheckPage(@Param("page") Page page, @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 cn.wise.sc.cement.business.model.vo.SampleDistributionEquipmentVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SampleDistributionEquipmentMapper extends BaseMapper<SampleDistributionEquipment> {
 
+
+	List<SampleDistributionEquipmentVo> getEqupmentList(@Param("distributionId") Integer distributionId,
+	                                                    @Param("userId") Integer userId);
+
+
+
+
+
+
+
 }

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

@@ -42,7 +42,8 @@
     </sql>
 
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
-        select e.*, c.name as clientName, su.name as userName,
+        select e.*, p.name as projectName,p.code as projectCode,
+        c.name as clientName, su.name as userName,
         (
         CASE e.status
         WHEN 0 THEN '未评审'
@@ -79,8 +80,8 @@
         ELSE NULL
         END
         ) as 是否加急,
-        IF(ISNULL(e.project_name),'',e.project_name) as 项目名称,
-        IF(ISNULL(e.project_code),'',e.project_code)  as 项目编号,
+        IF(ISNULL(p.name),'',p.name) as 项目名称,
+        IF(ISNULL(p.name),'',p.name)  as 项目编号,
         IF(ISNULL(su.name),'',su.name) as 委托人,
         IF(ISNULL(c.name),'',c.name) as 委托单位,
         IF(ISNULL(e.entrust_date),'',e.entrust_date)  as 委托日期,
@@ -127,7 +128,8 @@
         ELSE ''
         END
         ) as statusValue,
-        p.name as projectName, c.name as clientName, su.name as userName,
+        p.name as projectName,p.code as projectCode,
+         c.name as clientName, su.name as userName,
         su.phone as userPhone, su.fax as userFax
         from entrust e
         left join project p on p.id = e.project_id
@@ -257,7 +259,7 @@
 
     <!--数据校核分页列表-->
     <select id="getCheckPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
-        select e.*, p.name as projectName, c.name as clientName, su.name as userName,
+        select e.*, p.name as projectName,p.code as projectCode, c.name as clientName, su.name as userName,
         (
         CASE e.status
         WHEN 0 THEN '未评审'
@@ -435,4 +437,62 @@
     </select>
 
 
+    <select id="getSampleReturnCheckPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
+        select e.id as id, e.entrust_code as entrustCode, e.sample_num as sampleNum,e.entrust_date as entrustDate,
+        e.status,
+        (
+        CASE e.status
+        WHEN 0 THEN '未评审'
+        WHEN 1 THEN '已通过'
+        WHEN 2 THEN '未通过'
+        WHEN 3 THEN '样品处理中'
+        WHEN 4 THEN '样品处理完成'
+        WHEN 5 THEN '样品检测中'
+        WHEN 6 THEN '样品检测完成'
+        WHEN 7 THEN '校核中'
+        WHEN 8 THEN '校核完成'
+        WHEN 9 THEN '修改待确认'
+        ELSE ''
+        END
+        ) as statusValue,
+        p.id as projectId, p.name as projectName, p.code as projectCode,
+        su.name as userName, e.is_urgent as isUrgent, c.name as clientName
+        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 = 5
+        <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.status != null">
+            and e.status = #{params.status}
+        </if>
+        <if test="params.distributionStatus != null">
+            and t.status = #{params.distributionStatus}
+        </if>
+
+        <if test="params.isUrgent != null">
+            and e.is_urgent = #{params.isUrgent}
+        </if>
+        GROUP BY e.id
+        order by e.update_time desc
+    </select>
 </mapper>

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

@@ -2,4 +2,11 @@
 <!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">
 
+    <select id="getEqupmentList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionEquipmentVo">
+        select t.*, e.code as code
+        from sample_distribution_equipment t
+        left join equipment e on e.id = t.equipment_id
+        where t.distribution_id = #{distributionId}
+        and t.user_id = #{userId}
+    </select>
 </mapper>

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

@@ -44,7 +44,7 @@ public class CheckTeamResultVo {
 	private String number;
 
 	@ApiModelProperty("检测设备列表")
-	List<SampleDistributionEquipment> sampleDistributionEquipmentList;
+	List<SampleDistributionEquipmentVo> sampleDistributionEquipmentList;
 
 	@ApiModelProperty("检测结果")
 	private String distributionResult;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionEquipmentVo.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.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-02-18 14:58
+ **/
+@Data
+@ApiModel("委托-检测设备列表Vo")
+public class SampleDistributionEquipmentVo {
+
+	private Integer id;
+
+	/**
+	 * 样品表d
+	 */
+	private Integer distributionId;
+
+	/**
+	 * 检测组id
+	 */
+	private Integer equipmentId;
+
+	/**
+	 * 检测设备名称
+	 */
+	private String equipmentName;
+
+	/**
+	 * 处理人id
+	 */
+	private Integer userId;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+	@ApiModelProperty("设备编号")
+	private String code;
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionTeamVo.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
@@ -34,5 +37,7 @@ public class SampleDistributionTeamVo {
 	@ApiModelProperty(" 状态值（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
 	private String statusValue;
 
+	@ApiModelProperty("检测设备列表")
+	List<SampleDistributionEquipmentVo> sampleDistributionEquipmentList;
 
 }

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

@@ -98,6 +98,10 @@ public interface IEntrustService extends IService<Entrust> {
 
 	BaseResponse<String> checkCountNew(CheckCountNewQuery query);
 
+	BaseResponse<IPage<EntrustVo>> getSampleReturnCheckPage(PageQuery pageQuery, String entrustCode, Integer status,
+	                                                         String clientName, String projectName, String projectCode,
+	                                                         Integer isUrgent, Integer distributionStatus);
+
 
 	//附件的操作
 	BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleEnclosureList(Integer sampleHandleId);

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

@@ -239,8 +239,11 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 			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("编辑的本组序号有误或超过最大值");
+			if(update.getSortNo() != null ){
+				if(update.getSortNo()>numsForGroup || update.getSortNo()<1){
+					return BaseResponse.errorMsg("编辑的本组序号有误或超过最大值");
+				}
+
 			}
 			//编辑时，下拉框展示，如果将1改为4，则原来的4 变为  邹继远 20210128
 			QueryWrapper<Team> teamQueryWrapperOld = new QueryWrapper<>();
@@ -251,6 +254,8 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 				teamOld.setSortNo(update.getSortNo());
 				teamMapper.updateById(teamOld);
 			}
+
+
 			update.setSortNo(query.getSortNo());
 		}
 		update.setGroupId(query.getGroupId())
@@ -376,7 +381,9 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		queryWrapper.orderByAsc("sort_no");
 		List<Team> list = teamMapper.selectList(queryWrapper);
 		for(Team team: list){
-			listResult.add(team.getSortNo());
+			if(team.getSortNo() != null){
+				listResult.add(team.getSortNo());
+			}
 		}
 		return BaseResponse.okData(listResult);
 	}