bug修复

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

@@ -856,7 +856,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		BigDecimal sampleQuality = new BigDecimal("0");
 		for(QcCheckTaskDetail detail:details){
 			detail.setUpdateTime(nowTime);
-			sampleQuality = noOkQquality.add(new BigDecimal(detail.getSampleQuality()));
+			sampleQuality = noOkQquality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality()));
 			//上传附件
 			if (StringUtils.isNotEmpty(detail.getFileListStr())) {
 				String[] ids = detail.getFileListStr().split(",");
@@ -985,7 +985,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		if("produce".equals(qcCheckTaskIncome.getTypeCode())||"product".equals(qcCheckTaskIncome.getTypeCode())){
 			unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode());
 			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
-			unqualified.setUser(qcCheckTaskIncome.getPgzg());//qcCheckTaskIncome.getUpdateBy();
+
 			//申请人-
 			unqualified.setSqr("MSL#"+qcCheckTaskIncome.getSqr());
 			//申请部门
@@ -1001,9 +1001,12 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			if(qcCheckTaskIncome.getSfxyzg().equals("0")){//是
 				//qc主管
 				unqualified.setPgzg("MSL#"+qcCheckTaskIncome.getPgzg());
-				//质量主管
-				unqualified.setPgzr("MSL#"+qcCheckTaskIncome.getPgzr());
+				unqualified.setUser(qcCheckTaskIncome.getPgzg());
+			}else{
+				unqualified.setUser(qcCheckTaskIncome.getPgzr());
 			}
+			//质量主管
+			unqualified.setPgzr("MSL#"+qcCheckTaskIncome.getPgzr());
 			//是否供应商问题
 			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
 			unqualified.setOaFactoryF(qcCheckTaskIncome.getOaFactoryF());

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

@@ -185,6 +185,8 @@ public class QcProCheckServiceImpl implements QcProCheckService {
         Map<String,QcCheckTaskDefect> defectMap = qcCheckTaskDefectMapper.getDefectMap(qcCheckTaskDetail);
 
         for (QcCheckTaskDetail qcd : qcCheckTaskDetails) {
+            qcd.setSampleQuality(qcd.getSampleQuality().replaceAll("\\..*", ""));//去掉小数
+
             List<BaseFile> files = qmsFileMapper.getBaseFileBatch(qcd.getRecordId());
             if (CollectionUtils.isNotEmpty(files)) {
                 qcd.setFiles(files);

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

@@ -112,10 +112,10 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
                 tabledto.setNoOkNumRate("0.00%");
             }
         }
-
-        return tabledtos.stream()
-                .filter(obj -> obj.getBatchs() != 0)
-                .collect(Collectors.toList());
+        return tabledtos;
+//        return tabledtos.stream()
+//                .filter(obj -> obj.getBatchs() != 0)
+//                .collect(Collectors.toList());
     }
 
     /**

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

@@ -7,6 +7,7 @@
 
     <select id="selectQcStaticTableList" parameterType="com.op.quality.domain.QcStaticTable"
             resultType="com.op.quality.domain.QcStaticTable">
+       <!--
         SELECT
         bs.supplier_id supplierId,
         bs.supplier_code supplierCode,
@@ -18,7 +19,13 @@
             <foreach collection="supplierCodes" item="supplierCode" index="index" separator="," open="(" close=")">
                 #{supplierCode}
             </foreach>
-        </if>
+        </if>-->
+        select DISTINCT qct.supplier_code supplierCode,
+              qct.supplier_name supplierName
+        from qc_check_task qct
+        where qct.type_code = 'material' and qct.del_flag = '0'
+        and CONVERT(varchar(7),qct.income_time, 120) = #{yearMonth}
+
     </select>
     <select id="selectPcMap" resultType="com.op.quality.domain.QcStaticTable">
         SELECT