diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java index 1df886a..f897544 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java @@ -49,6 +49,16 @@ public class ZZJXBroadController { private String selectLossInfo() { return JSONArray.toJSONString(BroadDruidServiceImpl.zz_selectLossInfo()); } - + @PostMapping("/selectOneBadRate/{id}") + @ApiOperation("一次不合格率") + private String selectOneBadRate(@PathVariable("id")int id){ + if (id==0){ +// ban + return JSONArray.toJSONString(service.selectOneBadRate()); + }else { +// tian + return JSONArray.toJSONString(service.selectOneBadRateByDay()); + } + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java index 2199e08..f5f49c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java @@ -7,6 +7,7 @@ package com.ruoyi.system.domain; public class BoxOutput { private String name; private int qty; + private double rate; public String getName() { return name; @@ -23,4 +24,12 @@ public class BoxOutput { public void setQty(int qty) { this.qty = qty; } + + public double getRate() { + return rate; + } + + public void setRate(double rate) { + this.rate = rate; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index da75089..a005814 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -70,4 +70,8 @@ public interface BroadDataMapper { void insertTimp1(); void deleteTimp1(); + + List selectOneBadRate(); + + List selectOneBadRateByDay(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index 7049e9d..41e4f91 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -55,4 +55,7 @@ public interface IBroadDataService { List zz_selectProductInByDay(); + List selectOneBadRate(); + + List selectOneBadRateByDay(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 1c340fa..9977350 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -127,4 +127,14 @@ public class BroadDataServiceImpl implements IBroadDataService public List zz_selectProductInByDay() { return mapper.zz_selectProductInByDay(); } + + @Override + public List selectOneBadRate() { + return mapper.selectOneBadRate(); + } + + @Override + public List selectOneBadRateByDay() { + return mapper.selectOneBadRateByDay(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 66634c3..5689877 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -507,4 +507,47 @@ group by to_char(PRODUCTION_DATE, 'hh24') order by to_char(PRODUCTION_DATE, 'hh24') + + + + + \ No newline at end of file