非平行样 可以多个人检测

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

@@ -39,7 +39,7 @@ public class SampleQuery {
 	@ApiModelProperty("(检测依据编号)  例子：01、23、15")
 	private String methodNumbers;
 
-	@ApiModelProperty(" 是否平行样（1是，0否）")
+	@ApiModelProperty(" 是否平行样（0否，是（2-4，代表要分成几个样品检测），）")
 	private Integer isParallel;
 
 	@ApiModelProperty("本所编号")

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

@@ -123,4 +123,7 @@ public class EntrustVo {
 	@ApiModelProperty("任务接受时间")
 	private LocalDateTime acceptTime;
 
+	@ApiModelProperty("评审意见")
+	private String opinion;
+
 }

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

@@ -345,8 +345,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                         sampleVo.setSampleDistributionTeamVoList(sampleNoDistributionTeamVoList);
                     }
                     sampleVoList.add(sampleVo);
-                    //样品处理列表只展示
-                    if (sample.getIsParallel() == 1) {
+                    //样品处理列表只展示主样信息
+                    if (sample.getIsParallel() != 0) {
                         if (sample.getCementCode().equals(sample.getParallelCode())) {
                             sampleHandleVoList.add(sampleVo);
                         }
@@ -357,6 +357,13 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             }
             entrustVo.setSampleList(sampleVoList);//样品列表（展示平行样样品）
             entrustVo.setSampleHandleList(sampleHandleVoList);//处理样品列表（不展示平行样样品）
+            //委托评审意见
+            QueryWrapper<EntrustApproval> approvalWrapper = new QueryWrapper<>();
+            approvalWrapper.eq("entrust_id", entrustVo.getId());
+            approvalWrapper.orderByDesc("id");
+            List<EntrustApproval> approvalList = approvalMapper.selectList(approvalWrapper);
+            EntrustApproval approval = approvalList.get(0);
+            entrustVo.setOpinion(approval.getOpinion());
         } else {
             QueryWrapper<SampleTmp> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("entrust_id", entrustVo.getId());
@@ -384,6 +391,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             }
             entrustVo.setSampleTmpList(sampleTmpVoList);
         }
+
         LoginUser loginUser = userService.getLoginUser();
         if (loginUser == null) {
             return BaseResponse.errorMsg("请登录账号");
@@ -1657,6 +1665,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                                     distributionMapper.getDistributionTeamList(sample.getId(), null);
                         }
                     }
+
+
+
+
                     sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList);
                 } else {
                     sampleVo.setSampleDistributionTeamVoList(null);