平行样 必须全部校核完才可以显示 检测结果222

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

@@ -123,7 +123,7 @@
         left join sys_user su on su.id = t.user_id
         left join team s on s.id = t.team_id
         left join team_group tg on tg.id = t.team_group_id
-        where t.sample_id = #{sampleId}
+        where t.sample_id = #{sampleId} and t.status = 4
         <if test="userId != null">
             and t.user_id = #{userId}
         </if>

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

@@ -1282,7 +1282,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 						SampleDistribution sampleDistribution = distributionMapper.selectById(sampleDistributionTeamVo.getDistributionId());
 						//该检测项的误差结果值和最终结果值
 
-						//获取其他平行样的结果值  如果是平行样 必须都校核通过才可以显示结果。
+						//获取其他平行样的结果值  如果是平行样 必须都校核通过才可以显示结果。有一个点击保存 也不能显示结果
 						int noCheckOver = 0;
 						List<Sample> otherSampleList = sampleMapper.getOtherSampleList(entrust.getId(), sample.getCementCode(), sample.getId());
 						if (otherSampleList != null && otherSampleList.size() > 0) {
@@ -1298,7 +1298,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 								}
 								if (ortherDdistributionList != null && ortherDdistributionList.size() > 0) {
 									SampleDistribution other = ortherDdistributionList.get(0);
-									if(other.getCheckId() == null){
+									if(other.getCheckId() == null || other.getStatus() != 4){
 										noCheckOver = noCheckOver + 1;
 									}
 								}