供货商分页查询，销售数据分页查询

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSales.java

@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+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/3/28 15:05
+ */
+@Data
+@ApiModel(value = "销售数据", description = "销售数据")
+@TableName("gd_sales")
+public class GdSales extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode; // 企业组织机构代码证
+    @ApiModelProperty("订单类型")
+    private String orderType; // 订单类型
+    @ApiModelProperty("销售订单号")
+    private String orderNo; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("商品大类")
+    private String categoryb; // 商品大类
+    @ApiModelProperty("商品中类")
+    private String categorym; // 商品中类
+    @ApiModelProperty("商品小类")
+    private String categorys; // 商品小类
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDetailsVo.java

@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:16
+ */
+@Data
+@ApiModel(value = "销售数据 视图数据详情", description = "销售数据 视图数据详情")
+public class GdSalesDetailsVo implements Vo {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDto.java

@@ -0,0 +1,61 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:15
+ */
+@Data
+@ApiModel(value = "销售数据 数据传输对象", description = "销售数据 数据传输对象")
+public class GdSalesDto implements Dto {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private Date dataDate; // 数据日期
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeign.java

@@ -0,0 +1,28 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:19
+ */
+@Api(tags = "销售数据")
+@FeignClient(
+        contextId = "yxt-supervise-SalesData",
+        name = "yxt-supervise",
+        path = "v1/gdsales",
+        fallback = GdSalesFeignFallback.class)
+public interface GdSalesFeign {
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<GdSales>> listPage(@RequestBody PagerQuery<GdSalesQuery> pq);
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeignFallback.java

@@ -0,0 +1,21 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:20
+ */
+@Component
+public class GdSalesFeignFallback implements GdSalesFeign{
+
+    @Override
+    public ResultBean<PagerVo<GdSales>> listPage(PagerQuery<GdSalesQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口yxt-supervise/gdsales/listPage无法访问");
+
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesQuery.java

@@ -0,0 +1,62 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:21
+ */
+@Data
+@ApiModel(value = "销售数据 查询条件", description = "销售数据 查询条件")
+public class GdSalesQuery implements Query {
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+    //开始时间
+    private String startTime;
+    //结束时间
+    private String endTime;
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java

@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:21
+ */
+@Data
+@ApiModel(value = "销售数据 视图数据对象", description = "销售数据 视图数据对象")
+public class GdSalesVo implements Vo {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+    @ApiModelProperty("总价")
+    private String total;
+
+    public void setSaleNum(String saleNum){
+        int i=saleNum.indexOf(".");
+        if(i!=0){
+            String num=saleNum.substring(0,i);
+            this.saleNum=num;
+        }else{
+            this.saleNum=saleNum;
+        }
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndex.java

@@ -26,6 +26,7 @@
 package com.yxt.supervise.customer.api.supplierindex;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,7 +47,7 @@ import lombok.Data;
 @Data
 @ApiModel(value = "供货商编码对应表", description = "供货商编码对应表")
 @TableName("supplier_index")
-public class SupplierIndex {
+public class SupplierIndex extends EntityWithId {
     private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("编码")

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesMapper.java

@@ -0,0 +1,25 @@
+package com.yxt.supervise.customer.biz.gdsales;
+
+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.supervise.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:32
+ */
+@Mapper
+public interface GdSalesMapper extends BaseMapper<GdSales> {
+    //分页查询销售数据
+    IPage<GdSalesVo> selectPageVo(IPage<GdSales> page, @Param(Constants.WRAPPER) Wrapper<GdSales> qw);
+
+    //查询导出的数据
+    List<GdSalesVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdSales> qw);
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesMapper.xml

@@ -0,0 +1,42 @@
+<?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.customer.biz.gdsales.GdSalesMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdsales.GdSalesVo">
+        SELECT
+        s.orderType orderType,
+        s.prodCode prodCode,
+        s.prodName prodName,
+        s.brandCode brandCode,
+        s.brandName brandName,
+        0 + CAST(s.saleNum AS CHAR) as saleNum,
+        (s.saleNum* s.salePrice) as total,
+        s.storeCode storeCode,
+        s.dataDate dataDate,
+        i.name as storeName
+        FROM gd_sales s
+        left JOIN store_info i on  i.`code`= s.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdsales.GdSalesVo">
+        SELECT
+        s.orderType orderType,
+        s.prodCode prodCode,
+        s.prodName prodName,
+        s.brandCode brandCode,
+        s.brandName brandName,
+        s.saleNum saleNum,
+        s.storeCode storeCode,
+        i.name as storeName
+        FROM gd_sales
+        left JOIN store_info i on  i.`code`= s.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesRest.java

@@ -0,0 +1,63 @@
+package com.yxt.supervise.customer.biz.gdsales;
+
+import com.yxt.common.base.utils.ExportExcelUtils;
+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.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesFeign;
+import com.yxt.supervise.customer.api.gdsales.GdSalesQuery;
+import com.yxt.supervise.customer.api.gdsales.GdSalesVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:34
+ */
+@Api(tags = "销售数据")
+@RestController
+@RequestMapping("v1/gdsales")
+public class GdSalesRest implements GdSalesFeign {
+
+    @Autowired
+    private GdSalesService gdSalesService;
+    @Autowired
+    private HttpServletResponse response;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdSales>> listPage(PagerQuery<GdSalesQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdSalesVo> pv = gdSalesService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "订单列表导出")
+    public void exportExcel(@RequestBody PagerQuery<GdSalesQuery> pq) {
+        //得到所有要导出的数据
+        List<GdSalesVo> excelVos = gdSalesService.exportExcel(pq);
+        //定义导出的excel名字
+        String excelName = "销售数据";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //导出销售数据
+        ExportExcelUtils.export(fileNameURL, excelVos, GdSalesVo.class, response);
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesService.java

@@ -0,0 +1,76 @@
+package com.yxt.supervise.customer.biz.gdsales;
+
+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.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesQuery;
+import com.yxt.supervise.customer.api.gdsales.GdSalesVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:36
+ */
+@Slf4j
+@Service
+public class GdSalesService extends MybatisBaseService<GdSalesMapper, GdSales> {
+
+    public PagerVo<GdSalesVo> listPageVo(PagerQuery<GdSalesQuery> pq) {
+        GdSalesQuery query = pq.getParams();
+        QueryWrapper<GdSales> qw = new QueryWrapper<>();
+        //渠道
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.eq("s.storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.eq("s.prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("s.prodName", query.getProdName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandName())) {
+                qw.like("s.brandName", query.getBrandName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandCode())) {
+                qw.eq("s.brandCode", query.getBrandCode());
+            }
+            //时间
+//            if (StringUtils.isNotBlank(query.getBrandCode())) {
+//                if(!query.getStartTime().isEmpty()){
+//                    if(query.getEndTime().isEmpty()){
+//
+//                    }else{
+//                    }
+//                }
+//                qw.eq("s.brandCode", query.getStartTime());
+//            }
+        }
+
+        IPage<GdSales> page = PagerUtil.queryToPage(pq);
+        IPage<GdSalesVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdSalesVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    public List<GdSalesVo> exportExcel(PagerQuery<GdSalesQuery> pq) {
+        GdSalesQuery query = pq.getParams();
+//        if (query != null) {
+//            if (StringUtils.isNotBlank(query.getName())) {
+//                qw.like("name", query.getName());
+//            }
+//        }
+        QueryWrapper<GdSales> qw = new QueryWrapper<>();
+        List<GdSalesVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java

@@ -35,6 +35,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.customer.api.supplierbankinfo.*;
 import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
+import com.yxt.supervise.customer.api.supplierindex.SupplierIndexQuery;
 import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService;
 import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +92,11 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
 	public PagerVo<SupplierBankInfoVo> listPageVo(PagerQuery<SupplierBankInfoQuery> pq) {
 		SupplierBankInfoQuery query = pq.getParams();
 		QueryWrapper<SupplierBankInfo> qw = createQueryWrapper(query);
+		SupplierBankInfoQuery params = pq.getParams();
+		String name = params.getName();
+		if(StringUtils.isNotBlank(name)){
+			qw.like("i.name",name);
+		}
 		IPage<SupplierBankInfo> page = PagerUtil.queryToPage(pq);
 		IPage<SupplierBankInfoVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<SupplierBankInfoVo> p = PagerUtil.pageToVo(pagging, null);

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexRest.java

@@ -124,7 +124,7 @@ public class SupplierIndexRest implements SupplierIndexFeign {
     @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
-		supplierIndexService.delBySids(sids);
+		//supplierIndexService.delBySids(sids);
 		return rb.success();
 	}
 

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java

@@ -3,12 +3,13 @@ package com.yxt.supervise.customer.biz.supplierindex;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.customer.api.supplierindex.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -16,7 +17,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class SupplierIndexService extends MybatisBaseService<SupplierIndexMapper, SupplierIndex> {
+public class SupplierIndexService extends ServiceImpl<SupplierIndexMapper, SupplierIndex> {
 
     private static Map<String, String> cacheCodeMap = null;
 
@@ -33,12 +34,12 @@ public class SupplierIndexService extends MybatisBaseService<SupplierIndexMapper
         return map;
     }
 
-    public SupplierIndexDetailsVo fetchDetailsVoBySid(String sid) {
+//    public SupplierIndexDetailsVo fetchDetailsVoBySid(String sid) {
-        SupplierIndex entity = fetchBySid(sid);
+//        SupplierIndex entity = fetchBySid(sid);
-        SupplierIndexDetailsVo vo = new SupplierIndexDetailsVo();
+//        SupplierIndexDetailsVo vo = new SupplierIndexDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
+//        BeanUtil.copyProperties(entity, vo);
-        return vo;
+//        return vo;
-    }
+//    }
 
 
     public List<SupplierIndexDetailsVo> fetchDetailsVosBycodeUnified(String codeUnified) {
@@ -57,8 +58,13 @@ public class SupplierIndexService extends MybatisBaseService<SupplierIndexMapper
     }
 
     public PagerVo<SupplierIndexVo> listPageVo(PagerQuery<SupplierIndexQuery> pq) {
-        SupplierIndexQuery query = pq.getParams();
+//        SupplierIndexQuery query = pq.getParams();
-        QueryWrapper<SupplierIndex> qw = createQueryWrapper(query);
+        QueryWrapper<SupplierIndex> qw = new QueryWrapper<>();
+        SupplierIndexQuery params = pq.getParams();
+        String name = params.getName();
+        if(StringUtils.isNotBlank(name)){
+            qw.like("i.name",name);
+        }
         IPage<SupplierIndex> page = PagerUtil.queryToPage(pq);
         IPage<SupplierIndexVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<SupplierIndexVo> p = PagerUtil.pageToVo(pagging, null);
@@ -83,15 +89,15 @@ public class SupplierIndexService extends MybatisBaseService<SupplierIndexMapper
         baseMapper.insert(entity);
     }
 
-    public void updateByDto(SupplierIndexDto dto) {
+//    public void updateByDto(SupplierIndexDto dto) {
-        String dtoSid = dto.getSid();
+//        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
+//        if (StringUtils.isBlank(dtoSid)) {
-            return;
+//            return;
-        }
+//        }
-        SupplierIndex entity = fetchBySid(dtoSid);
+//        SupplierIndex entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
+//        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
+//        baseMapper.updateById(entity);
-    }
+//    }
 
     public void insertSupplierIndex(SupplierIndex si) {
         baseMapper.insertSupplierIndex(si);