From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 07 四月 2023 17:40:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java index 01bdb4c..3b2ee6f 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java @@ -3,10 +3,14 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.core.util.DateUtil; +import com.stylefeng.guns.modular.system.controller.resp.DataStatisticsOrderYearResp; +import com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp; import com.stylefeng.guns.modular.system.controller.resp.TOrderResp; +import com.stylefeng.guns.modular.system.controller.resp.TOrderServerResp; import com.stylefeng.guns.modular.system.dao.TAppUserMapper; import com.stylefeng.guns.modular.system.dao.TBranchOfficeMapper; import com.stylefeng.guns.modular.system.dao.TDriverMapper; +import com.stylefeng.guns.modular.system.enums.OrderStateEnum; import com.stylefeng.guns.modular.system.model.TAppUser; import com.stylefeng.guns.modular.system.model.TBranchOffice; import com.stylefeng.guns.modular.system.model.TDriver; @@ -21,8 +25,10 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Objects; /** @@ -137,4 +143,41 @@ this.orderDetail(orderId,model); model.addAttribute("orderId",orderId); } + + @Override + public void getDataStatisticsByYear(Integer agentId,String yearDate, Model model) { + List<DataStatisticsOrderYearResp> data = tOrderMapper.getDataStatisticsByYear(agentId,yearDate); + System.err.println(data); + model.addAttribute("yearResp",data); + } + + @Override + public void getDataStatisticsOrderCount(Integer agentId, String monthDate, Model model) { + List<PerformanceTableResp> list = tOrderMapper.getDataStatisticsOrderCount(agentId,monthDate); + model.addAttribute("performanceResp",list); + } + + @Override + public void getDataStatisticsCount(Integer agentId, Map<String, Integer> map) { + Integer pendingOrderCount = tOrderMapper.getDataStatisticsCount(agentId, OrderStateEnum.PENDING_ORDER.getCode(), LocalDate.now()); + Integer finishCount = tOrderMapper.getDataStatisticsCount(agentId, OrderStateEnum.FINISH.getCode(),LocalDate.now()); + Integer cancelCount = tOrderMapper.getDataStatisticsCount(agentId, OrderStateEnum.CANCELED.getCode(),LocalDate.now()); + + Integer serverCount = tOrderMapper.getDataStatisticsServerCount(agentId, LocalDate.now()); + + map.put("pendingOrderCount",pendingOrderCount); + map.put("finishCount",finishCount); + map.put("cancelCount",cancelCount); + map.put("serverCount",serverCount); + } + + @Override + public List<TOrderServerResp> getDataStatisticsServerList(Integer agentId) { + return tOrderMapper.getDataStatisticsServerList(agentId,LocalDate.now()); + } + + @Override + public List<TOrder> getDataStatisticsAllList(Integer agentId) { + return tOrderMapper.getDataStatisticsAllList(agentId,LocalDate.now()); + } } -- Gitblit v1.7.1