|
|
@ -196,13 +196,13 @@ public class QualityReportServiceImpl implements IQualityReportService {
|
|
|
|
for (int i = 0; i < collect.size(); i++){
|
|
|
|
for (int i = 0; i < collect.size(); i++){
|
|
|
|
|
|
|
|
|
|
|
|
for (int j=0;j<repairRateReports.size();j++){
|
|
|
|
for (int j=0;j<repairRateReports.size();j++){
|
|
|
|
if (collect.get(i).getCOLUMN_A()==repairRateReports.get(i).getCOLUMN_A()&&
|
|
|
|
if (collect.get(i).getCOLUMN_A().equals(repairRateReports.get(j).getCOLUMN_A())&&
|
|
|
|
collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(i).getINSPECTOR_TIME()
|
|
|
|
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).setQUALITY_SUM(collect.get(i).getQUALITY_SUM()+ repairRateReports.get(j).getQUALITY_SUM());
|
|
|
|
collect.get(i).setOFF_LINE_NUM(repairRateReports.get(i).getOFF_LINE_NUM()+ repairRateReports.get(i).getOFF_LINE_NUM());
|
|
|
|
collect.get(i).setOFF_LINE_NUM(collect.get(i).getOFF_LINE_NUM()+ repairRateReports.get(j).getOFF_LINE_NUM());
|
|
|
|
collect.get(i).setREPAIR_RATE(repairRateReports.get(i).getREPAIR_RATE()+ repairRateReports.get(i).getREPAIR_RATE());
|
|
|
|
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()+"周");
|
|
|
|
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 i = 0; i < collect.size(); i++){
|
|
|
|
|
|
|
|
|
|
|
|
for (int j=0;j<repairRateReports.size();j++){
|
|
|
|
for (int j=0;j<repairRateReports.size();j++){
|
|
|
|
if (collect.get(i).getCOLUMN_A()==repairRateReports.get(i).getCOLUMN_A()&&
|
|
|
|
if (collect.get(i).getCOLUMN_A().equals(repairRateReports.get(j).getCOLUMN_A())&&
|
|
|
|
collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(i).getINSPECTOR_TIME()
|
|
|
|
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).setQUALITY_SUM(collect.get(i).getQUALITY_SUM()+ repairRateReports.get(j).getQUALITY_SUM());
|
|
|
|
collect.get(i).setOFF_LINE_NUM(repairRateReports.get(i).getOFF_LINE_NUM()+ repairRateReports.get(i).getOFF_LINE_NUM());
|
|
|
|
collect.get(i).setOFF_LINE_NUM(collect.get(i).getOFF_LINE_NUM()+ repairRateReports.get(j).getOFF_LINE_NUM());
|
|
|
|
collect.get(i).setREPAIR_RATE(repairRateReports.get(i).getREPAIR_RATE()+ repairRateReports.get(i).getREPAIR_RATE());
|
|
|
|
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));
|
|
|
|
collect.get(i).setINSPECTOR_TIME(collect.get(i).getINSPECTOR_TIME().substring(0,7));
|
|
|
|