diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReport.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReport.java new file mode 100644 index 00000000..4a50914f --- /dev/null +++ b/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; + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportFeign.java new file mode 100644 index 00000000..5787b9f3 --- /dev/null +++ b/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 { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportQuery.java new file mode 100644 index 00000000..fc65b91c --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportVo.java new file mode 100644 index 00000000..d48b8b47 --- /dev/null +++ b/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; + + + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportRest.java index f887aba7..fb08178a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportRest.java +++ b/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 map = new HashMap(); Date date = new Date(); @@ -107,15 +108,15 @@ public class GdSalesReportRest { excelWriter.write(totalListList,writeSheet1); //2 ListgoodsSalesReportExcelVos= gdSalesReportService.getAllGoodsSalesReport(pq); - List 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> totalListList1 = ListUtils.newArrayList(); @@ -134,20 +135,11 @@ public class GdSalesReportRest { totalList1.add("统计:"); totalList1.add(String.valueOf(total)); // 这里是write 别和fill 搞错了 - List list7 = new ArrayList<>(); - //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.write(totalListList1,writeSheetGood); - //excelWriter.fill(totalList,writeSheet1); excelWriter.finish(); outputStream.flush(); outputStream.close(); - } - public void publicExport(){ - } @PostMapping("/getGoodsSalesReport") public ResultBean getGoodsSalesReport(@RequestBody PagerQuery pq){ diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportMapper.java new file mode 100644 index 00000000..9be53482 --- /dev/null +++ b/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 { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage arrivalGoodsYc(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage supplierOrder(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage arrivalGoods(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportMapper.xml new file mode 100644 index 00000000..92a0b763 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportRest.java new file mode 100644 index 00000000..68aaa7ee --- /dev/null +++ b/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>listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = supplierArrivalReportService.listPage(pq); + return rb.success().setData(pv); + } + @PostMapping("/arrivalGoodsYc") + public ResultBean>arrivalGoodsYc(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = supplierArrivalReportService.arrivalGoodsYc(pq); + return rb.success().setData(pv); + } + @PostMapping("/supplierOrder") + public ResultBean>supplierOrder(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = supplierArrivalReportService.supplierOrder(pq); + return rb.success().setData(pv); + } + @PostMapping("/arrivalGoods") + public ResultBean>arrivalGoods(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = supplierArrivalReportService.supplierOrder(pq); + return rb.success().setData(pv); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierarrivalreport/SupplierArrivalReportService.java new file mode 100644 index 00000000..783823d2 --- /dev/null +++ b/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 { + + @Autowired + SupplierArrivalReportMapper SupplierArrivalReportMapper; + public PagerVo listPage(PagerQuery pq) { + SupplierArrivalReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(query!=null) { + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(ba.createTime,'%Y-%m-%d')", query.getDate()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page,qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public PagerVo arrivalGoodsYc(PagerQuery pq) { + SupplierArrivalReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(query!=null) { + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(ba.createTime,'%Y-%m-%d')", query.getDate()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.arrivalGoodsYc(page,qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public PagerVo supplierOrder(PagerQuery pq) { + SupplierArrivalReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(query!=null) { + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(re.createTime,'%Y-%m-%d')", query.getDate()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.supplierOrder(page,qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public PagerVo arrivalGoods(PagerQuery pq) { + SupplierArrivalReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(query!=null) { + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(re.createTime,'%Y-%m-%d')", query.getDate()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.supplierOrder(page,qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + +}