Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

Browse Source
master
zhaoxiaolin 6 months ago
parent 18cbab3c49
commit fe71c70edb
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

88
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save