抽样算法优化0806

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java

@@ -247,7 +247,7 @@ public class QcProCheckServiceImpl implements QcProCheckService {
                 }
                 if (StringUtils.isNotBlank(qcd.getSamplingPlan())){
                     //抽样算法
-                    if (!StringUtils.isNotEmpty(qcd.getSampleQuality())){
+                    if (StringUtils.isEmpty(qcd.getSampleQuality()) || "0".equals(qcd.getSampleQuality())){
                         String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan());
                         int sampleSize = GB2828Sampler.getSampleSize(letter);
                         qcd.setSampleQuality(String.valueOf(sampleSize));

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -157,7 +157,8 @@
 		       td.defect_quality defectQuality,
 		       td.sample_code sampleCode,
 		       qct.quality quality,
-               qctp.sample_num sampleQuality,
+		       td.sample_quality sampleQuality,
+--                qctp.sample_num sampleQuality,
                td.sample_aql sampleAql,
                td.check_level checkLevel,
 			   qctp.upper_diff upperDiff,