烟草订单明细表，烟草商品到货明细表，订单明细表接口

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReport.java

@@ -0,0 +1,41 @@
+package com.yxt.supervise.portal.api.supplierarrivalreport;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/19 13:40
+ */
+@Data
+@ApiModel(value = "销售信息", description = "销售信息")
+@TableName("purchase_requisition_tobacco")
+public class SupplierArrivalReport extends BaseEntity {
+    @ApiModelProperty("订单编号")
+    private String code;
+    @ApiModelProperty("订单时间")
+    //订单时间
+    private String purchaseDate;
+    @ApiModelProperty("到货时间")
+    //到货时间
+    private String arrivalDate;
+    @ApiModelProperty("供货商名称")
+    //供货商名称
+    private String supplierName;
+    @ApiModelProperty("放款金额")
+    //放款金额
+    private String loanAmount;
+    @ApiModelProperty("订单金额")
+    //订单金额
+    private String orderAmount;
+    @ApiModelProperty("实际到货")
+    //实际到货
+    private String actualArrival;
+    @ApiModelProperty("在途")
+    //在途
+    private String transit;
+
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportFeign.java

@@ -0,0 +1,8 @@
+package com.yxt.supervise.portal.api.supplierarrivalreport;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/19 13:57
+ */
+public interface SupplierArrivalReportFeign {
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.supervise.portal.api.supplierarrivalreport;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/19 13:41
+ */
+@Data
+public class SupplierArrivalReportQuery implements Query {
+    private String  date;
+}

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportVo.java

@@ -0,0 +1,46 @@
+package com.yxt.supervise.portal.api.supplierarrivalreport;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/19 13:41
+ */
+@Data
+public class SupplierArrivalReportVo implements Vo {
+
+    @ApiModelProperty("订单编号")
+    private String code;
+    //订单时间
+    @ApiModelProperty("订单时间")
+    private String purchaseDate;
+    //到货时间
+    @ApiModelProperty("到货时间")
+    private String arrivalDate;
+    //供货商名称
+    @ApiModelProperty("供货商名称")
+    private String supplierName;
+    //放款金额
+    @ApiModelProperty("放款金额")
+    private String loanAmount;
+    //订单金额
+    @ApiModelProperty("订单金额")
+    private String orderAmount;
+    //实际到货
+    @ApiModelProperty("实际到货")
+    private String actualArrival;
+    //在途
+    @ApiModelProperty("在途")
+    private String transit;
+    //销售渠道
+    private String storeName;
+    //订单到货价值
+    private String orderArrivalAmount;
+    //超出
+    private String exceed;
+
+
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportRest.java

@@ -77,6 +77,7 @@ public class GdSalesReportRest {
         FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
         //填写数据
         excelWriter.fill(excelVos, fillConfig, writeSheet);
+        //excelWriter.fill(excelVos, writeSheet);
         // 写入list之前的数据
         Map<String, Object> map = new HashMap<String, Object>();
         Date date = new Date();
@@ -107,15 +108,15 @@ public class GdSalesReportRest {
         excelWriter.write(totalListList,writeSheet1);
         //2
         List<GoodsSalesReportExcelVo>goodsSalesReportExcelVos= gdSalesReportService.getAllGoodsSalesReport(pq);
-        List<CellRangeAddress> Goodlist = new ArrayList<>();
         WriteSheet writeSheetGood = EasyExcel.writerSheet(1).build();
         // 填写配置，forceNewRow true表示自动创建一行，后面的数据后移
         //FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
         //填写数据
         excelWriter.fill(goodsSalesReportExcelVos, fillConfig, writeSheetGood);
+        //excelWriter.fill(goodsSalesReportExcelVos, writeSheetGood);
         // 写入list之前的数据
         map.put("storeNum",goodsSalesReportExcelVos.size());
-        excelWriter.fill(map, writeSheet);
+        excelWriter.fill(map, writeSheetGood);
 //      list 后面还有个统计 想办法手动写入
 //      这里偷懒直接用list 也可以用对象
         List<List<String>> totalListList1 = ListUtils.newArrayList();
@@ -134,20 +135,11 @@ public class GdSalesReportRest {
         totalList1.add("统计:");
         totalList1.add(String.valueOf(total));
         // 这里是write 别和fill 搞错了
-        List<CellRangeAddress> list7 = new ArrayList<>();
+        excelWriter.write(totalListList1,writeSheetGood);
-        //new CellRangeAddress(开始行，结束行，开始列，结束列)
-        list7.add(new CellRangeAddress(excelVos.size()+1, excelVos.size()+2, 0, 4));
-        WriteSheet writeSheet7 = EasyExcel.writerSheet(1).registerWriteHandler(new MyHandler(0,list7)).build();
-        excelWriter.write(totalListList1,writeSheet7);
-
 
-        //excelWriter.fill(totalList,writeSheet1);
         excelWriter.finish();
         outputStream.flush();
         outputStream.close();
-    }
-    public void publicExport(){
-
     }
     @PostMapping("/getGoodsSalesReport")
     public ResultBean<GdSalesReportVo> getGoodsSalesReport(@RequestBody PagerQuery<GdSalesReportQuery> pq){

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportMapper.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.portal.biz.supplierarrivalreport;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.supplierarrivalreport.SupplierArrivalReport;
+import com.yxt.supervise.portal.api.supplierarrivalreport.SupplierArrivalReportVo;
+import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/14 11:05
+ */
+@Mapper
+public interface SupplierArrivalReportMapper extends BaseMapper<SupplierArrivalReport> {
+
+    IPage<SupplierArrivalReportVo> listPage(IPage<SupplierArrivalReport> page, @Param(Constants.WRAPPER) Wrapper<SupplierArrivalReport> qw);
+    IPage<SupplierArrivalReportVo> arrivalGoodsYc(IPage<SupplierArrivalReport> page, @Param(Constants.WRAPPER) Wrapper<SupplierArrivalReport> qw);
+    IPage<SupplierArrivalReportVo> supplierOrder(IPage<SupplierArrivalReport> page, @Param(Constants.WRAPPER) Wrapper<SupplierArrivalReport> qw);
+    IPage<SupplierArrivalReportVo> arrivalGoods(IPage<SupplierArrivalReport> page, @Param(Constants.WRAPPER) Wrapper<SupplierArrivalReport> qw);
+
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportMapper.xml

@@ -0,0 +1,40 @@
+<?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.portal.biz.supplierarrivalreport.SupplierArrivalReportMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="listPage" resultType="com.yxt.supervise.portal.api.supplierarrivalreport.SupplierArrivalReportVo">
+        SELECT
+        ba.code as code,ba.purchaseDate as purchaseDate,ba.arrivalDate as arrivalDate,ba.supplierName as supplierName,ROUND(sum(de.price),2) as orderAmount
+        FROM
+        purchase_requisition_tobacco ba
+        LEFT JOIN purchase_requisition_store st ON ba.sid = st.mainSid
+        LEFT JOIN purchase_requisition_tobacco_details de ON st.sid = de.mainSid
+        <where> ${ew.sqlSegment} </where>
+        GROUP BY ba.code
+    </select>
+    <select id="arrivalGoodsYc" resultType="com.yxt.supervise.portal.api.supplierarrivalreport.SupplierArrivalReportVo">
+        SELECT
+        ba.supplierName as supplierName,ROUND(sum(de.price),2) as orderAmount,st.storeName
+        FROM
+        purchase_requisition_tobacco ba
+        LEFT JOIN purchase_requisition_store st ON ba.sid = st.mainSid
+        LEFT JOIN purchase_requisition_tobacco_details de ON st.sid = de.mainSid
+        <where> ${ew.sqlSegment} </where>
+        GROUP BY st.storeCode
+    </select>
+    <select id="supplierOrder" resultType="com.yxt.supervise.portal.api.supplierarrivalreport.SupplierArrivalReportVo">
+        select re.supplierName ,re.code ,ROUND(sum(pro.totalPrice),2) as orderAmount,re.purchaseDate,re.arrivalDate from purchase_requisition re
+        left join  purchase_requisition_pro pro on re.sid =pro.mainSid
+        <where> ${ew.sqlSegment} </where>
+        GROUP BY re.supplierCode
+    </select>
+
+    <select id="arrivalGoods" resultType="com.yxt.supervise.portal.api.supplierarrivalreport.SupplierArrivalReportVo">
+        select re.supplierName ,re.code ,ROUND(sum(pro.totalPrice),2) as orderAmount,re.purchaseDate,re.arrivalDate from purchase_requisition re
+        left join  purchase_requisition_pro pro on re.sid =pro.mainSid
+        <where> ${ew.sqlSegment} </where>
+        GROUP BY re.supplierCode
+    </select>
+
+</mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportRest.java

@@ -0,0 +1,47 @@
+package com.yxt.supervise.portal.biz.supplierarrivalreport;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.supplierarrivalreport.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/14 11:05
+ */
+@RestController
+@RequestMapping("/supplierarrivalreport")
+public class SupplierArrivalReportRest {
+    @Autowired
+    SupplierArrivalReportService supplierArrivalReportService;
+
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SupplierArrivalReportVo>>listPage(@RequestBody PagerQuery<SupplierArrivalReportQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<SupplierArrivalReportVo> pv = supplierArrivalReportService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/arrivalGoodsYc")
+    public ResultBean<PagerVo<SupplierArrivalReportVo>>arrivalGoodsYc(@RequestBody PagerQuery<SupplierArrivalReportQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<SupplierArrivalReportVo> pv = supplierArrivalReportService.arrivalGoodsYc(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/supplierOrder")
+    public ResultBean<PagerVo<SupplierArrivalReportVo>>supplierOrder(@RequestBody PagerQuery<SupplierArrivalReportQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<SupplierArrivalReportVo> pv = supplierArrivalReportService.supplierOrder(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/arrivalGoods")
+    public ResultBean<PagerVo<SupplierArrivalReportVo>>arrivalGoods(@RequestBody PagerQuery<SupplierArrivalReportQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<SupplierArrivalReportVo> pv = supplierArrivalReportService.supplierOrder(pq);
+        return rb.success().setData(pv);
+    }
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportService.java

@@ -0,0 +1,78 @@
+package com.yxt.supervise.portal.biz.supplierarrivalreport;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.supplierarrivalreport.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/14 11:05
+ */
+@Service
+public class SupplierArrivalReportService extends MybatisBaseService<SupplierArrivalReportMapper, SupplierArrivalReport> {
+
+    @Autowired
+    SupplierArrivalReportMapper SupplierArrivalReportMapper;
+    public PagerVo<SupplierArrivalReportVo> listPage(PagerQuery<SupplierArrivalReportQuery> pq) {
+        SupplierArrivalReportQuery query = pq.getParams();
+        QueryWrapper<SupplierArrivalReport> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getDate())) {
+                qw.eq("STR_TO_DATE(ba.createTime,'%Y-%m-%d')", query.getDate());
+            }
+        }
+        IPage<SupplierArrivalReport> page = PagerUtil.queryToPage(pq);
+        IPage<SupplierArrivalReportVo> pagging = baseMapper.listPage(page,qw);
+        PagerVo<SupplierArrivalReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public PagerVo<SupplierArrivalReportVo> arrivalGoodsYc(PagerQuery<SupplierArrivalReportQuery> pq) {
+        SupplierArrivalReportQuery query = pq.getParams();
+        QueryWrapper<SupplierArrivalReport> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getDate())) {
+                qw.eq("STR_TO_DATE(ba.createTime,'%Y-%m-%d')", query.getDate());
+            }
+        }
+        IPage<SupplierArrivalReport> page = PagerUtil.queryToPage(pq);
+        IPage<SupplierArrivalReportVo> pagging = baseMapper.arrivalGoodsYc(page,qw);
+        PagerVo<SupplierArrivalReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public PagerVo<SupplierArrivalReportVo> supplierOrder(PagerQuery<SupplierArrivalReportQuery> pq) {
+        SupplierArrivalReportQuery query = pq.getParams();
+        QueryWrapper<SupplierArrivalReport> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getDate())) {
+                qw.eq("STR_TO_DATE(re.createTime,'%Y-%m-%d')", query.getDate());
+            }
+        }
+        IPage<SupplierArrivalReport> page = PagerUtil.queryToPage(pq);
+        IPage<SupplierArrivalReportVo> pagging = baseMapper.supplierOrder(page,qw);
+        PagerVo<SupplierArrivalReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public PagerVo<SupplierArrivalReportVo> arrivalGoods(PagerQuery<SupplierArrivalReportQuery> pq) {
+        SupplierArrivalReportQuery query = pq.getParams();
+        QueryWrapper<SupplierArrivalReport> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getDate())) {
+                qw.eq("STR_TO_DATE(re.createTime,'%Y-%m-%d')", query.getDate());
+            }
+        }
+        IPage<SupplierArrivalReport> page = PagerUtil.queryToPage(pq);
+        IPage<SupplierArrivalReportVo> pagging = baseMapper.supplierOrder(page,qw);
+        PagerVo<SupplierArrivalReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+}