From 5d125ac7b08646ae0f828ce0a3e7aa181c09754a Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Thu, 21 Jul 2022 15:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/broad/ZZJXBroadController.java | 47 +++++++++++++++++++ .../ruoyi/system/mapper/BroadDataMapper.java | 4 ++ .../system/service/IBroadDataService.java | 4 ++ .../service/impl/BroadDataServiceImpl.java | 15 ++++++ .../mapper/system/BroadDataMapper.xml | 19 ++++++++ 5 files changed, 89 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java 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 new file mode 100644 index 0000000..02ccf61 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java @@ -0,0 +1,47 @@ +package com.ruoyi.web.controller.broad; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.system.service.IBroadDataService; +import com.ruoyi.system.service.IBroadDruidService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * @author wanghao + * @date 2022/7/14 9:49 + */ +@Controller +@RequestMapping("/broad/fp") +@ApiOperation("总装") +@ResponseBody +public class ZZJXBroadController { + @Autowired + IBroadDataService service; + @Autowired + IBroadDruidService iBroadDruidService; + + + @PostMapping("/selectProductInByTeam/{id}") + @ApiOperation("成品入库统计-当班") + private String selectProductInByTeam(@PathVariable("id")int id) { + + if (id==0){ + return JSONArray.toJSONString(service.zz_selectProductInByTeam()); + }else { + return JSONArray.toJSONString(service.zz_selectProductInByDay()); + } + + } + +} 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 f68ca99..c4eaa63 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 @@ -60,6 +60,10 @@ public interface BroadDataMapper { int selectTeamGroups(); + List zz_selectProductInByTeam(); + + List zz_selectProductInByDay(); + /////////////////////////////////////////////////////////////////////////// // 6 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 617056f..336ffaa 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 @@ -49,4 +49,8 @@ public interface IBroadDataService { List selectFpOrderInfo(); List mtk_selectInStore3d(); + + List zz_selectProductInByTeam(); + + List zz_selectProductInByDay(); } 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 c52f082..1c340fa 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 @@ -112,4 +112,19 @@ public class BroadDataServiceImpl implements IBroadDataService public List mtk_selectInStore3d() { return mapper.mtk_selectInStore3d(); } + + /////////////////////////////////////////////////////////////////////////// + // 总装 + /////////////////////////////////////////////////////////////////////////// + + + @Override + public List zz_selectProductInByTeam() { + return mapper.zz_selectProductInByTeam(); + } + + @Override + public List zz_selectProductInByDay() { + return mapper.zz_selectProductInByDay(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 479a289..3c6dc70 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -480,4 +480,23 @@ + + + + \ No newline at end of file