From 674d940e62d8f5d38d96c09349a879793de00655 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 10 Jul 2023 18:06:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E5=9B=9E=E6=AC=BE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=94=9F=E6=88=90word?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/api/csmcashlog/CsmCashLog.java | 35 ++++++ .../report/api/csmcashlog/CsmCashLogDto.java | 30 +++++ .../api/csmcashlog/CsmCashLogQuery.java | 26 +++++ .../report/api/csmcashlog/CsmCashLogVo.java | 30 +++++ .../api/csmcashreport/CsmCashReportVo.java | 1 + .../CsmCashReportCashedTodayVo.java | 1 + .../ReportInventoryDayGatherFeign.java | 18 +-- ...ReportInventoryDayGatherFeignFallback.java | 28 ++--- .../ReportInventoryDayGatherVo.java | 2 + .../supervise-report-biz/pom.xml | 27 +++++ .../biz/csmcashlog/CsmCashLogMapper.java | 13 +++ .../biz/csmcashlog/CsmCashLogMapper.xml | 10 ++ .../report/biz/csmcashlog/CsmCashLogRest.java | 13 +++ .../biz/csmcashlog/CsmCashLogService.java | 13 +++ .../csmcashreport/CsmCashReportMapper.java | 9 +- .../biz/csmcashreport/CsmCashReportMapper.xml | 4 +- .../biz/csmcashreport/CsmCashReportRest.java | 58 ++++++++++ .../csmcashreport/CsmCashReportService.java | 15 ++- .../CsmCashReportCashedTodayMapper.java | 3 + .../CsmCashReportCashedTodayMapper.xml | 4 +- .../CsmCashReportCashedTodayService.java | 14 +++ .../CsmCashReportSalesYesterdayMapper.java | 3 + .../CsmCashReportSalesYesterdayMapper.xml | 4 +- .../CsmCashReportSalesYesterdayService.java | 15 +++ .../reportinventory/ReportInventoryRest.java | 57 ++++----- .../ReportInventoryWxRest.java | 1 + .../supervise/report/biz/util/WordUtil.java | 108 ++++++++++++++++++ 27 files changed, 484 insertions(+), 58 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLog.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogDto.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogQuery.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogVo.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.xml create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogRest.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/util/WordUtil.java diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLog.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLog.java new file mode 100644 index 00000000..370e222b --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLog.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.report.api.csmcashlog; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/10 14:22 + */ +@ApiModel(value = "每日回款审核日志", description = "每日回款审核日志：") +@TableName("csm_cash_log") +@Data +public class CsmCashLog { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String status; + private String dataDate; + private String fileFullPath; + private String outFilePath; + private String fileUrl; + private Integer allNum; + private Integer validNum; + private Integer durations; + private Integer errRowNum; + private double salesAmountYesterday; + private double cashedAmountToday; + private double cashedAmountTodayReal; + private double cashedAmountDifferent; + +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogDto.java new file mode 100644 index 00000000..8603a7b3 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogDto.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.report.api.csmcashlog; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/10 14:22 + */ +@Data +public class CsmCashLogDto implements Dto { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String status; + private String dataDate; + private String fileFullPath; + private String outFilePath; + private String fileUrl; + private Integer allNum; + private Integer validNum; + private Integer durations; + private Integer errRowNum; + private double salesAmountYesterday; + private double cashedAmountToday; + private double cashedAmountTodayReal; + private double cashedAmountDifferent; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogQuery.java new file mode 100644 index 00000000..51fe2988 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogQuery.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.report.api.csmcashlog; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/10 14:23 + */ +@Data +public class CsmCashLogQuery implements Query { + private String id; + private String sid; + private String dataDate; + private String fileFullPath; + private String outFilePath; + private String fileUrl; + private Integer allNum; + private Integer validNum; + private Integer durations; + private Integer errRowNum; + private double salesAmountYesterday; + private double cashedAmountToday; + private double cashedAmountTodayReal; + private double cashedAmountDifferent; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogVo.java new file mode 100644 index 00000000..3d81440c --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashlog/CsmCashLogVo.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.report.api.csmcashlog; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/10 14:22 + */ +@Data +public class CsmCashLogVo implements Vo { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String status; + private String dataDate; + private String fileFullPath; + private String outFilePath; + private String fileUrl; + private Integer allNum; + private Integer validNum; + private Integer durations; + private Integer errRowNum; + private double salesAmountYesterday; + private double cashedAmountToday; + private double cashedAmountTodayReal; + private double cashedAmountDifferent; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreport/CsmCashReportVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreport/CsmCashReportVo.java index 0aaded31..60465c2a 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreport/CsmCashReportVo.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreport/CsmCashReportVo.java @@ -62,4 +62,5 @@ public class CsmCashReportVo { private String accountNumber; private String reviewedBy="石家庄市宇信通电子有限公司"; private String date; + private String downloadUrl; } diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreportcashedtoday/CsmCashReportCashedTodayVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreportcashedtoday/CsmCashReportCashedTodayVo.java index 63027004..c5d24b04 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreportcashedtoday/CsmCashReportCashedTodayVo.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreportcashedtoday/CsmCashReportCashedTodayVo.java @@ -30,6 +30,7 @@ public class CsmCashReportCashedTodayVo implements Vo { private double cashedAmount; // '回款差额', private double differentAmount; + private String remarks; //小程序参数 diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java index 599710dd..6f438063 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java @@ -23,13 +23,13 @@ import java.util.ArrayList; fallback = ReportInventoryDayGatherFeignFallback.class) public interface ReportInventoryDayGatherFeign { // - @GetMapping("/getReportInventoryDayGathers") - @ResponseBody - public ResultBean getReportInventoryDayGathers(String orderDate); - @GetMapping("/getReportInventoryDayStores") - @ResponseBody - public ResultBean getReportInventoryDayStores(String orderDate); - @GetMapping("/getReportInventoryDayToStores") - @ResponseBody - public ResultBean getReportInventoryDayToStores(String orderDate); +// @GetMapping("/getReportInventoryDayGathers") +// @ResponseBody +// public ResultBean getReportInventoryDayGathers(String orderDate); +// @GetMapping("/getReportInventoryDayStores") +// @ResponseBody +// public ResultBean getReportInventoryDayStores(String orderDate); +// @GetMapping("/getReportInventoryDayToStores") +// @ResponseBody +// public ResultBean getReportInventoryDayToStores(String orderDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java index 8449a66d..4576357e 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java @@ -16,18 +16,18 @@ import java.util.ArrayList; @Component public class ReportInventoryDayGatherFeignFallback implements ReportInventoryDayGatherFeign{ - @Override - public ResultBean getReportInventoryDayGathers(String orderDate) { - return null; - } - - @Override - public ResultBean getReportInventoryDayStores(String orderDate) { - return null; - } - - @Override - public ResultBean getReportInventoryDayToStores(String orderDate) { - return null; - } +// @Override +// public ResultBean getReportInventoryDayGathers(String orderDate) { +// return null; +// } +// +// @Override +// public ResultBean getReportInventoryDayStores(String orderDate) { +// return null; +// } +// +// @Override +// public ResultBean getReportInventoryDayToStores(String orderDate) { +// return null; +// } } diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java index 7eee72a8..dc1d8dd5 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java @@ -36,5 +36,7 @@ public class ReportInventoryDayGatherVo implements Vo { private BigDecimal productAmount; //合计货值 private BigDecimal countAmount; + //下载url + private String downloadUrl; private List list; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/pom.xml b/yxt_supervise/supervise-report/supervise-report-biz/pom.xml index 18c3eccc..06d5f321 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/pom.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/pom.xml @@ -92,6 +92,33 @@ jdk15 2.4 + + + + + + + + cn.afterturn + easypoi-base + 3.3.0 + + + cn.afterturn + easypoi-web + 3.3.0 + + + cn.afterturn + easypoi-annotation + 3.3.0 + + + + org.apache.poi + poi-ooxml-schemas + 4.0.0 + diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.java new file mode 100644 index 00000000..b722af8d --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.report.biz.csmcashlog; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.supervise.report.api.csmcashlog.CsmCashLog; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2023/7/10 14:19 + */ +@Mapper +public interface CsmCashLogMapper extends BaseMapper { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.xml new file mode 100644 index 00000000..61cfa2ea --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogRest.java new file mode 100644 index 00000000..206e1188 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogRest.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.report.biz.csmcashlog; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/7/10 14:19 + */ +@RestController +@RequestMapping("/csmcashlog") +public class CsmCashLogRest { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogService.java new file mode 100644 index 00000000..70807b1b --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogService.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.report.biz.csmcashlog; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.supervise.report.api.csmcashlog.CsmCashLog; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/7/10 14:19 + */ +@Service +public class CsmCashLogService extends MybatisBaseService { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.java index 64d0faef..8bd735df 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.java @@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.Map; + /** * @author wangpengfei * @date 2023/6/21 10:50 @@ -14,7 +16,7 @@ import org.apache.ibatis.annotations.Select; @Mapper public interface CsmCashReportMapper extends BaseMapper { @Select("select * from csm_cash_report where dataDate=#{date} group by CompanyName") - CsmCashReportVo getCsmCashReport (@Param("date") String date); + CsmCashReportVo getCsmCashReport(@Param("date") String date); @Select("SELECT\n" + "\tcompanyName as companyName,\n" + @@ -30,6 +32,7 @@ public interface CsmCashReportMapper extends BaseMapper { "\t\n" + "FROM\n" + "\tcsm_cash_report where dataDate=#{date} and CompanyName=#{name}") - CsmCashReportVo getCsmReportByComSid (@Param("date") String date,@Param("name") String name ); - + CsmCashReportVo getCsmReportByComSid(@Param("date") String date, @Param("name") String name); + + Map getCsmReport(@Param("dataDate") String dataDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.xml index ddae24f9..25d5954f 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.xml @@ -4,5 +4,7 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java index 142fe74e..9fac7e13 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java @@ -1,13 +1,33 @@ package com.yxt.supervise.report.biz.csmcashreport; +import cn.afterturn.easypoi.word.WordExportUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.report.api.csmcashlog.CsmCashLog; import com.yxt.supervise.report.api.csmcashreport.CsmCashReportDto; import com.yxt.supervise.report.api.csmcashreport.CsmCashReportQuery; +import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo; +import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayVo; +import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayVo; import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStoreDto; +import com.yxt.supervise.report.biz.csmcashlog.CsmCashLogService; +import com.yxt.supervise.report.biz.csmcashreportcashedtoday.CsmCashReportCashedTodayService; +import com.yxt.supervise.report.biz.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayService; import io.swagger.annotations.Api; +import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.util.ResourceUtils; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.*; + +import static com.yxt.supervise.report.biz.util.WordUtil.exportWord; + + /** * @author wangpengfei * @date 2023/6/21 10:51 @@ -18,6 +38,16 @@ import org.springframework.web.bind.annotation.*; public class CsmCashReportRest { @Autowired CsmCashReportService csmCashReportService; + @Autowired + CsmCashReportCashedTodayService csmCashReportCashedTodayService; + @Autowired + CsmCashReportSalesYesterdayService csmCashReportSalesYesterdayService; + @Autowired + CsmCashLogService csmCashLogService; + + private static final String TEMPLATE_FILE_NAME="C:\\Users\\www19\\Desktop\\每日回款审核报告模版.docx"; + @Value("${image.url.prefix:http://127.0.0.1:8080/upload/}") + private String urlPrefix; @PostMapping("/save") @@ -35,4 +65,32 @@ public class CsmCashReportRest { ResultBean rb = ResultBean.fireFail(); return csmCashReportService.getCsmReportByComSid(query); } + + @GetMapping(value = "/download") + public void test() throws Exception{ + //获取模板文档 + //InputStream ins = this.getClass().getResourceAsStream("C:\\Users\\www19\\Desktop\\每日回款审核报告.docx"); + //填充数据 + String dataDate="2023-06-14"; + //准备数据 + Map params =csmCashReportService.getCsmReport(dataDate); + List> yesterdayList =csmCashReportSalesYesterdayService.getCsmReport(dataDate); + List> todayList=csmCashReportCashedTodayService.getCsmReport(dataDate); + CsmCashLog log=csmCashLogService.getOne(new QueryWrapper().eq("dataDate",dataDate)); + params.put("todayList",todayList); + params.put("yesterday",yesterdayList); + XWPFDocument word = WordExportUtil.exportWord07(TEMPLATE_FILE_NAME,params); + String newFileName = "每日回款审核报告" + dataDate + ".docx"; + String url ="C:\\Users\\www19\\Desktop\\"+newFileName; + //String url = urlPrefix + newFileName; + + //log.setFileFullPath(url); +// csmCashLogService.update(log,new QueryWrapper().eq("dataDate",dataDate)); + FileOutputStream out = new FileOutputStream(new File(url)); + word.write(out); + out.close(); + } + + + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportService.java index 110e7f97..360359f3 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportService.java @@ -6,10 +6,15 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.report.api.csmcashreport.CsmCashReport; import com.yxt.supervise.report.api.csmcashreport.CsmCashReportDto; import com.yxt.supervise.report.api.csmcashreport.CsmCashReportQuery; +import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo; import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStore; import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStoreDto; +import org.junit.Test; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; + /** * @author wangpengfei * @date 2023/6/21 10:51 @@ -34,8 +39,16 @@ public class CsmCashReportService extends MybatisBaseService getCsmReport(String dataDate) { + ResultBean rb=new ResultBean(); + Map map=baseMapper.getCsmReport(dataDate); + return map; + + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.java index 70941364..a611a28e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** * @author wangpengfei @@ -27,4 +28,6 @@ public interface CsmCashReportCashedTodayMapper extends BaseMapper getCsmReportTodayByComSid (@Param("date") String date, @Param("name") String name ); + + List> getCsmReport(@Param("dataDate") String dataDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.xml index 2819b8a4..869d4e96 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.xml @@ -4,5 +4,7 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayService.java index 547ffcf5..8a38ec28 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayService.java @@ -13,6 +13,9 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + /** * @author wangpengfei * @date 2023/6/21 10:56 @@ -36,4 +39,15 @@ public class CsmCashReportCashedTodayService extends MybatisBaseService> getCsmReport(String dataDate) { + ResultBean rb=new ResultBean(); + List> map=baseMapper.getCsmReport(dataDate); + return map; + + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.java index 97ebab95..599077ba 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** * @author wangpengfei @@ -23,4 +24,6 @@ public interface CsmCashReportSalesYesterdayMapper extends BaseMapper getCsmReportYesterdayByComSid (@Param("date") String date, @Param("name") String name ); + + List> getCsmReport(@Param("dataDate") String dataDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.xml index 0c6b4ee1..8268dbe1 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.xml @@ -4,5 +4,7 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayService.java index e507fafd..c5edc007 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayService.java @@ -9,6 +9,9 @@ import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSal import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayQuery; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** * @author wangpengfei * @date 2023/6/21 10:57 @@ -30,4 +33,16 @@ public class CsmCashReportSalesYesterdayService extends MybatisBaseService> getCsmReport(String dataDate) { + ResultBean rb=new ResultBean(); + List> map=baseMapper.getCsmReport(dataDate); + return map; + + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java index b9209fb3..d7d734c9 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java @@ -66,34 +66,35 @@ public class ReportInventoryRest implements ReportInventoryDayGatherFeign { } return rb.success().setData(pv); } - // - @GetMapping("/getReportInventoryDayGathers") - public ResultBean getReportInventoryDayGathers(String orderDate){ - ResultBean rb = ResultBean.fireFail(); - ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate); - if(null==pv){ - return rb.success().setData(new ArrayList<>()); - } - return rb.success().setData(pv); - } - @GetMapping("/getReportInventoryDayStores") - public ResultBean getReportInventoryDayStores(String orderDate){ - ResultBean rb = ResultBean.fireFail(); - ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate); - if(null==pv){ - return rb.success().setData(new ArrayList<>()); - } - return rb.success().setData(pv); - } - @GetMapping("/getReportInventoryDayToStores") - public ResultBean getReportInventoryDayToStores(String orderDate){ - ResultBean rb = ResultBean.fireFail(); - ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate); - if(null==pv){ - return rb.success().setData(new ArrayList<>()); - } - return rb.success().setData(pv); - } +// // +// @GetMapping("/getReportInventoryDayGathers") +// public ResultBean getReportInventoryDayGathers(String orderDate){ +// ResultBean rb = ResultBean.fireFail(); +// ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate); +// if(null==pv){ +// return rb.success().setData(new ArrayList<>()); +// } +// pv.setDownloadUrl("http://8.130.39.13:7003/upload/kchzb/库存汇总表"+orderDate+".xlsx"); +// return rb.success().setData(pv); +// } +// @GetMapping("/getReportInventoryDayStores") +// public ResultBean getReportInventoryDayStores(String orderDate){ +// ResultBean rb = ResultBean.fireFail(); +// ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate); +// if(null==pv){ +// return rb.success().setData(new ArrayList<>()); +// } +// return rb.success().setData(pv); +// } +// @GetMapping("/getReportInventoryDayToStores") +// public ResultBean getReportInventoryDayToStores(String orderDate){ +// ResultBean rb = ResultBean.fireFail(); +// ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate); +// if(null==pv){ +// return rb.success().setData(new ArrayList<>()); +// } +// return rb.success().setData(pv); +// } //下载excel @GetMapping("/downloadExcel/{orderDate}") public ResultBean downloadExcel(@PathVariable("orderDate") String orderDate) { diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java index 8bd576b9..363f5805 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java @@ -35,6 +35,7 @@ public class ReportInventoryWxRest { if(null==gather){ return rb.success().setData(new ArrayList<>()); } + gather.setDownloadUrl("http://8.130.39.13:7003/upload/kchzb/库存汇总表"+orderDate+".xlsx"); return rb.success().setData(gather); } @GetMapping("/getReportInventoryDayStore/{orderDate}") diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/util/WordUtil.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/util/WordUtil.java new file mode 100644 index 00000000..8bb0a05b --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/util/WordUtil.java @@ -0,0 +1,108 @@ +package com.yxt.supervise.report.biz.util; + +import cn.afterturn.easypoi.word.WordExportUtil; +import org.apache.poi.xwpf.usermodel.XWPFDocument; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/7/10 10:16 + */ +public class WordUtil { + + + /** + * 导出word（2007版本docx） + * + * @param templateWordPath + * @param dataMap + * @return + * @throws Exception + */ + public static byte[] exportWord(String templateWordPath, Map dataMap) throws Exception { + File tf = new File(templateWordPath); + if (!tf.exists() || !tf.isFile()) { + throw new RuntimeException("File [" + templateWordPath + "] Not Found Or Not File."); + } + XWPFDocument document = WordExportUtil.exportWord07(templateWordPath, dataMap); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + document.write(bos); + return bos.toByteArray(); + } + + public static void main(String[] args) { + try { + try (FileOutputStream fos = new FileOutputStream("C:\\Users\\www19\\Desktop\\666.docx")) { + Map dataMap = new HashMap<>(); + Map params =new HashMap<>(); + params.put("bankName","测试站点"); + params.put("CompanyName", "2022-4-1"); + params.put("salesAmountYesterday ", "5"); + params.put("cashedAmountToday ", "100"); + params.put("cashedAmountTodayReal ", "50"); + params.put("cashedAmountDifferent ", "22"); + params.put("tillTime ", "测试学校-55556555"); + params.put("accountBalance ", "测试学校-55556555"); + params.put("auditResult ", "测试学校-55556555"); + params.put("reportDate ", "测试学校-55556555"); + dataMap.put("params", params); + + List todayList =new ArrayList<>(); + Map resultListParams =new HashMap<>(); + Map resultListParams2 =new HashMap<>(); + resultListParams.put("salesDate","1"); + resultListParams2.put("salesDate","2"); + resultListParams.put("disbursementChannelName","测试1"); + resultListParams2.put("disbursementChannelName","测试2"); + resultListParams.put("amount","111"); + resultListParams2.put("amount","222"); + resultListParams.put("companyName","xx1"); + resultListParams2.put("companyName","xx2"); + resultListParams.put("cashedAmount","je1"); + resultListParams2.put("cashedAmount","je2"); + resultListParams.put("differentAmount","hh1"); + resultListParams2.put("differentAmount","hh2"); + resultListParams.put("remarks","hh1"); + resultListParams2.put("remarks","hh2"); + todayList.add(resultListParams); + todayList.add(resultListParams2); + List yesterdayList =new ArrayList<>(); + Map resultListParams3 =new HashMap<>(); + Map resultListParams4 =new HashMap<>(); + resultListParams3.put("disbursementChannelName","1"); + resultListParams4.put("disbursementChannelName","2"); + resultListParams3.put("amount","测试1666"); + resultListParams4.put("amount","测试2666"); + resultListParams3.put("companyName","xx16666"); + resultListParams4.put("companyName","xx26666"); + resultListParams3.put("accountCycle","je16666"); + resultListParams4.put("accountCycle","je26666"); + yesterdayList.add(resultListParams3); + yesterdayList.add(resultListParams4); + + dataMap.put("todayList", todayList); + dataMap.put("yesterday",yesterdayList); + + byte[] doc = exportWord("C:\\Users\\www19\\Desktop\\每日回款审核报告.docx", dataMap); + + fos.write(doc); + + fos.flush(); + + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + + + +}