diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index c07f1dd0..8dab6aed 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -113,56 +113,36 @@ public class ReportDataController { */ @GetMapping("/workShopPassRate") public R findWorkShopPassRate(@RequestParam(required = false) Map paramMap) { - try { paramMap.put("site", CommonMethods.getSite()); List> result = reportDataService.findWorkShopPassRate(paramMap); return R.ok(result); - } catch (Exception e) { - return R.failed(e.getMessage()); - } } @GetMapping("/checkUserPassRate") public R findCheckUserPassRate(@RequestParam(required = false) Map paramMap) { - try { paramMap.put("site", CommonMethods.getSite()); List> result = reportDataService.findCheckUserPassRate(paramMap); return R.ok(result); - } catch (Exception e) { - return R.failed(e.getMessage()); - } } @GetMapping("/userPassRate") public R findUserPassRate(@RequestParam(required = false) Map paramMap) { - try { paramMap.put("site", CommonMethods.getSite()); List> result = reportDataService.findUserPassRate(paramMap); return R.ok(result); - } catch (Exception e) { - return R.failed(e.getMessage()); - } } @GetMapping("/inspectionDetailPassRate") public R findInspectionDetailPassRate(@RequestParam(required = false) Map paramMap) { - try { paramMap.put("site", CommonMethods.getSite()); List> result = reportDataService.findInspectionDetailPassRate(paramMap); return R.ok(result); - } catch (Exception e) { - return R.failed(e.getMessage()); - } } @GetMapping("/sectionPassRate") public R findSectionPassRate(@RequestParam(required = false) Map paramMap) { - try { paramMap.put("site", CommonMethods.getSite()); List> result = reportDataService.findSectionPassRate(paramMap); return R.ok(result); - } catch (Exception e) { - return R.failed(e.getMessage()); - } } diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 1e5f568a..e5816261 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -422,7 +422,9 @@ AND TO_CHAR(zit.CREATED_DATE_TIME,'YYYY-MM') <= #{startToDate} GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, WT.DESCRIPTION,ZSD.DISPATCH_QTY - ) GROUP BY DESCRIPTION, "MONTH" + ) + WHERE SEQ='1' + GROUP BY DESCRIPTION, "MONTH" ORDER BY DESCRIPTION,"MONTH" @@ -455,8 +457,10 @@ AND ZIT.MODIFY_USER = #{userId} GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, ZNU.FULL_NAME,WT.DESCRIPTION - ) GROUP BY DESCRIPTION, "MONTH",FULL_NAME - ORDER BY DESCRIPTION,"MONTH" + ) + WHERE SEQ='1' + GROUP BY DESCRIPTION, "MONTH",FULL_NAME + ORDER BY DESCRIPTION,"MONTH" @@ -546,7 +551,9 @@ AND CFA.VALUE LIKE '%'||#{workOrder}||'%' GROUP BY ZABD.DUTY_USER,zsd.DISPATCH_QTY,ZABD.DUTY_DEPART,zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID,CFA.VALUE,CFB.VALUE, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,zit.CREATED_DATE_TIME, ZNU.FULL_NAME,WT.DESCRIPTION,I.ITEM,IT.DESCRIPTION,O.OPERATION,OT.DESCRIPTION,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,zit.COMMENTS,zit.CATEGORY - ) GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS + ) + WHERE SEQ='1' + GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS \ No newline at end of file