yinq
/
aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yinq:b909cecff2bbe00ceb03093f3d16bfd7a367a176
Branches Tags
yinq:master
..
compare: yinq:8e8c6118d82c837cdf955916fa29ee0aab7f2584
Branches Tags
yinq:master

No commits in common. 'b909cecff2bbe00ceb03093f3d16bfd7a367a176' and '8e8c6118d82c837cdf955916fa29ee0aab7f2584' have entirely different histories.
b909cecff2 ... 8e8c6118d8

1 changed files with 10 additions and 10 deletions
Show Stats

20
aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java
Unescape Escape View File

@ -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().equals(repairRateReports.get(j).getCOLUMN_A())&&
collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(j).getINSPECTOR_TIME()
if (collect.get(i).getCOLUMN_A()==repairRateReports.get(i).getCOLUMN_A()&&
collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(i).getINSPECTOR_TIME()
)
{
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).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).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().equals(repairRateReports.get(j).getCOLUMN_A())&&
collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(j).getINSPECTOR_TIME()
if (collect.get(i).getCOLUMN_A()==repairRateReports.get(i).getCOLUMN_A()&&
collect.get(i).getINSPECTOR_TIME() != repairRateReports.get(i).getINSPECTOR_TIME()
)
{
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).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).setINSPECTOR_TIME(collect.get(i).getINSPECTOR_TIME().substring(0,7));

Write Preview
Loading…
Cancel
Save