修改时增加平行样编号

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

@@ -283,7 +283,6 @@ public class EntrustController {
 	//*******************样品检测*****************************************
 
 
-
 	@ApiOperation(value = "派发样品检测-委托详情")
 	@GetMapping("/getPFDtail/{id}")
 	public BaseResponse getPFDtail(@PathVariable Integer id) {

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

@@ -111,7 +111,7 @@
         t.team_id as teamId
         from sample_distribution t
         left join sys_user su on su.id = t.user_id
-        where t.sample_id = #{sampleId}
+        where t.sample_id = #{sampleId} and t.status = 2
         <if test="userId != null">
             and t.user_id = #{userId}
         </if>

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

@@ -642,10 +642,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 						.setCharge(charge)
 						.setCreateTime(LocalDateTime.now());
 				sampleTmpList.add(sampleTmp);
+				sampleTmpService.save(sampleTmp);
+				sampleQuery.setId(sampleTmp.getId());
+
 			}
-			sampleTmpService.saveBatch(sampleTmpList);
 
-			if (entrust.getUserId() != loginUser.getId() && approvalIdList.contains(loginUser.getId())) {
+			if (approvalIdList.contains(loginUser.getId())) {
 				//当前平行样编号最大值
 				String redisMaxCementCode = getMaxCementCode().getData();
 				//保存样品信息