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

cement-business/pom.xml

@@ -204,9 +204,9 @@
             <properties>
                 <env>dev</env><!-- 节点名字environment是自己随意取的 -->
             </properties>
-           <!-- <activation>
-                <activeByDefault>true</activeByDefault>&lt;!&ndash; 默认激活该profile节点&ndash;&gt;
-            </activation>-->
+            <activation>
+                <activeByDefault>true</activeByDefault><!-- 默认激活该profile节点-->
+            </activation>
         </profile>
         <profile>
             <!-- 生产环境 -->
@@ -224,9 +224,9 @@
             <properties>
                 <env>show</env>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault><!-- 默认激活该profile节点-->
-            </activation>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>&lt;!&ndash; 默认激活该profile节点&ndash;&gt;
+            </activation>-->
         </profile>
 
 

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

@@ -364,6 +364,9 @@ public class CommonServiceImpl {
 				countMap.put(name, CheckCountUtil.countSxzs(resultMap));
 			}
 
+			//拼接的值的保留位数数据库 retain字段必须为null
+			// 焦渣   塑性指数   辊磨  可磨 易磨性 工业分析  易烧性
+
 
 			/*else if(name.equals("St,ad")){
 				countMap.put(name, CheckCountUtil.checkCount(name, resultMap));

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

@@ -1281,11 +1281,35 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 					for (SampleDistributionTeamVo sampleDistributionTeamVo : sampleDistributionTeamVoList) {
 						SampleDistribution sampleDistribution = distributionMapper.selectById(sampleDistributionTeamVo.getDistributionId());
 						//该检测项的误差结果值和最终结果值
-						if (sampleDistribution.getCheckId() != null) {
+
+						//获取其他平行样的结果值  如果是平行样 必须都校核通过才可以显示结果。
+						int noCheckOver = 0;
+						List<Sample> otherSampleList = sampleMapper.getOtherSampleList(entrust.getId(), sample.getCementCode(), sample.getId());
+						if (otherSampleList != null && otherSampleList.size() > 0) {
+							for (Sample s : otherSampleList) {
+								QueryWrapper<SampleDistribution> ortherWrapper = new QueryWrapper<>();
+								ortherWrapper.eq("entrust_id", entrust.getId());
+								ortherWrapper.eq("sample_id", s.getId());
+								ortherWrapper.eq("team_group_id", sampleDistribution.getTeamGroupId());
+								ortherWrapper.eq("team_id", sampleDistribution.getTeamId());
+								List<SampleDistribution> ortherDdistributionList = distributionMapper.selectList(ortherWrapper);
+								if (ortherDdistributionList.size() > 1) {
+									return BaseResponse.errorMsg("检测派发表检测项信息重复");
+								}
+								if (ortherDdistributionList != null && ortherDdistributionList.size() > 0) {
+									SampleDistribution other = ortherDdistributionList.get(0);
+									if(other.getCheckId() == null){
+										noCheckOver = noCheckOver + 1;
+									}
+								}
+							}
+						}
+
+						if (sampleDistribution.getCheckId() != null && noCheckOver == 0) {
 							SampleDistributionCheck disCheck = sampleDistributionCheckMapper.selectById(sampleDistribution.getCheckId());
 							sampleDistributionTeamVo.setLastResult(disCheck.getLastResult());
 						} else {
-							sampleDistributionTeamVo.setLastResult(sampleDistribution.getDistributionResult());
+							sampleDistributionTeamVo.setLastResult(null);
 						}
 
 						TeamGroup teamGroup = teamGroupMapper.selectById(sampleDistribution.getTeamGroupId());

cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java

@@ -431,7 +431,7 @@ public class CheckCountUtil {
 			ZYL  = resultMap.get("制样率").trim();
 		}
 
-		count = "HGI="+HGI+" \n 制样率="+ZYL;
+		count = "HGI="+HGI+" \n 制样率="+ZYL+"%";
 		return  count;
 	}