校核 检测详情 平行样样品梳理

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

@@ -29,7 +29,6 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
 	IPage<SampleDistributionVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
 
 	List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId")  Integer sampleId,
-	                                                       @Param("sampleId2")  Integer sampleId2,
 	                                                       @Param("userId")  Integer userId);
 
 	List<SampleCheckGroupVo> getSampleCheckGroupList(@Param("sampleId")  Integer sampleId);

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

@@ -54,7 +54,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} or t.sample_id = #{sampleId2})
+        where t.sample_id = #{sampleId}
         <if test="userId != null">
             and t.user_id = #{userId}
         </if>

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

@@ -178,7 +178,7 @@ public class CheckCountUtil {
 			BigDecimal m = getBigDecimal(resultMap.get("样重m"));
 			//计算的核心公式结果
 			BigDecimal countResult =  m2.subtract(m1).subtract(m3).divide(m,4).multiply(new BigDecimal(0.343));
-			endResult = countResult.multiply(param100);
+			endResult = countResult.multiply(param100).setScale(4,BigDecimal.ROUND_HALF_UP);
 		}else if(name.equals("K2O")){
 			BigDecimal CK2O  = getBigDecimal(resultMap.get("CK2O"));
 			BigDecimal V  = getBigDecimal(resultMap.get("V"));