From 652155e47a2775f61d886f03d5e5d898a7b9b07e Mon Sep 17 00:00:00 2001
From: zhouhy <zhouhy3@mesnac.com>
Date: Mon, 27 May 2024 10:22:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BF=94=E4=BF=AE=E7=8E=87=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/QualityReportServiceImpl.java        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java
index 4e6d5c8..6c18e1c 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java
@@ -196,13 +196,13 @@ public class QualityReportServiceImpl implements IQualityReportService {
             for (int i = 0; i < collect.size(); i++){
 
                 for (int j=0;j<repairRateReports.size();j++){
-                    if (collect.get(i).getCOLUMN_A()==repairRateReports.get(i).getCOLUMN_A()&&
-                        collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(i).getINSPECTOR_TIME()
+                    if (collect.get(i).getCOLUMN_A().equals(repairRateReports.get(j).getCOLUMN_A())&&
+                        collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(j).getINSPECTOR_TIME()
                     )
                     {
-                        collect.get(i).setQUALITY_SUM(repairRateReports.get(i).getQUALITY_SUM()+ repairRateReports.get(i).getQUALITY_SUM());
-                        collect.get(i).setOFF_LINE_NUM(repairRateReports.get(i).getOFF_LINE_NUM()+ repairRateReports.get(i).getOFF_LINE_NUM());
-                        collect.get(i).setREPAIR_RATE(repairRateReports.get(i).getREPAIR_RATE()+ repairRateReports.get(i).getREPAIR_RATE());
+                        collect.get(i).setQUALITY_SUM(collect.get(i).getQUALITY_SUM()+ repairRateReports.get(j).getQUALITY_SUM());
+                        collect.get(i).setOFF_LINE_NUM(collect.get(i).getOFF_LINE_NUM()+ repairRateReports.get(j).getOFF_LINE_NUM());
+                        collect.get(i).setREPAIR_RATE(collect.get(i).getREPAIR_RATE()+ repairRateReports.get(j).getREPAIR_RATE());
                     }
                 }
                 collect.get(i).setINSPECTOR_TIME("第"+collect.get(i).getCOLUMN_A()+"周");
@@ -225,13 +225,13 @@ public class QualityReportServiceImpl implements IQualityReportService {
             for (int i = 0; i < collect.size(); i++){
 
                 for (int j=0;j<repairRateReports.size();j++){
-                    if (collect.get(i).getCOLUMN_A()==repairRateReports.get(i).getCOLUMN_A()&&
-                            collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(i).getINSPECTOR_TIME()
+                    if (collect.get(i).getCOLUMN_A().equals(repairRateReports.get(j).getCOLUMN_A())&&
+                            collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(j).getINSPECTOR_TIME()
                     )
                     {
-                        collect.get(i).setQUALITY_SUM(repairRateReports.get(i).getQUALITY_SUM()+ repairRateReports.get(i).getQUALITY_SUM());
-                        collect.get(i).setOFF_LINE_NUM(repairRateReports.get(i).getOFF_LINE_NUM()+ repairRateReports.get(i).getOFF_LINE_NUM());
-                        collect.get(i).setREPAIR_RATE(repairRateReports.get(i).getREPAIR_RATE()+ repairRateReports.get(i).getREPAIR_RATE());
+                        collect.get(i).setQUALITY_SUM(collect.get(i).getQUALITY_SUM()+ repairRateReports.get(j).getQUALITY_SUM());
+                        collect.get(i).setOFF_LINE_NUM(collect.get(i).getOFF_LINE_NUM()+ repairRateReports.get(j).getOFF_LINE_NUM());
+                        collect.get(i).setREPAIR_RATE(collect.get(i).getREPAIR_RATE()+ repairRateReports.get(j).getREPAIR_RATE());
                     }
                 }
                         collect.get(i).setINSPECTOR_TIME(collect.get(i).getINSPECTOR_TIME().substring(0,7));