每日回款审核生成word

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;
+
+}

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;
+}

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;
+}

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;
+}

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;
 }

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;
 
     //小程序参数
 

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<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate);
-    @GetMapping("/getReportInventoryDayStores")
-    @ResponseBody
-    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate);
-    @GetMapping("/getReportInventoryDayToStores")
-    @ResponseBody
-    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate);
+//    @GetMapping("/getReportInventoryDayGathers")
+//    @ResponseBody
+//    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate);
+//    @GetMapping("/getReportInventoryDayStores")
+//    @ResponseBody
+//    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate);
+//    @GetMapping("/getReportInventoryDayToStores")
+//    @ResponseBody
+//    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate);
 }

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<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate) {
-        return null;
-    }
-
-    @Override
-    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate) {
-        return null;
-    }
-
-    @Override
-    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate) {
-        return null;
-    }
+//    @Override
+//    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate) {
+//        return null;
+//    }
+//
+//    @Override
+//    public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate) {
+//        return null;
+//    }
+//
+//    @Override
+//    public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate) {
+//        return null;
+//    }
 }

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<ReportInventoryDayGatherVo> list;
 }

yxt_supervise/supervise-report/supervise-report-biz/pom.xml

@@ -92,6 +92,33 @@
             <classifier>jdk15</classifier>
             <version>2.4</version>
         </dependency>
+
+
+
+
+
+        <!--easypoi  自动POI依赖版本为3.15-->
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <!--注意:word中要使用循环等标签必须单独导入以下依赖-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.0.0</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.cloud</groupId>-->
 <!--            <artifactId>spring-cloud-stream-binder-kafka</artifactId>-->

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<CsmCashLog> {
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashlog/CsmCashLogMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.report.biz.csmcashlog.CsmCashLogMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="getCsmReport" resultType="map">
+        select * from csm_cash_report_cashed_today where  dataDate=#{dataDate}
+    </select>
+</mapper>

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 {
+}

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<CsmCashLogMapper, CsmCashLog> {
+}

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<CsmCashReport> {
     @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<CsmCashReport> {
             "\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<String,Object> getCsmReport(@Param("dataDate") String dataDate);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.xml

@@ -4,5 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-
+    <select id="getCsmReport" resultType="map">
+        select * from csm_cash_report where  dataDate=#{dataDate}
+    </select>
 </mapper>

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<String,Object> params =csmCashReportService.getCsmReport(dataDate);
+        List<Map<String,Object>> yesterdayList =csmCashReportSalesYesterdayService.getCsmReport(dataDate);
+        List<Map<String,Object>> todayList=csmCashReportCashedTodayService.getCsmReport(dataDate);
+        CsmCashLog log=csmCashLogService.getOne(new QueryWrapper<CsmCashLog>().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<CsmCashLog>().eq("dataDate",dataDate));
+        FileOutputStream out = new FileOutputStream(new File(url));
+        word.write(out);
+        out.close();
+    }
+
+
+
 }

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<CsmCashReportMapper
         ResultBean rb=new ResultBean();
         String date=query.getDataDate();
         String name=query.getCompanyName();
-        return rb.success().setData(baseMapper.getCsmReportByComSid(date,name));
+        CsmCashReportVo csmCashReportVo=baseMapper.getCsmReportByComSid(date,name);
+        csmCashReportVo.setDownloadUrl("http://8.130.39.13:7003/upload/kchzb/每日回款审核报告"+date+".docx");
+        return rb.success().setData(csmCashReportVo);
 
     }
 
+    public Map<String,Object> getCsmReport(String dataDate) {
+        ResultBean rb=new ResultBean();
+        Map<String,Object> map=baseMapper.getCsmReport(dataDate);
+        return map;
+
+    }
 }

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<CsmCashReport
             "FROM\n" +
             "\tcsm_cash_report_cashed_today  where dataDate=#{date} ")
     List<CsmCashReportCashedTodayVo> getCsmReportTodayByComSid (@Param("date") String date, @Param("name") String name );
+
+    List<Map<String,Object>> getCsmReport(@Param("dataDate") String dataDate);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.xml

@@ -4,5 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-
+    <select id="getCsmReport" resultType="map">
+        select * from csm_cash_report_cashed_today where  dataDate=#{dataDate}
+    </select>
 </mapper>

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<CsmCashR
         return rb.success().setData(baseMapper.getCsmReportTodayByComSid(date,name));
 
     }
+    public ResultBean getCsmReportToday(String date,String name) {
+        ResultBean rb=new ResultBean();
+        return rb.success().setData(baseMapper.getCsmReportTodayByComSid(date,name));
+
+    }
+    public List<Map<String,Object>> getCsmReport(String dataDate) {
+        ResultBean rb=new ResultBean();
+        List<Map<String,Object>> map=baseMapper.getCsmReport(dataDate);
+        return map;
+
+    }
 }

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<CsmCashRep
             "\taccountCycle as cycle \n" +
             "FROM csm_cash_report_sales_yesterday where dataDate=#{date}")
     List<CsmCashReportSalesYesterdayVo> getCsmReportYesterdayByComSid (@Param("date") String date, @Param("name") String name );
+
+    List<Map<String,Object>> getCsmReport(@Param("dataDate") String dataDate);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.xml

@@ -4,5 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-
+    <select id="getCsmReport" resultType="map">
+        select * from csm_cash_report_sales_yesterday where  dataDate=#{dataDate}
+    </select>
 </mapper>

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<CsmCa
         return rb.success().setData(baseMapper.getCsmReportYesterdayByComSid(date,name));
 
     }
+    public ResultBean getCsmReportYesterday(String date,String name) {
+        ResultBean rb=new ResultBean();
+        return rb.success().setData(baseMapper.getCsmReportYesterdayByComSid(date,name));
+
+    }
+
+    public List<Map<String,Object>> getCsmReport(String dataDate) {
+        ResultBean rb=new ResultBean();
+        List<Map<String,Object>> map=baseMapper.getCsmReport(dataDate);
+        return map;
+
+    }
 }

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<ReportInventoryDayGatherVo> 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<ReportInventoryDayStoreVo> 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<ReportInventoryDayTobaccoStoreVo> 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<ReportInventoryDayGatherVo> 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<ReportInventoryDayStoreVo> 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<ReportInventoryDayTobaccoStoreVo> 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<String> downloadExcel(@PathVariable("orderDate") String orderDate) {

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}")

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<String, Object> 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<String, Object> dataMap = new HashMap<>();
+                Map<String,Object> 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<Map> todayList =new ArrayList<>();
+                Map<String,Object> resultListParams =new HashMap<>();
+                Map<String,Object> 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<Map> yesterdayList =new ArrayList<>();
+                Map<String,Object> resultListParams3 =new HashMap<>();
+                Map<String,Object> 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();
+        }
+    }
+
+
+
+
+}