diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index a2b23585..7f0fb777 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -519,7 +519,7 @@ public class ReportServiceImpl implements ReportService { String site = CommonMethods.getSite(); paramMap.put("site", site); paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); - if (!StringUtils.isBlank(String.valueOf(paramMap.get("week")))){ + if (String.valueOf(paramMap.get("week")).equals("true")){ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); LocalDateTime now = LocalDateTime.now(); DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd"); diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 1c9c7d8a..8ef42e32 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -1296,9 +1296,9 @@ AND ZSD.CREATED_DATE_TIME >= add_months(SYSDATE, -6) GROUP BY ZSD.SFC)) - SELECT COUNT(zab.NC_QTY) "abnormalQualityNumber", + SELECT SUM(zab.NC_QTY) "abnormalQualityNumber", DECODE(MAX(acc.QTY), NULL, 0, MAX(acc.QTY)) "orderedTotalNumber", - DECODE(MAX(acc.QTY), NULL, 0.00, TO_CHAR(100 - COUNT(zab.NC_QTY) / MAX(acc.QTY) * 100, '99990.99')) || '%' "rate" + DECODE(MAX(acc.QTY), NULL, 0.00, TO_CHAR(100 - SUM(zab.NC_QTY) / MAX(acc.QTY) * 100, '99990.99')) || '%' "rate" FROM Z_ABNORMAL_BILL zab CROSS JOIN acc WHERE zab.STATUS != 'Q' diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java index 4f3b86ac..764f8eae 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java @@ -229,7 +229,7 @@ public class ResrceController { /** * 资源负荷率报表 - * 存入 周产能、月产能 + * 存入 周产能、月产能、日产能 * @param paramMap * @return */ @@ -246,7 +246,7 @@ public class ResrceController { customFields.setValue(hashMap.get("weekCapacity")); CustomFieldsList.add(customFields); } - } else { + } else if (paramMap.get("capacity").equals("monthCapacity")){ for (HashMap hashMap : resultList) { CustomFields customFields = new CustomFields(); customFields.setHandle(HandleEnum.OPERATION.getHandle(CommonMethods.getSite(), hashMap.get("operation"),"1.0")); @@ -254,6 +254,14 @@ public class ResrceController { customFields.setValue(hashMap.get("monthCapacity")); CustomFieldsList.add(customFields); } + }else if (paramMap.get("capacity").equals("dayCapacity")){ + for (HashMap hashMap : resultList) { + CustomFields customFields = new CustomFields(); + customFields.setHandle(HandleEnum.OPERATION.getHandle(CommonMethods.getSite(), hashMap.get("operation"),"1.0")); + customFields.setAttribute("DAY_CAPACITY"); + customFields.setValue(hashMap.get("dayCapacity")); + CustomFieldsList.add(customFields); + } } customFieldsService.saveOrUpdateCustomFields(CustomFieldsList); return R.ok("保存成功");