From 9d74ba44f768d6a37d4793ad56adc6d5ffb88e73 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 28 Apr 2023 17:50:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=B1=87=E6=80=BB=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/reportsalesdaylog/MyHandler.java | 2 -- .../reportsalesdaylog/ReportSalesDayLog.java | 10 +++++- .../ReportSalesDayGatherMapper.java | 34 +++++++++---------- .../ReportSalesDayGatherService.java | 13 +++---- .../ReportSalesDayLogMapper.java | 7 ++-- .../ReportSalesDayLogRest.java | 27 ++++++++++++--- .../ReportSalesDayLogService.java | 9 +++-- .../ReportSalesDayStoreMapper.java | 13 ++++--- .../ReportSalesDayStoreService.java | 18 +++++++--- .../ReportSalesDayStoreProductMapper.java | 5 ++- .../ReportSalesDayStoreProductService.java | 14 ++++++-- .../ReportSalesDayTobaccoStoreMapper.java | 13 ++++--- .../ReportSalesDayTobaccoStoreMapper.xml | 2 +- .../ReportSalesDayTobaccoStoreService.java | 22 +++++++++--- ...portSalesDayTobaccoStoreProductMapper.java | 4 ++- ...ortSalesDayTobaccoStoreProductService.java | 12 ++++++- .../report/biz/thread/ReportThread.java | 9 +++-- 17 files changed, 152 insertions(+), 62 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/MyHandler.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/MyHandler.java index 32512e1b..380bfcea 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/MyHandler.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/MyHandler.java @@ -12,8 +12,6 @@ import java.util.List; * 合并单元格处理类 */ public class MyHandler extends AbstractMergeStrategy { - - /** * 合并开始行 */ diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/ReportSalesDayLog.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/ReportSalesDayLog.java index e689b7dc..3907f417 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/ReportSalesDayLog.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/ReportSalesDayLog.java @@ -1,5 +1,6 @@ package com.yxt.supervise.report.api.reportsalesdaylog; +import com.yxt.common.core.domain.BaseEntity; import lombok.Data; /** @@ -7,8 +8,15 @@ import lombok.Data; * @date 2023/4/21 15:27 */ @Data -public class ReportSalesDayLog { +public class ReportSalesDayLog extends BaseEntity { + //单据日期 private String orderDate; + //文件完整路径 private String fullUrl; + //文件相对路径 private String filePath; + //上报时间 + private String reportTime; + //编号 + private String serialNumber; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherMapper.java index db555d98..dacd3984 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherMapper.java @@ -21,25 +21,25 @@ import java.util.Map; public interface ReportSalesDayGatherMapper extends BaseMapper { List getReportSalesDayGather(@Param(Constants.WRAPPER) Wrapper qw); List getAllReportSalesDayGather(@Param(Constants.WRAPPER) Wrapper qw); - @Delete("delete from supervise_supplychain.gd_sales_reportday where orderDate=#{orderDate} ") + @Delete("delete from report_sales_day_gather where orderDate=#{orderDate} ") void clearByOrderDate(@Param("orderDate") String orderDate); @Select("select CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount from ( " + - " select gs.saleNum,gs.salePrice from supervise_supplychain.gd_sales gs left join supervise_supplychain.store_index si on gs.storeCode=si.code " + + " select gs.saleNum,gs.salePrice from gd_sales gs left join store_index si on gs.storeCode=si.code " + " where gs.dataDate=#{dataDate} and si.`type` ='连网连锁店' ) t ") double amountOfLsdOnDay(@Param("dataDate") String orderDate); @Select("select CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount from ( " + - " select gs.saleNum,gs.salePrice from supervise_supplychain.gd_sales gs left join supervise_supplychain.store_index si on gs.storeCode=si.code " + + " select gs.saleNum,gs.salePrice from gd_sales gs left join store_index si on gs.storeCode=si.code " + " where gs.dataDate=#{dataDate} and si.`type` ='连锁内加盟' ) t ") double amountOfLsnjmOnDay(@Param("dataDate") String orderDate); - @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM supervise_supplychain.gd_wholesale where dataDate=#{dataDate} ") + @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_wholesale where dataDate=#{dataDate} ") double amountOfPszxDay(String orderDate); - @Select("SELECT CONVERT(IFNULL(sum(colq16),0),DECIMAL(12,2)) as amount FROM supervise_supplychain.gd_instorage_jmd where orderDate=#{orderDate} ") + @Select("SELECT CONVERT(IFNULL(sum(colq16),0),DECIMAL(12,2)) as amount FROM gd_instorage_jmd where orderDate=#{orderDate} ") double amountOfLswjmDay(@Param("orderDate") String orderDate); - @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM supervise_supplychain.gd_sales_yc where dataDate=#{dataDate}") + @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate}") double amountOfYcDay(@Param("dataDate") String orderDate); @Select("select CONVERT(IFNULL(sum(t.colq16),0),DECIMAL(12,2)) as amount from ( " + - " select gig.* from supervise_supplychain.gd_instorage_yc gig left join supervise_supplychain.store_index si on gig.colb1=si.code " + + " select gig.* from gd_instorage_yc gig left join store_index si on gig.colb1=si.code " + " where gig.orderDate=#{orderDate} and (si.`type` ='连锁外加盟（销配结算）' OR si.`type` ='连锁外加盟(销配结算)' ) ) t ") double amountOfDayJmd(@Param("orderDate") String orderDate); @Select("SELECT t.*, " + @@ -53,15 +53,15 @@ public interface ReportSalesDayGatherMapper extends BaseMapper> ycddmxb(); - @Select("select IFNULL(sum(prodValue),0) from supervise_supplychain.gd_inventory_ok") + @Select("select IFNULL(sum(prodValue),0) from gd_inventory_ok") double amountCurrent(); - @Select("select IFNULL(sum(prodValue),0) from supervise_supplychain.gd_inventory_yc") + @Select("select IFNULL(sum(prodValue),0) from gd_inventory_yc") double amountYcCurrent(); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherService.java index a4e3d100..314fa12a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaygather/ReportSalesDayGatherService.java @@ -24,10 +24,7 @@ import org.springframework.stereotype.Service; import java.io.IOException; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author wangpengfei @@ -70,13 +67,17 @@ public class ReportSalesDayGatherService extends MybatisBaseService SalesVos){ + public void exportReportSalesDayStore(Map map,ExcelWriter excelWriter, List SalesVos){ WriteSheet writeSheet = EasyExcel.writerSheet(0).build(); // 填写配置，forceNewRow true表示自动创建一行，后面的数据后移 FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); //填写数据 excelWriter.fill(SalesVos, fillConfig, writeSheet); - + if(SalesVos.size()>0){ + map.put("serialNumber",SalesVos.get(0).getSerialNumber()); + map.put("reportTime",SalesVos.get(0).getReportTime()); + } + excelWriter.fill(map, writeSheet); } public ReportSalesDayGather fetchByOrderDate(String orderDate) { QueryWrapper qw = new QueryWrapper<>(); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogMapper.java index 98536ba5..ee3efe98 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogMapper.java @@ -22,12 +22,13 @@ public interface ReportSalesDayLogMapper extends BaseMapper { List getAllReportSalesDayLog(@Param(Constants.WRAPPER) Wrapper qw); //获取入库log - @Select("select count(1) from supervise_supplychain.gd_instorage_log where orderDate=@{orderDate}") + @Select("select count(1) from supervise_supplychain.gd_instorage_log where orderDate=#{orderDate}") int getInstorageLog(@Param("orderDate") String orderDate); //获取库存log - @Select("select count(1) from supervise_supplychain.gd_inventory_log where orderDate=@{orderDate}") + @Select("select count(1) from supervise_supplychain.gd_inventory_log where orderDate=#{orderDate}") int getInventoryLog(@Param("orderDate") String orderDate); //获取销售log - @Select("select count(1) from supervise_supplychain.gd_sales_log where orderDate=@{orderDate}") + @Select("select count(1) from supervise_supplychain.gd_sales_log where orderDate=#{orderDate}") int getSalesLog(@Param("orderDate") String orderDate); + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogRest.java index e9dc4ec8..fb37baae 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogRest.java @@ -1,5 +1,6 @@ package com.yxt.supervise.report.biz.reportsalesdaylog; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import java.io.File; import java.io.IOException; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -76,17 +78,19 @@ public class ReportSalesDayLogRest { * @param orderDate * @throws IOException */ + @PostMapping("/SalesReport") public void SalesReport(String orderDate) throws IOException { String xlsxpath = xlsxtmplPath + "销售汇总日报表"+orderDate+".xlsx"; // 创建ExcelWriterBuilder ExcelWriterBuilder excelWriterBuilder = EasyExcel.write(xlsxpath).withTemplate(TEMPLATE_FILE_NAME); ExcelWriter excelWriter = excelWriterBuilder.build(); + Map map =new HashMap<>(); // 写入list之前的数据 - reportSalesDayGatherService.exportReportSalesDayStore(excelWriter,reportSalesDayGatherService.getAllReportSalesDayGather(orderDate)); - reportSalesDayStoreService.exportReportSalesDayStore(excelWriter,reportSalesDayStoreService.getAllReportSalesDayStore(orderDate)); - reportSalesDayStoreProductService.exportReportSalesDayStoreProduct(excelWriter,reportSalesDayStoreProductService.getAllReportSalesDayStoreProduct(orderDate)); - reportSalesDayTobaccoStoreService.exportReportSalesDayTobaccoStore(excelWriter,reportSalesDayTobaccoStoreService.getAllReportSalesDayTobaccoStore(orderDate)); - reportSalesDayTobaccoStoreProductService.exportReportSalesDayTobaccoStoreProduct(excelWriter,reportSalesDayTobaccoStoreProductService.getAllReportSalesDayTobaccoStoreProduct(orderDate)); + reportSalesDayGatherService.exportReportSalesDayStore(map,excelWriter,reportSalesDayGatherService.getAllReportSalesDayGather(orderDate)); + reportSalesDayStoreService.exportReportSalesDayStore(map,excelWriter,reportSalesDayStoreService.getAllReportSalesDayStore(orderDate)); + reportSalesDayStoreProductService.exportReportSalesDayStoreProduct(map,excelWriter,reportSalesDayStoreProductService.getAllReportSalesDayStoreProduct(orderDate)); + reportSalesDayTobaccoStoreService.exportReportSalesDayTobaccoStore(map,excelWriter,reportSalesDayTobaccoStoreService.getAllReportSalesDayTobaccoStore(orderDate)); + reportSalesDayTobaccoStoreProductService.exportReportSalesDayTobaccoStoreProduct(map,excelWriter,reportSalesDayTobaccoStoreProductService.getAllReportSalesDayTobaccoStoreProduct(orderDate)); ReportSalesDayLog log=ReportSalesDayLogService.getOne(new QueryWrapper().eq("orderDate",orderDate)); //保存url String newFileName = "销售汇总日报表" + orderDate + ".xlsx"; @@ -104,4 +108,17 @@ public class ReportSalesDayLogRest { public boolean getLog(String orderDate){ return ReportSalesDayLogService.getLog(orderDate); } + public void addReportLog(String orderDate){ + //添加reportlog + Listlist=ReportSalesDayLogService.list(new QueryWrapper().eq("orderDate",orderDate)); + if(list.size()==0){ + Date date=new Date(); + String dfmt = DateUtil.format(date, "yyyy-MM-dd"); + ReportSalesDayLog log=new ReportSalesDayLog(); + log.setOrderDate(orderDate); + log.setReportTime(dfmt); + log.setSerialNumber(orderDate); + ReportSalesDayLogService.addReportLog(log); + } + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java index 2ed055bf..439d1b3a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java @@ -1,5 +1,6 @@ package com.yxt.supervise.report.biz.reportsalesdaylog; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -64,10 +65,14 @@ public class ReportSalesDayLogService extends MybatisBaseService=1 && inveLog>=1&& salesLog>=1){ return true; } return false; } - + public void addReportLog(ReportSalesDayLog log){ + ReportSalesDayLog entity=new ReportSalesDayLog(); + BeanUtil.copyProperties(log, entity, "id", "sid"); + baseMapper.insert(log); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreMapper.java index aa6e6816..fd6c7b75 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStore; import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStoreVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -20,16 +21,18 @@ public interface ReportSalesDayStoreMapper extends BaseMapper getReportSalesDayStore(@Param(Constants.WRAPPER) Wrapper qw); List getAllReportSalesDayStore(@Param(Constants.WRAPPER) Wrapper qw); @Select(" SELECT" + - " ROUND( SUM( s.saleNum * s.salePrice ), 2 ) AS salesVolume," + - " i.NAME AS storeName," + - " rank() over(order by s.storeCode) as serialNumber," + + " ROUND( SUM( s.saleNum * s.salePrice ), 2 ) AS saleAmount," + + " i.NAME AS storeCodeName," + + " rank() over(order by s.storeCode) as sort," + " s.dataDate as date" + " FROM" + - " supervise_supplychain.gd_sales_gd s" + - " LEFT JOIN supervise_supplychain.store_info i ON i.`code` = s.storeCode" + + " gd_sales_gd s" + + " LEFT JOIN store_info i ON i.`code` = s.storeCode" + " where s.dataDate=#{orderDate}" + " GROUP BY" + " s.storeCode") List getAllStoreSalesReport(@Param("orderDate") String orderDate); + @Delete("delete from report_sales_day_store where orderDate=#{orderDate} ") + void clearByOrderDate(@Param("orderDate") String orderDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreService.java index 319a50f1..d2268316 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystore/ReportSalesDayStoreService.java @@ -53,7 +53,11 @@ public class ReportSalesDayStoreService extends MybatisBaseService list= baseMapper.getAllStoreSalesReport(orderDate); int size=list.size(); double amount=0; @@ -93,7 +97,7 @@ public class ReportSalesDayStoreService extends MybatisBaseService SalesVos){ + public void exportReportSalesDayStore(Map map,ExcelWriter excelWriter, List SalesVos){ List list = new ArrayList<>(); //new CellRangeAddress(开始行，结束行，开始列，结束列) list.add(new CellRangeAddress(3, SalesVos.size()+3, 1, 3)); @@ -103,18 +107,24 @@ public class ReportSalesDayStoreService extends MybatisBaseService0){ + map.put("serialNumber",SalesVos.get(0).getSerialNumber()); + map.put("reportTime",SalesVos.get(0).getReportTime()); + map.put("storeNumber",SalesVos.get(0).getStoreNumber()); + } + excelWriter.fill(map, writeSheet1); // list 后面还有个统计 想办法手动写入 List> totalListList = ListUtils.newArrayList(); List totalList = ListUtils.newArrayList(); totalListList.add(totalList); - BigDecimal total=new BigDecimal("0"); totalList.add(""); totalList.add(""); totalList.add(""); totalList.add("统计:"); - totalList.add(String.valueOf(total)); + totalList.add(SalesVos.get(1).getCountAmount()); // 这里是write 别和fill 搞错了 - WriteSheet writeSheet1 = EasyExcel.writerSheet(1).build(); + excelWriter.write(totalListList,writeSheet1); } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductMapper.java index ed379b75..98abbe0a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.report.api.reportsalesdaystoreproduct.ReportSalesDayStoreProduct; import com.yxt.supervise.report.api.reportsalesdaystoreproduct.ReportSalesDayStoreProductVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -26,9 +27,11 @@ public interface ReportSalesDayStoreProductMapper extends BaseMapper getAllStoreSalesReport(@Param("orderDate") String orderDate); + @Delete("delete from report_sales_day_store_product where orderDate=#{orderDate} ") + void clearByOrderDate(@Param("orderDate") String orderDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductService.java index 6231f52a..69deb5d8 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaystoreproduct/ReportSalesDayStoreProductService.java @@ -56,7 +56,11 @@ public class ReportSalesDayStoreProductService extends MybatisBaseService list= baseMapper.getAllStoreSalesReport(orderDate); int size=list.size(); double amount=0; @@ -65,6 +69,7 @@ public class ReportSalesDayStoreProductService extends MybatisBaseService SalesVos){ + public void exportReportSalesDayStoreProduct(Map map,ExcelWriter excelWriter, List SalesVos){ //得到所有要导出的数据 WriteSheet writeSheetGood = EasyExcel.writerSheet(2).build(); //填写数据 excelWriter.fill(SalesVos, writeSheetGood); + if(SalesVos.size()>0){ + map.put("serialNumber",SalesVos.get(0).getSerialNumber()); + map.put("reportTime",SalesVos.get(0).getReportTime()); + map.put("productNumber",SalesVos.get(0).getProductNumber()); + } + excelWriter.fill(map, writeSheetGood); // list 后面还有个统计 想办法手动写入 List> totalListList1 = ListUtils.newArrayList(); List totalList1 = ListUtils.newArrayList(); totalListList1.add(totalList1); - BigDecimal total=new BigDecimal("0"); totalList1.add(""); totalList1.add(""); totalList1.add(""); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.java index 85bd3c7f..11c3f70e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.report.api.reportsalesdaytobaccostore.ReportSalesDayTobaccoStore; import com.yxt.supervise.report.api.reportsalesdaytobaccostore.ReportSalesDayTobaccoStoreVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -21,15 +22,17 @@ public interface ReportSalesDayTobaccoStoreMapper extends BaseMapper getAllReportSalesDayTobaccoStore(@Param(Constants.WRAPPER) Wrapper qw); @Select(" SELECT" + - " ROUND( SUM( s.saleNum * s.salePrice ), 2 ) AS salesVolume," + - " i.NAME AS storeName," + - " rank() over(order by s.storeCode) as serialNumber," + + " ROUND( SUM( s.saleNum * s.salePrice ), 2 ) AS saleAmount," + + " i.NAME AS storeCodeName," + + " rank() over(order by s.storeCode) as sort," + " s.dataDate as date" + " FROM" + - " supervise_supplychain.gd_sales_yc s" + - " LEFT JOIN supervise_supplychain.store_info i ON i.`code` = s.storeCode" + + " gd_sales_yc s" + + " LEFT JOIN store_info i ON i.`code` = s.storeCode" + " where s.dataDate=#{orderDate}" + " GROUP BY" + " s.storeCode") List getAllTobaccoReport(@Param("orderDate") String orderDate); + @Delete("delete from report_sales_day_tobacco_store where orderDate=#{orderDate} ") + void clearByOrderDate(@Param("orderDate") String orderDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.xml index 58f89c71..7e114a0c 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaytobaccostore/ReportSalesDayTobaccoStoreMapper.xml @@ -7,7 +7,7 @@ SELECT * FROM - report_sales_day_store_product + report_sales_day_tobacco_store ${ew.sqlSegment}