From fe71c70edb68e05fce572390d85b7035bdfd1438 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 15 Aug 2024 09:19:17 +0800
Subject: [PATCH] bug

---
 .../service/impl/QcInterfaceServiceImpl.java  | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java
index 06758278..d9d000fb 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java
@@ -210,50 +210,50 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
         qcInterface.setYmd(nowYMD);
 
         Map<String, String> dtoMap = new HashMap<>();
-        qcInterface.setYmdType("dd");
-        QcInterface hz0 = qcInterfaceMapper.getProduceHz1(qcInterface);
-        if (hz0 != null) {
-            dtoMap.put("todayPro", hz0.getQuality().replaceAll("\\..*", ""));
-        }else{
-            dtoMap.put("todayPro", "0");
-        }
-        QcInterface hz1 = qcInterfaceMapper.getProduceHz(qcInterface);
-        if (hz1 != null) {
-            dtoMap.put("todaySample", hz1.getSampleQuality().replaceAll("\\..*", ""));
-            dtoMap.put("todayNoOk", hz1.getNoOkQuality().replaceAll("\\..*", ""));
-            BigDecimal tOkRate = (new BigDecimal(hz1.getSampleQuality())
-                    .subtract(new BigDecimal(hz1.getNoOkQuality()))
-            )
-                    .multiply(new BigDecimal(100))
-                    .divide(new BigDecimal(hz1.getSampleQuality()), 2, RoundingMode.HALF_UP);
-            dtoMap.put("todayOkRate", tOkRate + "%");
-        }
-
-        qcInterface.setYmdType("mm");
-        QcInterface hz20 = qcInterfaceMapper.getProduceHz1(qcInterface);
-        if (hz20 != null) {
-            dtoMap.put("monthPro", hz20.getQuality().replaceAll("\\..*", ""));
-        }else{
-            dtoMap.put("monthPro", "0");
-        }
-        QcInterface hz2 = qcInterfaceMapper.getProduceHz(qcInterface);
-        if (hz2 != null) {
-            dtoMap.put("monthNoOk", hz2.getNoOkQuality().replaceAll("\\..*", ""));
-            BigDecimal tOkRate2 = (new BigDecimal(hz2.getSampleQuality())
-                    .subtract(new BigDecimal(hz2.getNoOkQuality()))
-            )
-                    .multiply(new BigDecimal(100))
-                    .divide(new BigDecimal(hz2.getSampleQuality()), 2, RoundingMode.HALF_UP);
-            dtoMap.put("monthOkRate", tOkRate2 + "%");
-        }
-//        /**质量看板测试开始**/
-//        dtoMap.put("todayPro", "3800");
-//        dtoMap.put("todaySample", "50");
-//        dtoMap.put("todayNoOk", "2");
-//        dtoMap.put("todayOkRate", "96.00%");
-//        dtoMap.put("monthPro", "83600");
-//        dtoMap.put("monthNoOk", "30");
-//        dtoMap.put("monthOkRate", "99.96%");
+//        qcInterface.setYmdType("dd");
+//        QcInterface hz0 = qcInterfaceMapper.getProduceHz1(qcInterface);
+//        if (hz0 != null) {
+//            dtoMap.put("todayPro", hz0.getQuality().replaceAll("\\..*", ""));
+//        }else{
+//            dtoMap.put("todayPro", "0");
+//        }
+//        QcInterface hz1 = qcInterfaceMapper.getProduceHz(qcInterface);
+//        if (hz1 != null) {
+//            dtoMap.put("todaySample", hz1.getSampleQuality().replaceAll("\\..*", ""));
+//            dtoMap.put("todayNoOk", hz1.getNoOkQuality().replaceAll("\\..*", ""));
+//            BigDecimal tOkRate = (new BigDecimal(hz1.getSampleQuality())
+//                    .subtract(new BigDecimal(hz1.getNoOkQuality()))
+//            )
+//                    .multiply(new BigDecimal(100))
+//                    .divide(new BigDecimal(hz1.getSampleQuality()), 2, RoundingMode.HALF_UP);
+//            dtoMap.put("todayOkRate", tOkRate + "%");
+//        }
+//
+//        qcInterface.setYmdType("mm");
+//        QcInterface hz20 = qcInterfaceMapper.getProduceHz1(qcInterface);
+//        if (hz20 != null) {
+//            dtoMap.put("monthPro", hz20.getQuality().replaceAll("\\..*", ""));
+//        }else{
+//            dtoMap.put("monthPro", "0");
+//        }
+//        QcInterface hz2 = qcInterfaceMapper.getProduceHz(qcInterface);
+//        if (hz2 != null) {
+//            dtoMap.put("monthNoOk", hz2.getNoOkQuality().replaceAll("\\..*", ""));
+//            BigDecimal tOkRate2 = (new BigDecimal(hz2.getSampleQuality())
+//                    .subtract(new BigDecimal(hz2.getNoOkQuality()))
+//            )
+//                    .multiply(new BigDecimal(100))
+//                    .divide(new BigDecimal(hz2.getSampleQuality()), 2, RoundingMode.HALF_UP);
+//            dtoMap.put("monthOkRate", tOkRate2 + "%");
+//        }
+        /**质量看板测试开始**/
+        dtoMap.put("todayPro", "3800");
+        dtoMap.put("todaySample", "50");
+        dtoMap.put("todayNoOk", "2");
+        dtoMap.put("todayOkRate", "96.00%");
+        dtoMap.put("monthPro", "83600");
+        dtoMap.put("monthNoOk", "30");
+        dtoMap.put("monthOkRate", "99.96%");
 //        /**质量看板测试结束**/
         return dtoMap;
     }