From b53057264a2d54406e380606118e008fc41c750d Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 31 Mar 2023 16:26:19 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E7=83=9F=E8=8D=89=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E7=83=9F=E8=8D=89=E9=94=80=E5=94=AE=E3=80=81?=
 =?UTF-8?q?=E7=83=9F=E8=8D=89=E5=BA=93=E5=AD=98=E6=9D=A1=E4=BB=B6=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/gdinstorageyc/GdInstorageYc.java      | 71 +++++++++++++++
 .../gdinstorageyc/GdInstorageYcDetailsVo.java | 67 ++++++++++++++
 .../api/gdinstorageyc/GdInstorageYcDto.java   | 67 ++++++++++++++
 .../gdinstorageyc/GdInstorageYcExcelVo.java   | 37 ++++++++
 .../api/gdinstorageyc/GdInstorageYcFeign.java | 27 ++++++
 .../GdInstorageYcFeignFallback.java           | 11 +++
 .../api/gdinstorageyc/GdInstorageYcQuery.java | 71 +++++++++++++++
 .../api/gdinstorageyc/GdInstorageYcVo.java    | 67 ++++++++++++++
 .../api/gdinventoryyc/GdInventoryYc.java      | 49 ++++++++++
 .../gdinventoryyc/GdInventoryYcDetailsVo.java | 47 ++++++++++
 .../api/gdinventoryyc/GdInventoryYcDto.java   | 47 ++++++++++
 .../gdinventoryyc/GdInventoryYcExcelVo.java   | 41 +++++++++
 .../api/gdinventoryyc/GdInventoryYcFeign.java | 18 ++++
 .../GdInventoryYcFeignFallback.java           | 12 +++
 .../api/gdinventoryyc/GdInventoryYcQuery.java | 52 +++++++++++
 .../api/gdinventoryyc/GdInventoryYcVo.java    | 47 ++++++++++
 .../customer/api/gdsales/GdSalesVo.java       | 86 +++++++++---------
 .../customer/api/gdsalesyc/GdSalesYc.java     | 57 ++++++++++++
 .../api/gdsalesyc/GdSalesYcDetailsVo.java     | 59 ++++++++++++
 .../customer/api/gdsalesyc/GdSalesYcDto.java  | 59 ++++++++++++
 .../api/gdsalesyc/GdSalesYcExcelVo.java       | 72 +++++++++++++++
 .../api/gdsalesyc/GdSalesYcFeign.java         | 18 ++++
 .../api/gdsalesyc/GdSalesYcFeignFallback.java | 11 +++
 .../api/gdsalesyc/GdSalesYcQuery.java         | 62 +++++++++++++
 .../customer/api/gdsalesyc/GdSalesYcVo.java   | 72 +++++++++++++++
 .../gdinstorageyc/GdInstorageYcMapper.java    | 24 +++++
 .../biz/gdinstorageyc/GdInstorageYcMapper.xml | 42 +++++++++
 .../biz/gdinstorageyc/GdInstorageYcRest.java  | 59 ++++++++++++
 .../gdinstorageyc/GdInstorageYcService.java   | 85 ++++++++++++++++++
 .../gdinventoryyc/GdInventoryYcMapper.java    | 26 ++++++
 .../biz/gdinventoryyc/GdInventoryYcMapper.xml | 42 +++++++++
 .../biz/gdinventoryyc/GdInventoryYcRest.java  | 59 ++++++++++++
 .../gdinventoryyc/GdInventoryYcService.java   | 89 ++++++++++++++++++
 .../biz/gdsalesyc/GdSalesYcMapper.java        | 27 ++++++
 .../biz/gdsalesyc/GdSalesYcMapper.xml         | 47 ++++++++++
 .../customer/biz/gdsalesyc/GdSalesYcRest.java | 61 +++++++++++++
 .../biz/gdsalesyc/GdSalesYcService.java       | 90 +++++++++++++++++++
 37 files changed, 1835 insertions(+), 43 deletions(-)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java

diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
new file mode 100644
index 00000000..da479ca7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:00
+ */
+@Data
+@ApiModel(value = "入库数据(烟草)", description = "入库数据(烟草)")
+@TableName("gd_instorage_yc")
+public class GdInstorageYc extends EntityWithId {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java
new file mode 100644
index 00000000..5adf9549
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+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/31 10:01
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 视图数据详情", description = "入库数据(烟草) 视图数据详情")
+public class GdInstorageYcDetailsVo implements Vo {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java
new file mode 100644
index 00000000..9d853ca8
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:01
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 数据传输对象", description = "入库数据(烟草) 数据传输对象")
+public class GdInstorageYcDto implements Dto {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java
new file mode 100644
index 00000000..9fc6e273
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+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/31 10:01
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) Excel视图数据对象", description = "入库数据(烟草) Excel视图数据对象")
+public class GdInstorageYcExcelVo implements Vo {
+    @ExcelProperty(value = "仓库/门店名称")
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    @ExcelProperty(value = "入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("商品名称")
+    @ExcelProperty(value = "商品名称")
+    private String coli8; // 商品名称
+    @ExcelProperty(value = "商品规格")
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ExcelProperty(value = "类别编号")
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ExcelProperty(value = "类别名称")
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ExcelProperty(value = "入库数量")
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java
new file mode 100644
index 00000000..89b53122
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java
@@ -0,0 +1,27 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+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.gdinstoragegd.GdInstorageGd;
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdFeignFallback;
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdQuery;
+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/31 10:01
+ */
+@Api(tags = "入库数据(烟草)")
+@FeignClient(
+        contextId = "yxt-supervise-GdInstorageYc",
+        name = "yxt-supervise",
+        path = "v1/gdinstorageyc",
+        fallback = GdInstorageYcFeignFallback.class)
+public interface GdInstorageYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java
new file mode 100644
index 00000000..92ed1b81
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:01
+ */
+@Component
+public class GdInstorageYcFeignFallback implements GdInstorageYcFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java
new file mode 100644
index 00000000..300147a5
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java
@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+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/31 10:02
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 查询条件", description = "入库数据(烟草) 查询条件")
+public class GdInstorageYcQuery implements Query {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+    @ApiModelProperty("开始时间")
+    private String startTime;
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java
new file mode 100644
index 00000000..38b068ff
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+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/31 10:02
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 视图数据对象", description = "入库数据(烟草) 视图数据对象")
+public class GdInstorageYcVo implements Vo {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java
new file mode 100644
index 00000000..711df5b6
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java
@@ -0,0 +1,49 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:31
+ */
+
+@Data
+@ApiModel(value = "国大库存数据(烟草)", description = "国大库存数据")
+@TableName("gd_inventory_yc")
+public class GdInventoryYc extends EntityWithId {
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java
new file mode 100644
index 00000000..47a65eb4
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+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/31 9:31
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 视图数据详情", description = "国大库存数据(烟草) 视图数据详情")
+public class GdInventoryYcDetailsVo implements Vo {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java
new file mode 100644
index 00000000..9ed57a77
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:31
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 数据传输对象", description = "国大库存数据(烟草) 数据传输对象")
+public class GdInventoryYcDto implements Dto {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java
new file mode 100644
index 00000000..bffc9345
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+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/31 9:32
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) Excel视图数据对象", description = "国大库存数据(烟草) Excel视图数据对象")
+public class GdInventoryYcExcelVo implements Vo {
+    @ExcelProperty(value = "仓库/门店编号")
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ExcelProperty(value = "仓库/门店名称")
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ExcelProperty(value = "商品编码")
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ExcelProperty(value = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ExcelProperty(value = "商品数量")
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ExcelProperty(value = "商品货值")
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ExcelProperty(value = "供应商")
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ExcelProperty(value = "数据日期")
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java
new file mode 100644
index 00000000..ae47beb2
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:32
+ */
+@Api(tags = "国大库存数据(烟草)")
+@FeignClient(
+        contextId = "yxt-supervise-GdInventoryYc",
+        name = "yxt-supervise",
+        path = "v1/gdinventoryyc",
+        fallback = GdInventoryYcFeignFallback.class)
+public interface GdInventoryYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java
new file mode 100644
index 00000000..0d85a658
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java
@@ -0,0 +1,12 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkFeign;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:32
+ */
+@Component
+public class GdInventoryYcFeignFallback implements GdInventoryYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java
new file mode 100644
index 00000000..0e5a20e9
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java
@@ -0,0 +1,52 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+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/31 9:32
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 查询条件", description = "国大库存数据(烟草) 查询条件")
+public class GdInventoryYcQuery implements Query {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+
+    @ApiModelProperty("开始时间")
+    private String startDate;
+    @ApiModelProperty("结束时间")
+    private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java
new file mode 100644
index 00000000..df6d1e0f
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+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/31 9:32
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 视图数据对象", description = "国大库存数据(烟草) 视图数据对象")
+public class GdInventoryYcVo implements Vo {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
index 501d5715..e8551a7c 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
@@ -13,70 +13,70 @@ import lombok.Data;
 @Data
 @ApiModel(value = "销售数据 视图数据对象", description = "销售数据 视图数据对象")
 public class GdSalesVo implements Vo {
-//    private String sid; // sid
-//
-//    @ApiModelProperty("创建者")
-//    private String createSid; // 创建者
-//    @ApiModelProperty("更新者")
-//    private String modifySid; // 更新者
-    @ExcelProperty(value = "销售订单号")
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+
     @ApiModelProperty("销售订单号")
     private String code; // 销售订单号
-    @ExcelProperty(value = "商品编码")
+
     @ApiModelProperty("商品编码")
     private String prodCode; // 商品编码
-//    @ApiModelProperty("商品条码")
-//    private String prodBarCode; // 商品条码
-    @ExcelProperty(value = "商品名称")
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+
     @ApiModelProperty("商品名称")
     private String prodName; // 商品名称
-    @ExcelProperty(value = "销售数量")
+
     @ApiModelProperty("销售数量")
     private String saleNum; // 销售数量
-//    @ApiModelProperty("销售渠道")
-//    private String storeCode; // 销售渠道
-    @ExcelProperty(value = "销售渠道")
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+
     @ApiModelProperty("销售渠道名称")
     private String storeName; // 销售渠道名称
-//    @ApiModelProperty("销售价格")
-//    private String salePrice; // 销售价格
-//    @ApiModelProperty("销售成本")
-//    private String saleCost; // 销售成本
-//    @ApiModelProperty("利润")
-//    private String profit; // 利润
-    @ExcelProperty(value = "数据日期")
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+
     @ApiModelProperty("数据日期")
     private String dataDate; // 数据日期
-    @ExcelProperty(value = "数据日期")
+
     @ApiModelProperty("类型")
     private String orderType; // 类型
-//    @ApiModelProperty("客户代码")
-//    private String customerCode; // 客户代码
-//    @ApiModelProperty("客户名称")
-//    private String customerName; // 客户名称
-    @ExcelProperty(value = "品牌编码")
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+
     @ApiModelProperty("品牌代码")
     private String brandCode; // 品牌代码
-    @ExcelProperty(value = "品牌名称")
+
     @ApiModelProperty("品牌名称")
     private String brandName; // 品牌名称
-//    @ApiModelProperty("大类")
-//    private String categoryb; // 大类
-//    @ApiModelProperty("种类")
-//    private String categorym; // 种类
-//    @ApiModelProperty("小类")
-//    private String categorys; // 小类
-    @ExcelProperty(value = "总价")
+    @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!=-1){
-            String num=saleNum.substring(0,i);
-            this.saleNum=num;
-        }else{
-            this.saleNum=saleNum;
+    public void setSaleNum(String saleNum) {
+        int i = saleNum.indexOf(".");
+        if (i != -1) {
+            String num = saleNum.substring(0, i);
+            this.saleNum = num;
+        } else {
+            this.saleNum = saleNum;
         }
     }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java
new file mode 100644
index 00000000..ae6bc6bc
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:48
+ */
+@Data
+@ApiModel(value = "销售数据(烟草)", description = "销售数据(烟草)")
+@TableName("gd_sales_yc")
+public class GdSalesYc extends EntityWithId {
+    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; // 数据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java
new file mode 100644
index 00000000..140ab7ec
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+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/31 8:48
+ */
+@Data
+@ApiModel(value = "销售数据(烟草) 视图数据详情", description = "销售数据(烟草) 视图数据详情")
+public class GdSalesYcDetailsVo 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; // 小类
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java
new file mode 100644
index 00000000..ce2e7408
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:49
+ */
+@Data
+@ApiModel(value = "销售数据 数据传输对象", description = "销售数据 数据传输对象")
+public class GdSalesYcDto 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 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; // 小类
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java
new file mode 100644
index 00000000..5cb8d72b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+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/31 8:49
+ */
+@Data
+@ApiModel(value = "销售数据 导出excel视图数据对象", description = "销售数据 导出excel视图数据对象")
+public class GdSalesYcExcelVo implements Vo {
+    //    private String sid; // sid
+//
+//    @ApiModelProperty("创建者")
+//    private String createSid; // 创建者
+//    @ApiModelProperty("更新者")
+//    private String modifySid; // 更新者
+    @ExcelProperty(value = "销售订单号")
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ExcelProperty(value = "商品编码")
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    //    @ApiModelProperty("商品条码")
+//    private String prodBarCode; // 商品条码
+    @ExcelProperty(value = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ExcelProperty(value = "销售数量")
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    //    @ApiModelProperty("销售渠道")
+//    private String storeCode; // 销售渠道
+    @ExcelProperty(value = "销售渠道")
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    //    @ApiModelProperty("销售价格")
+//    private String salePrice; // 销售价格
+//    @ApiModelProperty("销售成本")
+//    private String saleCost; // 销售成本
+//    @ApiModelProperty("利润")
+//    private String profit; // 利润
+    @ExcelProperty(value = "数据日期")
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ExcelProperty(value = "类型")
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    //    @ApiModelProperty("客户代码")
+//    private String customerCode; // 客户代码
+//    @ApiModelProperty("客户名称")
+//    private String customerName; // 客户名称
+    @ExcelProperty(value = "品牌编码")
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ExcelProperty(value = "品牌名称")
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    //    @ApiModelProperty("大类")
+//    private String categoryb; // 大类
+//    @ApiModelProperty("种类")
+//    private String categorym; // 种类
+//    @ApiModelProperty("小类")
+//    private String categorys; // 小类
+    @ExcelProperty(value = "总价")
+    @ApiModelProperty("总价")
+    private String total;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java
new file mode 100644
index 00000000..91c48921
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.yxt.supervise.customer.api.gdsales.GdSalesFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:49
+ */
+@Api(tags = "销售数据(烟草)")
+@FeignClient(
+        contextId = "yxt-supervise-SalesYcData",
+        name = "yxt-supervise",
+        path = "v1/gdsalesyc",
+        fallback = GdSalesYcFeignFallback.class)
+public interface GdSalesYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java
new file mode 100644
index 00000000..99a29421
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:49
+ */
+@Component
+public class GdSalesYcFeignFallback implements GdSalesYcFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java
new file mode 100644
index 00000000..48aaefd7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java
@@ -0,0 +1,62 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+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/31 8:50
+ */
+@Data
+@ApiModel(value = "销售数据(烟草) 查询条件", description = "销售数据(烟草) 查询条件")
+public class GdSalesYcQuery 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;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java
new file mode 100644
index 00000000..1d406337
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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/31 8:50
+ */
+@Data
+@ApiModel(value = "销售数据(烟草)", description = "销售数据(烟草)")
+public class GdSalesYcVo 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;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java
new file mode 100644
index 00000000..856988ed
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java
@@ -0,0 +1,24 @@
+package com.yxt.supervise.customer.biz.gdinstorageyc;
+
+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.gdinstorageyc.GdInstorageYc;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:09
+ */
+@Mapper
+public interface GdInstorageYcMapper extends BaseMapper<GdInstorageYc> {
+    IPage<GdInstorageYcVo> selectPageVo(IPage<GdInstorageYc> page, @Param(Constants.WRAPPER) Wrapper<GdInstorageYc> qw);
+    List<GdInstorageYcExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdInstorageYc> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.xml
new file mode 100644
index 00000000..f839942c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.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.gdinstorageyc.GdInstorageYcMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo">
+        SELECT
+        colc2,
+        cold3,
+        colf5,
+        coli8,
+        colk10,
+        coll11,
+        colm12,
+        coln13,
+        colr17
+        FROM
+        gd_instorage_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by cold3 desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo">
+        SELECT
+        colc2,
+        cold3,
+        coli8,
+        coll11,
+        colm12,
+        coln13,
+        colr17
+        FROM
+        gd_instorage_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by cold3 desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java
new file mode 100644
index 00000000..bf0744d5
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.biz.gdinstorageyc;
+
+import com.alibaba.excel.EasyExcel;
+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.gdinstorageyc.GdInstorageYc;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcQuery;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcFeign;
+import com.yxt.supervise.customer.biz.gdinstoragegd.GdInstorageGdService;
+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.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:10
+ */
+@Api(tags = "入库数据(烟草)")
+@RestController
+@RequestMapping("v1/gdinstorageyc")
+public class GdInstorageYcRest implements GdInstorageYcFeign {
+    @Autowired
+    private GdInstorageYcService gdInstorageYcService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdInstorageYc>> listPage(@RequestBody PagerQuery<GdInstorageYcQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdInstorageYcVo> pv = gdInstorageYcService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "入库数据(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<GdInstorageYcQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdInstorageYcExcelVo> excelVos = gdInstorageYcService.exportExcel(pq);
+        String fileName = "入库数据(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdInstorageYcExcelVo.class).sheet("入库数据(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java
new file mode 100644
index 00000000..f6f124dc
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java
@@ -0,0 +1,85 @@
+package com.yxt.supervise.customer.biz.gdinstorageyc;
+
+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.gdinstorageyc.GdInstorageYc;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcQuery;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:10
+ */
+@Service
+public class GdInstorageYcService extends MybatisBaseService<GdInstorageYcMapper, GdInstorageYc> {
+    public PagerVo<GdInstorageYcVo> listPageVo(PagerQuery<GdInstorageYcQuery> pq) {
+        GdInstorageYcQuery query = pq.getParams();
+        QueryWrapper<GdInstorageYc> qw = new QueryWrapper<>();
+        //门店/仓库
+        if (StringUtils.isNotBlank(query.getColc2())) {
+            qw.like("colc2", query.getColc2());
+        }
+        if (StringUtils.isNotBlank(query.getColf5())) {
+            qw.like("colf5", query.getColf5());
+        }
+        if (StringUtils.isNotBlank(query.getColi8())) {
+            qw.like("coli8", query.getColi8());
+        }
+        if (StringUtils.isNotBlank(query.getColm12())) {
+            qw.like("colm12", query.getColm12());
+        }
+//        if (StringUtils.isNotBlank(query.getBrandCode())) {
+//            qw.eq("s.brandCode", query.getBrandCode());
+//        }
+        //时间
+        if (StringUtils.isNotBlank(query.getStartTime())) {
+            qw.ge("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getStartTime());
+        }
+        if (StringUtils.isNotBlank(query.getEndTime())) {
+            qw.le("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getEndTime());
+        }
+        IPage<GdInstorageYc> page = PagerUtil.queryToPage(pq);
+        IPage<GdInstorageYcVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdInstorageYcVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<GdInstorageYcExcelVo> exportExcel(PagerQuery<GdInstorageYcQuery> pq) {
+        GdInstorageYcQuery query = pq.getParams();
+        QueryWrapper<GdInstorageYc> qw = new QueryWrapper<>();
+        //门店/仓库
+        if (StringUtils.isNotBlank(query.getColc2())) {
+            qw.like("colc2", query.getColc2());
+        }
+        if (StringUtils.isNotBlank(query.getColf5())) {
+            qw.like("colf5", query.getColf5());
+        }
+        if (StringUtils.isNotBlank(query.getColi8())) {
+            qw.like("coli8", query.getColi8());
+        }
+        if (StringUtils.isNotBlank(query.getColm12())) {
+            qw.like("colm12", query.getColm12());
+        }
+//        if (StringUtils.isNotBlank(query.getBrandCode())) {
+//            qw.eq("s.brandCode", query.getBrandCode());
+//        }
+        //时间
+        if (StringUtils.isNotBlank(query.getStartTime())) {
+            qw.ge("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getStartTime());
+        }
+        if (StringUtils.isNotBlank(query.getEndTime())) {
+            qw.le("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getEndTime());
+        }
+        List<GdInstorageYcExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java
new file mode 100644
index 00000000..9604d61a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java
@@ -0,0 +1,26 @@
+package com.yxt.supervise.customer.biz.gdinventoryyc;
+
+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.gdinventoryyc.GdInventoryYc;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:39
+ */
+@Mapper
+public interface GdInventoryYcMapper extends BaseMapper<GdInventoryYc> {
+    //分页查询销售数据
+    IPage<GdInventoryYcVo> selectPageVo(IPage<GdInventoryYc> page, @Param(Constants.WRAPPER) Wrapper<GdInventoryYc> qw);
+    //查询导出的数据
+    List<GdInventoryYcExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdInventoryYc> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.xml
new file mode 100644
index 00000000..ee8f5146
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.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.gdinventoryyc.GdInventoryYcMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo">
+        SELECT
+        warehouseCode,
+        warehouseName,
+        prodCode,
+        prodName,
+        prodNum,
+        prodValue,
+        suppliderName,
+        datadate
+        FROM
+        gd_inventory_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by dataDate desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo">
+        SELECT
+        warehouseCode,
+        warehouseName,
+        prodCode,
+        prodName,
+        prodNum,
+        prodValue,
+        suppliderName,
+        datadate
+        FROM
+        gd_inventory_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by dataDate desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java
new file mode 100644
index 00000000..16928302
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.biz.gdinventoryyc;
+
+import com.alibaba.excel.EasyExcel;
+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.gdinventoryyc.GdInventoryYc;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcQuery;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo;
+import com.yxt.supervise.customer.biz.gdinventoryyc.GdInventoryYcService;
+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.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:40
+ */
+@Api(tags = "国大库存数据(烟草)")
+@RestController
+@RequestMapping("v1/gdinventoryyc")
+public class GdInventoryYcRest {
+    @Autowired
+    GdInventoryYcService gdInventoryYcService;
+    //@Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdInventoryYc>> listPage(@RequestBody PagerQuery<GdInventoryYcQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdInventoryYcVo> pv = gdInventoryYcService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "国大库存数据(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<GdInventoryYcQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdInventoryYcExcelVo> excelVos = gdInventoryYcService.exportExcel(pq);
+        String fileName = "国大库存数据(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdInventoryYcExcelVo.class).sheet("国大库存数据(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java
new file mode 100644
index 00000000..a76a2a27
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java
@@ -0,0 +1,89 @@
+package com.yxt.supervise.customer.biz.gdinventoryyc;
+
+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.gdinventoryyc.GdInventoryYc;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcQuery;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYc;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:40
+ */
+@Service
+public class GdInventoryYcService extends MybatisBaseService<GdInventoryYcMapper, GdInventoryYc> {
+    public PagerVo<GdInventoryYcVo> listPageVo(PagerQuery<GdInventoryYcQuery> pq) {
+        GdInventoryYcQuery query = pq.getParams();
+        QueryWrapper<GdInventoryYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getWarehouseCode())) {
+                qw.eq("warehouseCode", query.getWarehouseCode());
+            }
+            if (StringUtils.isNotBlank(query.getWarehouseName())) {
+                qw.like("warehouseName", query.getWarehouseName());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("prodName", query.getProdName());
+            }
+
+            if (StringUtils.isNotBlank(query.getSuppliderName())) {
+                qw.like("suppliderName", query.getSuppliderName());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<GdInventoryYc> page = PagerUtil.queryToPage(pq);
+        IPage<GdInventoryYcVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdInventoryYcVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<GdInventoryYcExcelVo> exportExcel(PagerQuery<GdInventoryYcQuery> pq) {
+        GdInventoryYcQuery query = pq.getParams();
+        QueryWrapper<GdInventoryYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getWarehouseCode())) {
+                qw.eq("warehouseCode", query.getWarehouseCode());
+            }
+            if (StringUtils.isNotBlank(query.getWarehouseName())) {
+                qw.like("warehouseName", query.getWarehouseName());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("prodName", query.getProdName());
+            }
+
+            if (StringUtils.isNotBlank(query.getSuppliderName())) {
+                qw.like("suppliderName", query.getSuppliderName());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<GdInventoryYcExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java
new file mode 100644
index 00000000..464c86bb
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java
@@ -0,0 +1,27 @@
+package com.yxt.supervise.customer.biz.gdsalesyc;
+
+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.gdsalesyc.GdSalesYc;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:06
+ */
+@Mapper
+public interface GdSalesYcMapper extends BaseMapper<GdSalesYc> {
+    //分页查询销售数据
+    IPage<GdSalesYcVo> selectPageVo(IPage<GdSalesYc> page, @Param(Constants.WRAPPER) Wrapper<GdSalesYc> qw);
+
+    //查询导出的数据
+    List<GdSalesYcExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdSalesYc> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml
new file mode 100644
index 00000000..ab759ba1
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml
@@ -0,0 +1,47 @@
+<?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.gdsalesyc.GdSalesYcMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo">
+        SELECT
+        s.orderType orderType,
+        s.orderNo code,
+        s.prodCode prodCode,
+        s.prodName prodName,
+        s.brandCode brandCode,
+        s.brandName brandName,
+        0 + CAST(s.saleNum AS CHAR) as saleNum,
+        round((s.saleNum* s.salePrice),2) as total,
+        s.storeCode storeCode,
+        s.dataDate dataDate,
+        i.name as storeName
+        FROM gd_sales_yc s
+        left JOIN store_info i on  i.`code`= s.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by s.dataDate desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo">
+        SELECT
+        s.orderType orderType,
+        s.orderNo code,
+        s.prodCode prodCode,
+        s.prodName prodName,
+        s.brandCode brandCode,
+        s.brandName brandName,
+        0 + CAST(s.saleNum AS CHAR) as saleNum,
+        round((s.saleNum* s.salePrice),2) as total,
+        s.dataDate dataDate,
+        i.name as storeName
+        FROM gd_sales_yc s
+        left JOIN store_info i on  i.`code`= s.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by s.dataDate desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java
new file mode 100644
index 00000000..eaed1498
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java
@@ -0,0 +1,61 @@
+package com.yxt.supervise.customer.biz.gdsalesyc;
+
+import com.alibaba.excel.EasyExcel;
+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.gdsalesyc.GdSalesYc;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcQuery;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcFeign;
+import com.yxt.supervise.customer.biz.gdsales.GdSalesService;
+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.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:06
+ */
+@Api(tags = "销售数据(烟草)")
+@RestController
+@RequestMapping("v1/gdsalesyc")
+public class GdSalesYcRest implements GdSalesYcFeign {
+    @Autowired
+    private GdSalesYcService gdSalesYcService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdSalesYc>> listPage(@RequestBody PagerQuery<GdSalesYcQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdSalesYcVo> pv = gdSalesYcService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "销售数据(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<GdSalesYcQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdSalesYcExcelVo> excelVos = gdSalesYcService.exportExcel(pq);
+        String fileName = "销售数据(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdSalesYcExcelVo.class).sheet("销售数据(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java
new file mode 100644
index 00000000..fb91c72b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java
@@ -0,0 +1,90 @@
+package com.yxt.supervise.customer.biz.gdsalesyc;
+
+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.gdsalesyc.GdSalesYc;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcQuery;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYc;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:07
+ */
+@Service
+public class GdSalesYcService extends MybatisBaseService<GdSalesYcMapper,GdSalesYc> {
+    public PagerVo<GdSalesYcVo> listPageVo(PagerQuery<GdSalesYcQuery> pq) {
+        GdSalesYcQuery query = pq.getParams();
+        QueryWrapper<GdSalesYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            //渠道
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.eq("s.storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("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.getStartTime())) {
+                qw.ge("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getStartTime());
+            }
+            if (StringUtils.isNotBlank(query.getEndTime())) {
+                qw.le("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getEndTime());
+            }
+        }
+        IPage<GdSalesYc> page = PagerUtil.queryToPage(pq);
+        IPage<GdSalesYcVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdSalesYcVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    public List<GdSalesYcExcelVo> exportExcel(PagerQuery<GdSalesYcQuery> pq) {
+        GdSalesYcQuery query = pq.getParams();
+        QueryWrapper<GdSalesYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.eq("s.storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("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.getStartTime())) {
+                qw.ge("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getStartTime());
+            }
+            if (StringUtils.isNotBlank(query.getEndTime())) {
+                qw.le("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getEndTime());
+            }
+        }
+        List<GdSalesYcExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}

From ba17866a389cca739c56bef16c341e9ea59eda0c Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 31 Mar 2023 16:49:57 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervise-customer-biz/pom.xml            |   6 +
 .../supervise/customer/biz/util/CharUtil.java |  80 ++++
 .../customer/biz/util/JedisLock.java          | 171 +++++++
 .../customer/biz/util/JsonUtils.java          | 418 ++++++++++++++++++
 .../biz/util/JsonValueProcessorImpl.java      |  49 ++
 .../supervise/customer/biz/util/MapUtils.java | 302 +++++++++++++
 .../supervise/customer/biz/util/MyModule.java |  10 +
 .../customer/biz/util/MyX509TrustManager.java |  22 +
 .../biz/util/PropertyFilterMixIn.java         |   8 +
 .../customer/biz/util/ValidatorUtils.java     | 201 +++++++++
 .../customer/biz/util/WeixinCheckoutUtil.java |  89 ++++
 .../supervise/customer/biz/util/XmlUtil.java  | 201 +++++++++
 .../customer/biz/util/applet/MD5.java         |  29 ++
 .../biz/util/applet/TemplateData.java         |  47 ++
 .../biz/util/applet/WX_HttpsUtil.java         |  80 ++++
 .../biz/util/applet/WX_TemplateMsgUtil.java   | 112 +++++
 .../biz/util/applet/WechatConfig.java         |  39 ++
 .../util/applet/WechatRefundApiResult.java    | 214 +++++++++
 .../customer/biz/util/applet/WechatUtil.java  | 296 +++++++++++++
 .../customer/biz/wechat/WechatApiService.java | 271 ++++++++++++
 .../customer/biz/wechat/WechatRest.java       |  48 ++
 .../customer/biz/wechat/WechatService.java    |  67 +++
 22 files changed, 2760 insertions(+)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/CharUtil.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JedisLock.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonUtils.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonValueProcessorImpl.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MapUtils.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyModule.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyX509TrustManager.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/PropertyFilterMixIn.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/ValidatorUtils.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/WeixinCheckoutUtil.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/XmlUtil.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/MD5.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/TemplateData.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_HttpsUtil.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_TemplateMsgUtil.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatConfig.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatRefundApiResult.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatUtil.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java

diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
index 15f895be..9e6d517c 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
@@ -117,6 +117,12 @@
             <artifactId>easyexcel</artifactId>
             <version>3.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <classifier>jdk15</classifier>
+            <version>2.4</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/CharUtil.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/CharUtil.java
new file mode 100644
index 00000000..dbd0da33
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/CharUtil.java
@@ -0,0 +1,80 @@
+package com.yxt.supervise.customer.biz.util;
+
+import java.util.Random;
+
+public class CharUtil {
+
+    /**
+     * 获取随机字符串
+     *
+     * @param num
+     * @return
+     */
+    public static String getRandomString(Integer num) {
+        String base = "abcdefghijklmnopqrstuvwxyz0123456789";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < num; i++) {
+            int number = random.nextInt(base.length());
+            sb.append(base.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取随机字符串
+     *
+     * @param num
+     * @return
+     */
+    public static String getRandomNum(Integer num) {
+        String base = "0123456789";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < num; i++) {
+            int number = random.nextInt(base.length());
+            sb.append(base.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 右补位，左对齐
+     *
+     * @param oriStr   原字符串
+     * @param len      目标字符串长度
+     * @param fillChar 补位字符
+     * @return 目标字符串
+     */
+    public static String padRight(String oriStr, int len, char fillChar) {
+        String str = "";
+        int strlen = oriStr.length();
+        if (strlen < len) {
+            for (int i = 0; i < len - strlen; i++) {
+                str = str + fillChar;
+            }
+        }
+        str = str + oriStr;
+        return str;
+    }
+
+    /**
+     * 左补位，右对齐
+     *
+     * @param oriStr   原字符串
+     * @param len      目标字符串长度
+     * @param fillChar 补位字符
+     * @return 目标字符串
+     */
+    public static String padLeft(String oriStr, int len, char fillChar) {
+        int strlen = oriStr.length();
+        String str = "";
+        if (strlen < len) {
+            for (int i = 0; i < len - strlen; i++) {
+                str = str + fillChar;
+            }
+        }
+        str = oriStr + str;
+        return str;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JedisLock.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JedisLock.java
new file mode 100644
index 00000000..ac1200a1
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JedisLock.java
@@ -0,0 +1,171 @@
+package com.yxt.supervise.customer.biz.util;
+
+import redis.clients.jedis.Jedis;
+
+import java.util.Arrays;
+import java.util.UUID;
+
+/**
+ * Redis distributed lock implementation.
+ *
+ * @author Alois Belaska <alois.belaska@gmail.com>
+ */
+public class JedisLock {
+
+    /**
+     * Lua script which allows for an atomic delete on the lock only
+     * if it is owned by the lock. This prevents locks stealing from others.
+     */
+    private final static String DELETE_IF_OWNED =
+            "if redis.call('get', KEYS[1]) == ARGV[1] then " +
+                    "return redis.call('del', KEYS[1]) " +
+                    "else " +
+                    "return 0 " +
+                    "end";
+
+    private Jedis jedis;
+
+    /**
+     * Lock key path.
+     */
+    private String lockKey;
+    private String token;
+
+    /**
+     * Lock expiration in milliseconds.
+     */
+    private int expireMsecs = 60 * 1000;
+
+    /**
+     * Acquire timeout in milliseconds.
+     */
+    private int timeoutMsecs = 10 * 1000;
+
+    private boolean locked = false;
+
+    /**
+     * Detailed constructor with default acquire timeout 10000 msecs and lock expiration of 60000 msecs.
+     *
+     * @param jedis
+     * @param lockKey lock key (ex. account:1, ...)
+     */
+    public JedisLock(Jedis jedis, String lockKey) {
+        this.jedis = jedis;
+        this.lockKey = lockKey;
+        this.token = UUID.randomUUID().toString();
+    }
+
+    /**
+     * Detailed constructor with default lock expiration of 60000 msecs.
+     *
+     * @param jedis
+     * @param lockKey      lock key (ex. account:1, ...)
+     * @param timeoutMsecs acquire timeout in milliseconds (default: 10000 msecs)
+     */
+    public JedisLock(Jedis jedis, String lockKey, int timeoutMsecs) {
+        this(jedis, lockKey);
+        this.timeoutMsecs = timeoutMsecs;
+    }
+
+    /**
+     * Detailed constructor.
+     *
+     * @param jedis
+     * @param lockKey      lock key (ex. account:1, ...)
+     * @param timeoutMsecs acquire timeout in milliseconds (default: 10000 msecs)
+     * @param expireMsecs  lock expiration in milliseconds (default: 60000 msecs)
+     */
+    public JedisLock(Jedis jedis, String lockKey, int timeoutMsecs, int expireMsecs) {
+        this(jedis, lockKey, timeoutMsecs);
+        this.expireMsecs = expireMsecs;
+    }
+
+    /**
+     * Detailed constructor with default acquire timeout 10000 msecs and lock expiration of 60000 msecs.
+     *
+     * @param lockKey lock key (ex. account:1, ...)
+     */
+    public JedisLock(String lockKey) {
+        this(null, lockKey);
+    }
+
+    /**
+     * Detailed constructor with default lock expiration of 60000 msecs.
+     *
+     * @param lockKey      lock key (ex. account:1, ...)
+     * @param timeoutMsecs acquire timeout in miliseconds (default: 10000 msecs)
+     */
+    public JedisLock(String lockKey, int timeoutMsecs) {
+        this(null, lockKey, timeoutMsecs);
+    }
+
+    /**
+     * Detailed constructor.
+     *
+     * @param lockKey      lock key (ex. account:1, ...)
+     * @param timeoutMsecs acquire timeout in miliseconds (default: 10000 msecs)
+     * @param expireMsecs  lock expiration in miliseconds (default: 60000 msecs)
+     */
+    public JedisLock(String lockKey, int timeoutMsecs, int expireMsecs) {
+        this(null, lockKey, timeoutMsecs, expireMsecs);
+    }
+
+    /**
+     * @return lock key
+     */
+    public String getLockKey() {
+        return lockKey;
+    }
+
+    /**
+     * Acquire lock.
+     *
+     * @return true if lock is acquired, false acquire timeouted
+     * @throws InterruptedException in case of thread interruption
+     */
+    public synchronized boolean acquire() throws InterruptedException {
+        return acquire(jedis);
+    }
+
+    /**
+     * Acquire lock.
+     *
+     * @param jedis
+     * @return true if lock is acquired, false acquire timed out
+     * @throws InterruptedException in case of thread interruption
+     */
+    public synchronized boolean acquire(Jedis jedis) throws InterruptedException {
+        int timeout = timeoutMsecs;
+        while (timeout >= 0) {
+
+            if ("OK".equals(jedis.set(lockKey, token))) {
+                // lock acquired
+                locked = true;
+                return true;
+            }
+
+            timeout -= 100;
+            Thread.sleep(100);
+        }
+
+        return false;
+    }
+
+    /**
+     * Acquired lock release.
+     */
+    public synchronized void release() {
+        release(jedis);
+    }
+
+    /**
+     * Acquired lock release.
+     */
+    public synchronized void release(Jedis jedis) {
+        if (locked) {
+            // prevent threads from releasing locks which they don't own
+            jedis.eval(DELETE_IF_OWNED, Arrays.asList(lockKey), Arrays.asList(token));
+            locked = false;
+        }
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonUtils.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonUtils.java
new file mode 100644
index 00000000..e5949ed0
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonUtils.java
@@ -0,0 +1,418 @@
+package com.yxt.supervise.customer.biz.util;
+
+import com.fasterxml.jackson.annotation.JsonFilter;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JsonConfig;
+import net.sf.json.util.PropertyFilter;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * json对象映射工具类之jackson封装
+ */
+@Slf4j
+public class JsonUtils {
+
+    private static ObjectMapper objectMapper = null;
+
+    static {
+        objectMapper = new ObjectMapper();
+        // 设置默认日期格式
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        // 提供其它默认设置
+        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        objectMapper.setFilters(new SimpleFilterProvider()
+                .setFailOnUnknownId(false));
+        objectMapper.registerModule(new MyModule());
+    }
+
+    /**
+     * 将对象转换成json字符串格式（默认将转换所有的属性）
+     *
+     * @param value
+     * @return
+     */
+    public static String toJsonStr(Object value) {
+        try {
+            return objectMapper.writeValueAsString(value);
+        } catch (JsonProcessingException e) {
+            log.error("Json转换失败", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将对象转换成json字符串格式
+     *
+     * @param value      需要转换的对象
+     * @param properties 需要转换的属性
+     */
+    public static String toJsonStr(Object value, String[] properties) {
+        try {
+            SimpleBeanPropertyFilter sbp = SimpleBeanPropertyFilter
+                    .filterOutAllExcept(properties);
+            FilterProvider filterProvider = new SimpleFilterProvider()
+                    .addFilter("propertyFilterMixIn", sbp);
+            return objectMapper.writer(filterProvider)
+                    .writeValueAsString(value);
+        } catch (Exception e) {
+            log.error("Json转换失败", e);
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 将对象转换成json字符串格式
+     *
+     * @param value              需要转换的对象
+     * @param properties2Exclude 需要排除的属性
+     */
+    public static String toJsonStrWithExcludeProperties(Object value,
+                                                        String[] properties2Exclude) {
+        try {
+            SimpleBeanPropertyFilter sbp = SimpleBeanPropertyFilter
+                    .serializeAllExcept(properties2Exclude);
+            FilterProvider filterProvider = new SimpleFilterProvider()
+                    .addFilter("propertyFilterMixIn", sbp);
+            return objectMapper.writer(filterProvider)
+                    .writeValueAsString(value);
+        } catch (Exception e) {
+            log.error("Json转换失败", e);
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 将对象json格式直接写出到流对象中（默认将转换所有的属性）
+     *
+     * @param out
+     * @return
+     */
+    public static void writeJsonStr(OutputStream out, Object value) {
+        try {
+            objectMapper.writeValue(out, value);
+        } catch (Exception e) {
+            log.error("Json转换失败", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将对象json格式直接写出到流对象中
+     *
+     * @param value      需要转换的对象(注意，需要在要转换的对象中定义JsonFilter注解)
+     * @param properties 需要转换的属性
+     */
+    public static void writeJsonStr(OutputStream out, Object value,
+                                    String[] properties) {
+
+        try {
+            objectMapper.writer(
+                    new SimpleFilterProvider().addFilter(
+                            AnnotationUtils
+                                    .getValue(
+                                            AnnotationUtils.findAnnotation(
+                                                    value.getClass(),
+                                                    JsonFilter.class))
+                                    .toString(), SimpleBeanPropertyFilter
+                                    .filterOutAllExcept(properties)))
+                    .writeValue(out, value);
+        } catch (Exception e) {
+            log.error("Json转换失败", e);
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 将对象转换成json字符串格式
+     *
+     * @param value              需要转换的对象
+     * @param properties2Exclude 需要排除的属性(注意，需要在要转换的对象中定义JsonFilter注解)
+     */
+    public static void writeJsonStrWithExcludeProperties(OutputStream out,
+                                                         Object value, String[] properties2Exclude) {
+        try {
+            objectMapper.writer(
+                    new SimpleFilterProvider().addFilter(
+                            AnnotationUtils
+                                    .getValue(
+                                            AnnotationUtils.findAnnotation(
+                                                    value.getClass(),
+                                                    JsonFilter.class))
+                                    .toString(), SimpleBeanPropertyFilter
+                                    .serializeAllExcept(properties2Exclude)))
+                    .writeValue(out, value);
+        } catch (Exception e) {
+            log.error("Json转换失败", e);
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 反序列化POJO或简单Collection如List<String>.
+     * <p>
+     * 如果JSON字符串为Null或"null"字符串, 返回Null. 如果JSON字符串为"[]", 返回空集合.
+     * <p>
+     * 如需反序列化复杂Collection如List<MyBean>, 请使用fromJson(String, JavaType)
+     */
+    public static <T> T fromJson(String jsonString, Class<T> clazz) {
+        if (StringUtils.isEmpty(jsonString)) {
+            return null;
+        }
+
+        try {
+            return objectMapper.readValue(jsonString, clazz);
+        } catch (IOException e) {
+            log.warn("parse json string error:" + jsonString, e);
+            return null;
+        }
+    }
+
+    @SuppressWarnings({"unchecked", "unused"})
+    public static List<Object> readJsonList(String jsondata, Object object) {
+        try {
+            List<LinkedHashMap<String, Object>> list = objectMapper.readValue(
+                    jsondata, List.class);
+
+            List<Object> objects = Lists.newArrayList();
+            System.out.println(list.size());
+            for (int i = 0; i < list.size(); i++) {
+                Map<String, Object> map = list.get(i);
+                Set<String> set = map.keySet();
+                for (Iterator<String> it = set.iterator(); it.hasNext(); ) {
+                    String key = it.next();
+                    System.out.println(key + ":" + map.get(key));
+                }
+            }
+        } catch (JsonParseException e) {
+            e.printStackTrace();
+        } catch (JsonMappingException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 单独解析某一个json的key值
+     *
+     * @param @param  jsonText
+     * @param @param  key
+     * @param @return 设定文件
+     * @return JsonNode    返回类型
+     * @throws
+     * @Title: getjsonvalue
+     * @Description: TODO(这里用一句话描述这个方法的作用)
+     */
+    public static JsonNode getjsonvalue(String jsonText, String key) {
+
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            JsonNode rootNode = mapper.readTree(jsonText); // 读取Json
+
+            return rootNode.path(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static JavaType getCollectionType(Class<?> collectionClass, Class<?>... elementClasses) {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
+    }
+
+    public static <T> List<T> json2list(String jsonArrayStr, Class<T> clazz) throws Exception {
+        List<Map<String, Object>> list = (List) objectMapper.readValue(jsonArrayStr, new TypeReference<List<T>>() {
+        });
+        List<T> result = new ArrayList();
+        Iterator var4 = list.iterator();
+
+        while (var4.hasNext()) {
+            Map<String, Object> map = (Map) var4.next();
+            result.add(map2pojo(map, clazz));
+        }
+
+        return result;
+    }
+
+    public static <T> T map2pojo(Map map, Class<T> clazz) {
+        return objectMapper.convertValue(map, clazz);
+    }
+
+    /**
+     * 解析json属性，放到实体里面去
+     *
+     * @param @param  jsondata
+     * @param @param  collectionClass
+     * @param @return 设定文件
+     * @return List<SpecVO>    返回类型
+     * @throws
+     * @Title: readJsonList
+     * @Description: TODO(这里用一句话描述这个方法的作用)
+     */
+    @SuppressWarnings("unchecked")
+    public static List<Object> readJsonList(String jsondata, Class<?> collectionClass) {
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            JavaType javaType = getCollectionType(ArrayList.class, collectionClass);
+            List<Object> lst = (List<Object>) mapper.readValue(jsondata, javaType);
+
+            return lst;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * json 转map
+     *
+     * @param @param  jsondata
+     * @param @return 设定文件
+     * @return Map<String, Map < String, Object>>    返回类型
+     * @throws
+     * @Title: readJsonMap
+     * @Description: TODO(这里用一句话描述这个方法的作用)
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> readJsonToMap(String jsondata) {
+        try {
+            Map<String, Object> maps = objectMapper.readValue(jsondata, Map.class);
+            //System.out.println(maps);
+            return maps;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> readJsonToMap1(String jsondata) {
+        try {
+            Map<String, Object> maps = objectMapper.readValue(jsondata, Map.class);
+            //System.out.println(maps);
+            return maps;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 设置过滤值为空的属性，使得生成的 json 字符串只包含非空的值
+     *
+     * @return
+     */
+    public static JsonConfig getJsonConfig() {
+        JsonConfig jsonConfig = new JsonConfig();
+        jsonConfig.registerJsonValueProcessor(java.sql.Timestamp.class, new JsonValueProcessorImpl());
+        jsonConfig.setJsonPropertyFilter(new PropertyFilter() {
+            @Override
+            public boolean apply(Object source, String name, Object value) {
+                return value == null;
+            }
+        });
+
+        jsonConfig.setIgnoreDefaultExcludes(false); // 设置默认忽略
+        jsonConfig.setExcludes(new String[]{"dbName", "isDel"}); // 此处是亮点，只要将所需忽略字段加到数组中即可，在实际测试中，我发现在所返回数组中，存在大量无用属性，
+
+        return jsonConfig;
+    }
+
+    /**
+     * 将对象转换成json字符串。
+     */
+    public static String objectToJson(Object data) {
+        try {
+            String string = objectMapper.writeValueAsString(data);
+            return string;
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 将json结果集转化为对象
+     *
+     * @param jsonData json数据
+     * @param beanType 对象中的object类型
+     */
+    public static <T> T jsonToPojo(String jsonData, Class<T> beanType) {
+        try {
+            if (ValidatorUtils.notEmpty(jsonData)) {
+                T t = objectMapper.readValue(jsonData, beanType);
+                return t;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 将json数据转换成pojo对象list
+     */
+    public static <T> List<T> jsonToList(String jsonData, Class<T> beanType) {
+        JavaType javaType = objectMapper.getTypeFactory().constructParametricType(List.class, beanType);
+        try {
+            List<T> list = objectMapper.readValue(jsonData, javaType);
+            return list;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public static void main(String[] args) {
+        Map<String, Object> userData = Maps.newHashMap();
+        Map<String, Object> nameStruct = Maps.newHashMap();
+        nameStruct.put("firstName", "张三");
+        nameStruct.put("lastName", "你大爷");
+
+        System.out.println(JsonUtils.toJsonStr(nameStruct));
+        userData.put("name", nameStruct);
+        userData.put("age", 20);
+        List<String> stringList = Lists.newArrayList("A", "B", "C");
+        System.out.println(JsonUtils.toJsonStr(userData));
+        System.out.println(JsonUtils.toJsonStr(stringList));
+//        String[] arr = {"37","38","41","42","43","44","45","1693","1694","1695","1696"};
+//        System.out.println(toJsonStr(arr));
+
+        String ss = "{\"address\": \"address2\",\"name\":\"haha2\"}";
+
+        Map<String, Object> map = readJsonToMap(ss);
+
+        if (map != null) {
+            System.out.println(map.get("address"));
+        }
+    }
+
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonValueProcessorImpl.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonValueProcessorImpl.java
new file mode 100644
index 00000000..154b8341
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/JsonValueProcessorImpl.java
@@ -0,0 +1,49 @@
+/**
+ *
+ */
+package com.yxt.supervise.customer.biz.util;
+
+
+import net.sf.json.JsonConfig;
+import net.sf.json.processors.JsonValueProcessor;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * <p>Title: JsonValueProcessorImpl.java</p>
+ * <p>Description: net.js.json 特殊值处理</p>
+ * <p>Copyright: Copyright (c) 2014-2018</p>
+ * <p>Company: leimingtech.com</p>
+ *
+ * @author linjm
+ * @version 1.0
+ * @date 2015年7月17日
+ */
+public class JsonValueProcessorImpl implements JsonValueProcessor {
+
+    private String format = "yyyy-MM-dd HH:mm:ss";
+
+    @Override
+    public Object processArrayValue(Object value, JsonConfig jsonConfig) {
+        String[] obj = {};
+        if (value instanceof Date[]) {
+            SimpleDateFormat sdf = new SimpleDateFormat(format);
+            Date[] date = (Date[]) value;
+            for (int i = 0; i < date.length; i++) {
+                obj[i] = sdf.format(date[i]);
+            }
+        }
+        return obj;
+    }
+
+    @Override
+    public Object processObjectValue(String key, Object value, JsonConfig jsonConfig) {
+        if (value instanceof Date) {
+            String str = new SimpleDateFormat(format).format(value);
+            return str;
+        }
+        return value.toString();
+    }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MapUtils.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MapUtils.java
new file mode 100644
index 00000000..2b1c8886
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MapUtils.java
@@ -0,0 +1,302 @@
+package com.yxt.supervise.customer.biz.util;//package com.supervise.rms.biz.util;
+//
+//
+//import com.mysql.cj.util.StringUtils;
+//import org.apache.commons.beanutils.PropertyUtilsBean;
+//import org.apache.commons.lang.ArrayUtils;
+//import org.springframework.util.Assert;
+//
+//import java.beans.PropertyDescriptor;
+//import java.math.BigDecimal;
+//import java.sql.Date;
+//import java.sql.Timestamp;
+//import java.util.HashMap;
+//import java.util.Iterator;
+//import java.util.Map;
+//import java.util.Set;
+//
+///**
+// * 获取map中值的工具类,自动进行类型转换
+// *
+// * @author DT_panda
+// */
+//public class MapUtils {
+//
+//    public static String getString(String key, Map<String, Object> map) {
+//        if (map == null || key == null)
+//            throw new IllegalArgumentException();
+//        if (!map.containsKey(key))
+//            return null;
+//        Object value = map.get(key);
+//        if (value == null)
+//            return null;
+//        return value.toString();
+//    }
+//
+//    public static Integer getInteger(String key, Map<String, Object> map) {
+//        if (map == null || key == null)
+//            throw new IllegalArgumentException();
+//        if (!map.containsKey(key))
+//            return null;
+//        Object value = map.get(key);
+//        if (value == null)
+//            return null;
+//        if (value instanceof Integer)
+//            return (Integer) value;
+//        if (value instanceof String)
+//            return Integer.valueOf((String) value);
+//        //Date 不支持变成为date类型
+//        if (value instanceof Date)
+//            throw new ClassCastException();
+//        if (value instanceof Number)
+//            return ((Number) value).intValue();
+//        throw new ClassCastException();
+//    }
+//
+//    public static Long getLong(String key, Map<String, Object> map) {
+//        if (map == null || key == null)
+//            throw new IllegalArgumentException();
+//        if (!map.containsKey(key))
+//            return null;
+//        Object value = map.get(key);
+//        if (value == null)
+//            return null;
+//        if (value instanceof Long)
+//            return (Long) value;
+//        if (value instanceof Number)
+//            return ((Number) value).longValue();
+//        if (value instanceof String)
+//            return Long.valueOf((String) value);
+//        if (value instanceof Date) {
+//            return (((Date) value).getTime());
+//        }
+//        if (value instanceof java.sql.Time) {
+//            return ((java.sql.Time) value).getTime();
+//        }
+//        if (value instanceof Timestamp) {
+//            return ((Timestamp) value).getTime();
+//        }
+//
+//        throw new ClassCastException();
+//    }
+//
+//    public static Double getDouble(String key, Map<String, Object> map) {
+//        if (map == null || key == null)
+//            throw new IllegalArgumentException();
+//        if (!map.containsKey(key))
+//            return null;
+//        Object value = map.get(key);
+//        if (value == null)
+//            return null;
+//        if (value instanceof Double)
+//            return (Double) value;
+//        if (value instanceof Number)
+//            return ((Number) value).doubleValue();
+//        if (value instanceof String)
+//            return Double.valueOf((String) value);
+//        throw new ClassCastException();
+//    }
+//
+//    public static BigDecimal getBigDecimal(String key, Map<String, Object> map) {
+//        if (map == null || key == null)
+//            throw new IllegalArgumentException();
+//        if (!map.containsKey(key))
+//            return null;
+//        Object value = map.get(key);
+//        if (value == null)
+//            return null;
+//        if (value instanceof BigDecimal)
+//            return (BigDecimal) value;
+//        if (value instanceof Integer)
+//            return new BigDecimal((Integer) value);
+//        if (value instanceof Short)
+//            return new BigDecimal((Short) value);
+//        if (value instanceof Byte)
+//            return new BigDecimal((Byte) value);
+//        if (value instanceof Long)
+//            return new BigDecimal((Long) value);
+//        if (value instanceof Float)
+//            return new BigDecimal((Float) value);
+//        if (value instanceof Double)
+//            return new BigDecimal((Double) value);
+//        if (value instanceof Date) {
+//            return new BigDecimal(((Date) value).getTime());
+//        }
+//        if (value instanceof java.sql.Time) {
+//            return new BigDecimal(((java.sql.Time) value).getTime());
+//        }
+//        if (value instanceof Timestamp) {
+//            return new BigDecimal(((Timestamp) value).getTime());
+//        }
+//        if (value instanceof String) {
+//            if (!StringUtils.isNullOrEmpty((String) value))
+//                return new BigDecimal((String) value);
+//            else
+//                return null;
+//        }
+//        throw new ClassCastException();
+//    }
+//
+//    /**
+//     * 将bean转化为map
+//     *
+//     * @param bean
+//     * @return
+//     */
+//    public static Map<String, Object> getMap(Object bean) {
+//        return beanToMap(bean);
+//    }
+//
+//    /**
+//     * 将map中key为likeKey的value前后加上字符'%'，用于like查询
+//     *
+//     * @param map
+//     * @param likeKey
+//     */
+//    public static void toLikeValue(Map<String, Object> map, String... likeKey) {
+//        if (ArrayUtils.isEmpty(likeKey))
+//            return;
+//        for (String key : likeKey) {
+//            if (map.containsKey(key))
+//                map.put(key, "%" + map.get(key) + "%");
+//        }
+//    }
+//
+//    /**
+//     * 获取日期
+//     *
+//     * @param key
+//     * @param map
+//     * @return
+//     */
+//    public static Date getDate(String key, Map<String, Object> map) {
+//        if (map == null || key == null)
+//            throw new IllegalArgumentException();
+//        if (!map.containsKey(key))
+//            return null;
+//        Object value = map.get(key);
+//        if (value == null)
+//            return null;
+//        else {
+//            if (value instanceof Date) {
+//                return (Date) value;
+//            } else if (value instanceof Timestamp) {
+//                return new Date(((Timestamp) value).getTime());
+//            }
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 获取日期
+//     *
+//     * @param key
+//     * @param map
+//     * @return
+//     */
+//    public static java.util.Date getTimestamp(String key, Map<String, Object> map) {
+//        if (map == null || key == null)
+//            throw new IllegalArgumentException();
+//        if (!map.containsKey(key))
+//            return null;
+//        Object value = map.get(key);
+//        if (value == null)
+//            return null;
+//        else {
+//            if (value instanceof Date) {
+//                return (Date) value;
+//            } else if (value instanceof Timestamp) {
+//                Timestamp ts = (Timestamp) value;
+//                return ts;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 如果value不为空 ，则放到map中
+//     *
+//     * @param map
+//     * @param key
+//     * @param value
+//     */
+//    public static void putIfValueNotNull(Map<String, Object> map, String key, Object value) {
+//        Assert.notNull(map);
+//        Assert.hasText(key);
+//        if (value != null)
+//            map.put(key, value);
+//    }
+//
+//    /**
+//     * 如果value不为空 ，则放到map中
+//     *
+//     * @param map
+//     * @param key
+//     * @param value
+//     */
+//    public static void putIfValueNotEmpty(Map<String, Object> map, String key, String value) {
+//        Assert.notNull(map);
+//        Assert.hasText(key);
+//        if (!StringUtils.isNullOrEmpty(value))
+//            map.put(key, value);
+//    }
+//
+//    /**
+//     * 将map中指定的key的value值进行处理
+//     *
+//     * @param key
+//     * @param map
+//     * @param helper
+//     */
+//    public static void convertMapValuePattern(String key, Map<String, Object> map, DealMapValueHelper helper) {
+//        Assert.hasText(key);
+//        Assert.notNull(map);
+//        Assert.notNull(helper);
+//        helper.dealValue(key, map);
+//    }
+//
+//    /**
+//     * 将javabean实体类转为map类型，然后返回一个map类型的值
+//     *
+//     * @return
+//     */
+//    public static Map<String, Object> beanToMap(Object beanObj) {
+//        Map<String, Object> params = new HashMap<String, Object>(0);
+//        try {
+//            PropertyUtilsBean propertyUtilsBean = new PropertyUtilsBean();
+//            PropertyDescriptor[] descriptors = propertyUtilsBean.getPropertyDescriptors(beanObj);
+//            for (int i = 0; i < descriptors.length; i++) {
+//                String name = descriptors[i].getName();
+//                if (!"class".equals(name)) {
+//                    params.put(name, propertyUtilsBean.getNestedProperty(beanObj, name));
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return params;
+//    }
+//
+//    public static String convertMap2Xml(Map<Object, Object> paraMap) {
+//        StringBuffer xmlStr = new StringBuffer();
+//        if (paraMap != null) {
+//            xmlStr.append("<xml>");
+//            Set<Object> keySet = paraMap.keySet();
+//            Iterator<Object> keyIte = keySet.iterator();
+//            while (keyIte.hasNext()) {
+//                String key = (String) keyIte.next();
+//                String val = String.valueOf(paraMap.get(key));
+//                xmlStr.append("<");
+//                xmlStr.append(key);
+//                xmlStr.append(">");
+//                xmlStr.append(val);
+//                xmlStr.append("</");
+//                xmlStr.append(key);
+//                xmlStr.append(">");
+//            }
+//            xmlStr.append("</xml>");
+//        }
+//        return xmlStr.toString();
+//    }
+//}
+//
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyModule.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyModule.java
new file mode 100644
index 00000000..12f8b845
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyModule.java
@@ -0,0 +1,10 @@
+package com.yxt.supervise.customer.biz.util;
+
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+public class MyModule extends SimpleModule {
+    @Override
+    public void setupModule(SetupContext context) {
+        context.setMixInAnnotations(Object.class, PropertyFilterMixIn.class);
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyX509TrustManager.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyX509TrustManager.java
new file mode 100644
index 00000000..43142c34
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/MyX509TrustManager.java
@@ -0,0 +1,22 @@
+package com.yxt.supervise.customer.biz.util;
+
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class MyX509TrustManager implements X509TrustManager {
+    @Override
+    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+    }
+
+    @Override
+    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+    }
+
+    @Override
+    public X509Certificate[] getAcceptedIssuers() {
+        return null;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/PropertyFilterMixIn.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/PropertyFilterMixIn.java
new file mode 100644
index 00000000..657eae00
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/PropertyFilterMixIn.java
@@ -0,0 +1,8 @@
+package com.yxt.supervise.customer.biz.util;
+
+import com.fasterxml.jackson.annotation.JsonFilter;
+
+@JsonFilter("propertyFilterMixIn")
+public class PropertyFilterMixIn {
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/ValidatorUtils.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/ValidatorUtils.java
new file mode 100644
index 00000000..3fee0364
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/ValidatorUtils.java
@@ -0,0 +1,201 @@
+package com.yxt.supervise.customer.biz.util;
+
+//import com.zscat.mallplus.vo.timeline.TimeSecound;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ValidatorUtils {
+
+    /**
+     * 判断内容不为空
+     *
+     * @param str
+     * @return
+     */
+    public static boolean notEmpty(Object str) {
+        if (str != null && str.toString().trim().length() > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 判断内容不为空（包含数组）
+     *
+     * @param str
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static boolean notEmptyIncludeArray(Object str) {
+        if (str != null && String.valueOf(str).trim().length() > 0) {
+            if (str instanceof Object[]) {// 增加了数组长度判断
+                Object[] array = (Object[]) str;
+                if (array.length > 0)
+                    return true;
+
+                return false;
+            } else if (str instanceof List<?>) {// 增加了数组长度判断
+                List<Object> list = (List<Object>) str;
+                if (list.size() > 0)
+                    return true;
+
+                return false;
+            }
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 判断内容是空
+     *
+     * @param str
+     * @return
+     */
+    public static boolean isEmpty(Object str) {
+        if (str == null || str.toString().trim().length() == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 检查对象是否为空
+     *
+     * @param obj 要检查的数据(数据类型: String、Number、Boolean、Collection、Map、Object[])
+     * @return true: 为空; false: 不为空 <li>String：值为 null、""、"0" 时返回 true <li>
+     * Number：值为 null、0 时返回 true <li>Boolean：值为 null、false 时返回 true <li>
+     * Collection：值为 null、size=0 时返回 true <li>Map：值为 null、size=0 时返回
+     * true <li>Object[]：值为 null、length=0 时返回 true
+     */
+    @SuppressWarnings("unchecked")
+    public static boolean empty(Object obj) {
+        if (obj == null) {
+            return true;
+        } else if (obj instanceof String && (obj.equals(""))) {
+            return true;
+        } else if (obj instanceof Number && ((Number) obj).doubleValue() == 0) {
+            return true;
+        } else if (obj instanceof Boolean && !((Boolean) obj)) {
+            return true;
+        } else if (obj instanceof Collection && ((Collection) obj).isEmpty()) {
+            return true;
+        } else if (obj instanceof Map && ((Map) obj).isEmpty()) {
+            return true;
+        } else if (obj instanceof Object[] && ((Object[]) obj).length == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 判断是否是合法邮箱地址
+     *
+     * @param email
+     * @return
+     */
+    public static boolean isEmail(String email) {
+        Pattern p = Pattern
+                .compile("^\\w+([\\-+.]\\w+)*@\\w+([-.]\\w+)*\\.[a-z]{2,3}");
+        Matcher m = p.matcher(email);
+        return m.matches();
+    }
+
+    /**
+     * 只包含英文字母和数字、下划线
+     *
+     * @param str
+     * @return
+     */
+    public static boolean onlyNumAndChar(String str) {
+        String regex = "^[a-zA-Z0-9_]+$";
+        Pattern pattern = Pattern.compile(regex);
+        return pattern.matcher(str).matches();
+    }
+
+    /**
+     * 必须包含字母
+     *
+     * @param str
+     * @return
+     */
+    public static boolean hasLetterAndNum(String str) {
+        Pattern pattern = Pattern.compile("^(?=.*[a-zA-Z].*).{6,}$");
+        return pattern.matcher(str).matches();
+    }
+
+    /**
+     * 是否长度符合
+     *
+     * @param str
+     * @param min 最小
+     * @param max 最大
+     * @return
+     */
+    public static boolean lengthBetween(String str, int min, int max) {
+        return str.length() >= min && str.length() <= max;
+    }
+
+    /**
+     * 判断字符串是否是数字
+     *
+     * @param str
+     * @return
+     */
+    public static boolean isNumeric(String str) {
+        Pattern pattern = Pattern.compile("[0-9]*");
+        Matcher isNum = pattern.matcher(str);
+        if (!isNum.matches()) {
+            return false;
+        }
+        return true;
+    }
+
+    public static Double rountTwo(Double num) {
+        if (num != null) {
+            BigDecimal b = new BigDecimal(num);
+            Double d = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+            return d;
+        } else {
+            return null;
+        }
+    }
+
+    public static String doubleTrans(double d) {
+        if (Math.round(d) - d == 0) {
+            return String.valueOf((long) d);
+        }
+        return String.valueOf(d);
+    }
+
+    /**
+     * 获取结束时间与当前的时间差
+     *
+     * @param endTime
+     * @return
+     */
+//    public static TimeSecound getTimeSecound(Date endTime) {
+//
+//        long diff = endTime.getTime() - System.currentTimeMillis();// 这样得到的差值是微秒级别
+//
+//        long days = diff / (1000 * 60 * 60 * 24);//天
+//
+//        long hours = (diff - days * (1000 * 60 * 60 * 24))
+//                / (1000 * 60 * 60);    //小时
+//        long mins = (diff - days * (1000 * 60 * 60 * 24) - hours * (1000 * 60 * 60)) / (1000 * 60);    //小时
+//        long sc = (diff - days * (1000 * 60 * 60 * 24) - hours
+//                * (1000 * 60 * 60) - mins * (1000 * 60)) / (1000); // 秒
+//
+//        return new TimeSecound(days, hours, mins, sc);
+//    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/WeixinCheckoutUtil.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/WeixinCheckoutUtil.java
new file mode 100644
index 00000000..4fdb1dea
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/WeixinCheckoutUtil.java
@@ -0,0 +1,89 @@
+package com.yxt.supervise.customer.biz.util;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 15:52
+ */
+public class WeixinCheckoutUtil {
+
+
+    // 与接口配置信息中的Token要一致
+    private static String token = "yxthryy";
+
+    /**
+     * 验证签名
+     *
+     * @param signature
+     * @param timestamp
+     * @param nonce
+     * @return
+     */
+    public static boolean checkSignature(String signature, String timestamp, String nonce) {
+        String[] arr = new String[] { token, timestamp, nonce };
+        // 将token、timestamp、nonce三个参数进行字典序排序
+        // Arrays.sort(arr);
+        sort(arr);
+        StringBuilder content = new StringBuilder();
+        for (int i = 0; i < arr.length; i++) {
+            content.append(arr[i]);
+        }
+        MessageDigest md = null;
+        String tmpStr = null;
+
+        try {
+            md = MessageDigest.getInstance("SHA-1");
+            // 将三个参数字符串拼接成一个字符串进行sha1加密
+            byte[] digest = md.digest(content.toString().getBytes());
+            tmpStr = byteToStr(digest);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        content = null;
+        // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
+
+        return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param byteArray
+     * @return
+     */
+    private static String byteToStr(byte[] byteArray) {
+        String strDigest = "";
+        for (int i = 0; i < byteArray.length; i++) {
+            strDigest += byteToHexStr(byteArray[i]);
+        }
+        return strDigest;
+    }
+
+    /**
+     * 将字节转换为十六进制字符串
+     *
+     * @param mByte
+     * @return
+     */
+    private static String byteToHexStr(byte mByte) {
+        char[] Digit = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        char[] tempArr = new char[2];
+        tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
+        tempArr[1] = Digit[mByte & 0X0F];
+        String s = new String(tempArr);
+        return s;
+    }
+    public static void sort(String a[]) {
+        for (int i = 0; i < a.length - 1; i++) {
+            for (int j = i + 1; j < a.length; j++) {
+                if (a[j].compareTo(a[i]) < 0) {
+                    String temp = a[i];
+                    a[i] = a[j];
+                    a[j] = temp;
+                }
+            }
+        }
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/XmlUtil.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/XmlUtil.java
new file mode 100644
index 00000000..90effbb7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/XmlUtil.java
@@ -0,0 +1,201 @@
+package com.yxt.supervise.customer.biz.util;//package com.supervise.rms.biz.util;
+//
+//
+//import com.mysql.cj.util.StringUtils;
+//import org.dom4j.Document;
+//import org.dom4j.DocumentHelper;
+//import org.dom4j.Element;
+//
+//import java.lang.reflect.Field;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * xml相关的工具类
+// *
+// * @author yang.y
+// */
+//@SuppressWarnings("unchecked")
+//public class XmlUtil {
+//
+//    /**
+//     * xml字符串转换成bean对象
+//     *
+//     * @param xmlStr xml字符串
+//     * @param clazz  待转换的class
+//     * @return 转换后的对象
+//     */
+//    public static Object xmlStrToBean(String xmlStr, Class clazz) {
+//        Object obj = null;
+//        try {
+//            // 将xml格式的数据转换成Map对象
+//            Map<String, Object> map = xmlStrToMap(xmlStr);
+//            // 将map对象的数据转换成Bean对象
+//            obj = mapToBean(map, clazz);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return obj;
+//    }
+//
+//    /**
+//     * 将xml格式的字符串转换成Map对象
+//     *
+//     * @param xmlStr xml格式的字符串
+//     * @return Map对象
+//     * @throws Exception 异常
+//     */
+//    public static Map<String, Object> xmlStrToMap(String xmlStr) throws Exception {
+//        if (StringUtils.isNullOrEmpty(xmlStr)) {
+//            return null;
+//        }
+//        Map<String, Object> map = new HashMap<String, Object>();
+//        // 将xml格式的字符串转换成Document对象
+//        Document doc = DocumentHelper.parseText(xmlStr);
+//        // 获取根节点
+//        Element root = doc.getRootElement();
+//        // 获取根节点下的所有元素
+//        List children = root.elements();
+//        // 循环所有子元素
+//        if (children != null && children.size() > 0) {
+//            for (int i = 0; i < children.size(); i++) {
+//                Element child = (Element) children.get(i);
+//                map.put(child.getName(), child.getTextTrim());
+//            }
+//        }
+//        return map;
+//    }
+//
+//    /**
+//     * 将xml格式字符串转换成Bean对象
+//     * 多级子节点递归遍历
+//     *
+//     * @param xmlStr
+//     * @param clazz
+//     * @return
+//     * @throws Exception
+//     */
+//    public static Object xmlStrToJavaBean(String xmlStr, Class clazz) {
+//        if (StringUtils.isNullOrEmpty(xmlStr)) {
+//            return null;
+//        }
+//        Object obj = null;
+//        Map<String, Object> map = new HashMap<String, Object>();
+//        // 将xml格式的字符串转换成Document对象
+//        Document doc;
+//        try {
+//            doc = DocumentHelper.parseText(xmlStr);
+//
+//            // 获取根节点
+//            Element root = doc.getRootElement();
+//            map = elementToMap(root, map);
+//            // 将map对象的数据转换成Bean对象
+//            obj = mapToBean(map, clazz);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return obj;
+//    }
+//
+//    /**
+//     * 递归遍历xml子节点，转换Map
+//     *
+//     * @param element
+//     * @param map
+//     * @return
+//     */
+//    public static Map<String, Object> elementToMap(Element element, Map<String, Object> map) {
+//        if (element == null || map == null)
+//            return null;
+//        List children = element.elements();
+//        if (children != null && children.size() > 0) {
+//            for (int i = 0; i < children.size(); i++) {
+//                Element child = (Element) children.get(i);
+//                if (child.elements() != null && child.elements().size() > 0)
+//                    elementToMap(child, map);
+//                else
+//                    map.put(child.getName(), child.getTextTrim());
+//            }
+//        }
+//        return map;
+//    }
+//
+//    /**
+//     * 将Map对象通过反射机制转换成Bean对象
+//     *
+//     * @param map   存放数据的map对象
+//     * @param clazz 待转换的class
+//     * @return 转换后的Bean对象
+//     * @throws Exception 异常
+//     */
+//    public static Object mapToBean(Map<String, Object> map, Class clazz) throws Exception {
+//        Object obj = clazz.newInstance();
+//        if (map != null && map.size() > 0) {
+//            for (Map.Entry<String, Object> entry : map.entrySet()) {
+//                String propertyName = entry.getKey();
+//                Object value = entry.getValue();
+//                String setMethodName = "set" + propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1);
+//                Field field = getClassField(clazz, propertyName);
+//                if (field != null) {
+//                    Class fieldTypeClass = field.getType();
+//                    value = convertValType(value, fieldTypeClass);
+//                    clazz.getMethod(setMethodName, field.getType()).invoke(obj, value);
+//                }
+//            }
+//        }
+//        return obj;
+//    }
+//
+//    /**
+//     * 将Object类型的值，转换成bean对象属性里对应的类型值
+//     *
+//     * @param value          Object对象值
+//     * @param fieldTypeClass 属性的类型
+//     * @return 转换后的值
+//     */
+//    private static Object convertValType(Object value, Class fieldTypeClass) {
+//        Object retVal = null;
+//        if (Long.class.getName().equals(fieldTypeClass.getName())
+//                || long.class.getName().equals(fieldTypeClass.getName())) {
+//            retVal = Long.parseLong(value.toString());
+//        } else if (Integer.class.getName().equals(fieldTypeClass.getName())
+//                || int.class.getName().equals(fieldTypeClass.getName())) {
+//            retVal = Integer.parseInt(value.toString());
+//        } else if (Float.class.getName().equals(fieldTypeClass.getName())
+//                || float.class.getName().equals(fieldTypeClass.getName())) {
+//            retVal = Float.parseFloat(value.toString());
+//        } else if (Double.class.getName().equals(fieldTypeClass.getName())
+//                || double.class.getName().equals(fieldTypeClass.getName())) {
+//            retVal = Double.parseDouble(value.toString());
+//        } else {
+//            retVal = value;
+//        }
+//        return retVal;
+//    }
+//
+//    /**
+//     * 获取指定字段名称查找在class中的对应的Field对象(包括查找父类)
+//     *
+//     * @param clazz     指定的class
+//     * @param fieldName 字段名称
+//     * @return Field对象
+//     */
+//    private static Field getClassField(Class clazz, String fieldName) {
+//        if (Object.class.getName().equals(clazz.getName())) {
+//            return null;
+//        }
+//        Field[] declaredFields = clazz.getDeclaredFields();
+//        for (Field field : declaredFields) {
+//            if (field.getName().equals(fieldName)) {
+//                return field;
+//            }
+//        }
+//
+//        Class superClass = clazz.getSuperclass();
+//        if (superClass != null) {// 简单的递归一下
+//            return getClassField(superClass, fieldName);
+//        }
+//        return null;
+//    }
+//}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/MD5.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/MD5.java
new file mode 100644
index 00000000..4ccb91a8
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/MD5.java
@@ -0,0 +1,29 @@
+package com.yxt.supervise.customer.biz.util.applet;
+
+import java.security.MessageDigest;
+
+public class MD5 {
+    private MD5() {
+    }
+
+    /*  * 生成 MD5
+     *
+     * @param data 待处理数据
+     * @return MD5结果
+     */
+    public static String getMessageDigest(String data) {
+        StringBuilder sb = new StringBuilder();
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] array = md.digest(data.getBytes("UTF-8"));
+
+            for (byte item : array) {
+                sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+            }
+        } catch (Exception e) {
+            return null;
+        }
+        return sb.toString().toUpperCase();
+    }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/TemplateData.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/TemplateData.java
new file mode 100644
index 00000000..a1e3449a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/TemplateData.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.biz.util.applet;
+
+/**
+ * 模板详细信息
+ * 根据需求自己更改
+ */
+public class TemplateData {
+    private String value;
+    private String color;
+
+    public TemplateData() {
+    }
+
+    public TemplateData(String value, String color) {
+        this.value = value;
+        this.color = color;
+    }
+
+    /**
+     * @return the value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * @param value the value to set
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * @return the color
+     */
+    public String getColor() {
+        return color;
+    }
+
+    /**
+     * @param color the color to set
+     */
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_HttpsUtil.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_HttpsUtil.java
new file mode 100644
index 00000000..822cf999
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_HttpsUtil.java
@@ -0,0 +1,80 @@
+package com.yxt.supervise.customer.biz.util.applet;
+
+
+import com.yxt.supervise.customer.biz.util.MyX509TrustManager;
+import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.URL;
+
+public class WX_HttpsUtil {
+
+    private static Logger log = LoggerFactory.getLogger(WX_HttpsUtil.class);
+
+    /**
+     * 发送https请求
+     *
+     * @param requestUrl    请求地址
+     * @param requestMethod 请求方式（GET、POST）
+     * @param outputStr     提交的数据
+     * @return JSONObject(通过JSONObject.get ( key)的方式获取json对象的属性值)
+     */
+    public static JSONObject httpsRequest(String requestUrl, String requestMethod, String outputStr) {
+        JSONObject jsonObject = null;
+        try {
+            // 创建SSLContext对象，并使用我们指定的信任管理器初始化
+            TrustManager[] tm = {new MyX509TrustManager()};
+            SSLContext sslContext = SSLContext.getInstance("SSL", "SunJSSE");
+            sslContext.init(null, tm, new java.security.SecureRandom());
+            // 从上述SSLContext对象中得到SSLSocketFactory对象
+            SSLSocketFactory ssf = sslContext.getSocketFactory();
+            URL url = new URL(requestUrl);
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            conn.setSSLSocketFactory(ssf);
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            conn.setUseCaches(false);
+            // 设置请求方式（GET/POST）
+            conn.setRequestMethod(requestMethod);
+            // 当outputStr不为null时向输出流写数据
+            if (null != outputStr) {
+                OutputStream outputStream = conn.getOutputStream();
+                // 注意编码格式
+                outputStream.write(outputStr.getBytes("UTF-8"));
+                outputStream.close();
+            }
+            // 从输入流读取返回内容
+            InputStream inputStream = conn.getInputStream();
+            InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8");
+            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+            String str = null;
+            StringBuffer buffer = new StringBuffer();
+            while ((str = bufferedReader.readLine()) != null) {
+                buffer.append(str);
+            }
+            // 释放资源
+            bufferedReader.close();
+            inputStreamReader.close();
+            inputStream.close();
+            inputStream = null;
+            conn.disconnect();
+            jsonObject = JSONObject.fromObject(buffer.toString());
+        } catch (ConnectException ce) {
+            log.error("连接超时：{}", ce);
+        } catch (Exception e) {
+            log.error("https请求异常：{}", e);
+        }
+        return jsonObject;
+    }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_TemplateMsgUtil.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_TemplateMsgUtil.java
new file mode 100644
index 00000000..3985a66c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WX_TemplateMsgUtil.java
@@ -0,0 +1,112 @@
+package com.yxt.supervise.customer.biz.util.applet;
+
+
+import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+public class WX_TemplateMsgUtil {
+
+    private static Logger log = LoggerFactory.getLogger(WX_TemplateMsgUtil.class);
+
+    /**
+     * 封装模板详细信息
+     *
+     * @return
+     */
+    public static JSONObject packJsonmsg(Map<String, TemplateData> param) {
+        JSONObject json = new JSONObject();
+        for (Map.Entry<String, TemplateData> entry : param.entrySet()) {
+            JSONObject keyJson = new JSONObject();
+            TemplateData dta = entry.getValue();
+            keyJson.put("value", dta.getValue());
+            keyJson.put("color", dta.getColor());
+            json.put(entry.getKey(), keyJson);
+        }
+        return json;
+    }
+
+    /**
+     * 根据模板的编号 新增并获取模板ID
+     *
+     * @param templateSerialNumber 模板库中模板的 "编号"
+     * @return 模板ID
+     */
+    public static String getWXTemplateMsgId(String templateSerialNumber, String token) {
+        String tmpurl = "https://api.weixin.qq.com/cgi-bin/template/api_add_template?access_token=" + token;
+        JSONObject json = new JSONObject();
+        json.put("template_id_short", templateSerialNumber);
+        JSONObject resultJson = WX_HttpsUtil.httpsRequest(tmpurl, "POST", json.toString());
+        //  JSONObject resultJson = JSONObject.fromObject(result);
+        String errmsg = (String) resultJson.get("errmsg");
+        log.info("获取模板编号返回信息：" + errmsg);
+        if (!"ok".equals(errmsg)) {
+            return "error";
+        }
+        String templateId = (String) resultJson.get("template_id");
+        return templateId;
+    }
+
+    /**
+     * 根据模板ID 删除模板消息
+     *
+     * @param templateId 模板ID
+     * @return
+     */
+    public static String deleteWXTemplateMsgById(String templateId, String token) {
+        String tmpurl = "https://api.weixin.qq.com/cgi-bin/template/del_private_template?access_token=" + token;
+        JSONObject json = new JSONObject();
+        json.put("template_id", templateId);
+        try {
+            JSONObject resultJson = WX_HttpsUtil.httpsRequest(tmpurl, "POST", json.toString());
+            //  JSONObject resultJson = new JSONObject(result);
+            log.info("删除" + templateId + "模板消息,返回CODE：" + resultJson.get("errcode"));
+            String errmsg = (String) resultJson.get("errmsg");
+            if (!"ok".equals(errmsg)) {
+                return "error";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "success";
+    }
+
+
+    /**
+     * 发送微信消息(模板消息)
+     *
+     * @param touser    用户 OpenID
+     * @param templatId 模板消息ID
+     * @param page      URL置空，则在发送后，点击模板消息会进入一个空白页面（ios），或无法点击（android）。
+     * @param formId
+     * @param data      详细内容
+     * @return
+     */
+    public static String sendWechatMsgToUser(String touser, String templatId, String page, String formId, JSONObject data, String token) {
+        String tmpurl = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token=" + token;
+
+        JSONObject json = new JSONObject();
+        json.put("touser", touser);
+        json.put("form_id", formId);
+        json.put("page", page);
+        json.put("template_id", templatId);
+        json.put("data", data);
+        try {
+            JSONObject resultJson = WX_HttpsUtil.httpsRequest(tmpurl, "POST", json.toString());
+            // JSONObject resultJson = new JSONObject(result);
+            log.info("发送微信消息返回信息：" + resultJson.get("errcode"));
+            String errmsg = (String) resultJson.get("errmsg");
+            if (!"ok".equals(errmsg)) {  //如果为errmsg为ok，则代表发送成功，公众号推送信息给用户了。
+                return "error";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "error";
+        }
+
+        return "success";
+    }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatConfig.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatConfig.java
new file mode 100644
index 00000000..50c47682
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatConfig.java
@@ -0,0 +1,39 @@
+package com.yxt.supervise.customer.biz.util.applet;
+
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+
+import javax.net.ssl.SSLContext;
+import java.io.InputStream;
+import java.security.KeyStore;
+
+@SuppressWarnings("deprecation")
+public class WechatConfig {
+
+    private static SSLConnectionSocketFactory sslcsf;
+
+    public static SSLConnectionSocketFactory getSslcsf() {
+        if (null == sslcsf) {
+            setSsslcsf();
+        }
+        return sslcsf;
+    }
+
+    private static void setSsslcsf() {
+        try {
+            KeyStore keyStore = KeyStore.getInstance("PKCS12");
+            Thread.currentThread().getContextClassLoader();
+            InputStream instream = new WechatRefundApiResult().getClass().getResourceAsStream("certName");
+            try {
+                keyStore.load(instream, "mchId".toCharArray());
+            } finally {
+                instream.close();
+            }
+            SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, "mchId".toCharArray()).build();
+            sslcsf = new SSLConnectionSocketFactory(sslcontext, new String[]{"TLSv1"}, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatRefundApiResult.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatRefundApiResult.java
new file mode 100644
index 00000000..76990b8c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatRefundApiResult.java
@@ -0,0 +1,214 @@
+package com.yxt.supervise.customer.biz.util.applet;
+
+public class WechatRefundApiResult {
+    private String return_code;
+    private String return_msg;
+
+    private String result_code;
+    private String err_code;
+    private String err_code_des;
+    private String appid;
+    private String mch_id;
+    private String device_info;
+    private String nonce_str;
+    private String sign;
+    private String transaction_id;
+    private String out_trade_no;
+    private String out_refund_no;
+    private String refund_id;
+    private String refund_channel;
+    private String refund_fee;
+    private String settlement_refund_fee;
+    private String total_fee;
+    private String settlement_total_fee;
+    private String fee_type;
+    private String cash_fee;
+    private String cash_refund_fee;
+    private String refund_status;
+
+    public String getRefund_status() {
+        return refund_status;
+    }
+
+    public void setRefund_status(String refund_status) {
+        this.refund_status = refund_status;
+    }
+
+    public String getReturn_code() {
+        return return_code;
+    }
+
+    public void setReturn_code(String return_code) {
+        this.return_code = return_code;
+    }
+
+    public String getReturn_msg() {
+        return return_msg;
+    }
+
+    public void setReturn_msg(String return_msg) {
+        this.return_msg = return_msg;
+    }
+
+    public String getResult_code() {
+        return result_code;
+    }
+
+    public void setResult_code(String result_code) {
+        this.result_code = result_code;
+    }
+
+    public String getErr_code() {
+        return err_code;
+    }
+
+    public void setErr_code(String err_code) {
+        this.err_code = err_code;
+    }
+
+    public String getErr_code_des() {
+        return err_code_des;
+    }
+
+    public void setErr_code_des(String err_code_des) {
+        this.err_code_des = err_code_des;
+    }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getMch_id() {
+        return mch_id;
+    }
+
+    public void setMch_id(String mch_id) {
+        this.mch_id = mch_id;
+    }
+
+    public String getDevice_info() {
+        return device_info;
+    }
+
+    public void setDevice_info(String device_info) {
+        this.device_info = device_info;
+    }
+
+    public String getNonce_str() {
+        return nonce_str;
+    }
+
+    public void setNonce_str(String nonce_str) {
+        this.nonce_str = nonce_str;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getTransaction_id() {
+        return transaction_id;
+    }
+
+    public void setTransaction_id(String transaction_id) {
+        this.transaction_id = transaction_id;
+    }
+
+    public String getOut_trade_no() {
+        return out_trade_no;
+    }
+
+    public void setOut_trade_no(String out_trade_no) {
+        this.out_trade_no = out_trade_no;
+    }
+
+    public String getOut_refund_no() {
+        return out_refund_no;
+    }
+
+    public void setOut_refund_no(String out_refund_no) {
+        this.out_refund_no = out_refund_no;
+    }
+
+    public String getRefund_id() {
+        return refund_id;
+    }
+
+    public void setRefund_id(String refund_id) {
+        this.refund_id = refund_id;
+    }
+
+    public String getRefund_channel() {
+        return refund_channel;
+    }
+
+    public void setRefund_channel(String refund_channel) {
+        this.refund_channel = refund_channel;
+    }
+
+    public String getRefund_fee() {
+        return refund_fee;
+    }
+
+    public void setRefund_fee(String refund_fee) {
+        this.refund_fee = refund_fee;
+    }
+
+    public String getSettlement_refund_fee() {
+        return settlement_refund_fee;
+    }
+
+    public void setSettlement_refund_fee(String settlement_refund_fee) {
+        this.settlement_refund_fee = settlement_refund_fee;
+    }
+
+    public String getTotal_fee() {
+        return total_fee;
+    }
+
+    public void setTotal_fee(String total_fee) {
+        this.total_fee = total_fee;
+    }
+
+    public String getSettlement_total_fee() {
+        return settlement_total_fee;
+    }
+
+    public void setSettlement_total_fee(String settlement_total_fee) {
+        this.settlement_total_fee = settlement_total_fee;
+    }
+
+    public String getFee_type() {
+        return fee_type;
+    }
+
+    public void setFee_type(String fee_type) {
+        this.fee_type = fee_type;
+    }
+
+    public String getCash_fee() {
+        return cash_fee;
+    }
+
+    public void setCash_fee(String cash_fee) {
+        this.cash_fee = cash_fee;
+    }
+
+    public String getCash_refund_fee() {
+        return cash_refund_fee;
+    }
+
+    public void setCash_refund_fee(String cash_refund_fee) {
+        this.cash_refund_fee = cash_refund_fee;
+    }
+
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatUtil.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatUtil.java
new file mode 100644
index 00000000..587fba2b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/util/applet/WechatUtil.java
@@ -0,0 +1,296 @@
+package com.yxt.supervise.customer.biz.util.applet;
+
+//import com.supervise.rms.biz.util.CharUtil;
+//import com.supervise.rms.biz.util.MapUtils;
+//import com.supervise.rms.biz.util.XmlUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * <p>Title: 微信退款工具类</p>
+ * <p>Description: 微信退款工具类，通过充值客户端的不同初始化不同的工具类，得到相应微信退款相关的appid和muchid</p>
+ *
+ * @author xubo
+ * @date 2017年6月6日  下午5:05:03
+ */
+public class WechatUtil {
+    /**
+     * 充值客户端类型--微信公众号
+     */
+    public static Integer CLIENTTYPE_WX = 2;
+    /**
+     * 充值客户端类型--app
+     */
+    public static Integer CLIENTTYPE_APP = 1;
+    private static Logger logger = LoggerFactory.getLogger(WechatUtil.class);
+
+    /**
+     * 方法描述：微信退款逻辑
+     * 创建时间：2017年4月12日  上午11:04:25
+     * 作者： xubo
+     *
+     * @param
+     * @return
+     */
+   /* public static WechatRefundApiResult wxRefund(String out_trade_no, Double orderMoney, Double refundMoney) {
+        //初始化请求微信服务器的配置信息包括appid密钥等
+        //转换金钱格式
+        BigDecimal bdOrderMoney = new BigDecimal(orderMoney, MathContext.DECIMAL32);
+        BigDecimal bdRefundMoney = new BigDecimal(refundMoney, MathContext.DECIMAL32);
+        //构建请求参数
+        Map<Object, Object> params = buildRequsetMapParam(out_trade_no, bdOrderMoney, bdRefundMoney);
+        String mapToXml = MapUtils.convertMap2Xml(params);
+        //请求微信
+        String reponseXml = sendSSLPostToWx(mapToXml, WechatConfig.getSslcsf());
+        WechatRefundApiResult result = (WechatRefundApiResult) XmlUtil.xmlStrToBean(reponseXml, WechatRefundApiResult.class);
+        return result;
+    }*/
+
+    /**
+     * 方法描述：得到请求微信退款请求的参数
+     * 创建时间：2017年6月8日  上午11:27:02
+     * 作者： xubo
+     *
+     * @param
+     * @return
+     */
+   /* private static Map<Object, Object> buildRequsetMapParam(String out_trade_no, BigDecimal bdOrderMoney, BigDecimal bdRefundMoney) {
+        Map<Object, Object> params = new HashMap<Object, Object>();
+        //微信分配的公众账号ID（企业号corpid即为此appId）
+        params.put("appid", ResourceUtil.getConfigByName("wx.appId"));
+        //微信支付分配的商户号
+        params.put("mch_id", ResourceUtil.getConfigByName("wx.mchId"));
+        //随机字符串，不长于32位。推荐随机数生成算法
+        params.put("nonce_str", CharUtil.getRandomString(16));
+        //商户侧传给微信的订单号
+        params.put("out_trade_no", out_trade_no);
+        //商户系统内部的退款单号，商户系统内部唯一，同一退款单号多次请求只退一笔
+        params.put("out_refund_no", getBundleId());
+        //订单总金额，单位为分，只能为整数
+        params.put("total_fee", bdOrderMoney.multiply(new BigDecimal(100)).intValue());
+        //退款总金额，订单总金额，单位为分，只能为整数
+        params.put("refund_fee", bdRefundMoney.multiply(new BigDecimal(100)).intValue());
+        //操作员帐号, 默认为商户号
+        params.put("op_user_id", ResourceUtil.getConfigByName("wx.mchId"));
+        //签名前必须要参数全部写在前面
+        params.put("sign", arraySign(params, ResourceUtil.getConfigByName("wx.paySignKey")));
+        return params;
+    }*/
+
+    /**
+     * ResourceUtil.getConfigByName("wx.refundUrl")
+     * 请求微信https
+     **/
+    public static String sendSSLPostToWx(String mapToXml, SSLConnectionSocketFactory sslcsf, String refundUrl) {
+        logger.info("*******退款（WX Request：" + mapToXml);
+        HttpPost httPost = new HttpPost(refundUrl);
+        httPost.addHeader("Connection", "keep-alive");
+        httPost.addHeader("Accept", "*/*");
+        httPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+        httPost.addHeader("Host", "api.mch.weixin.qq.com");
+        httPost.addHeader("X-Requested-With", "XMLHttpRequest");
+        httPost.addHeader("Cache-Control", "max-age=0");
+        httPost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) ");
+        httPost.setEntity(new StringEntity(mapToXml, "UTF-8"));
+        CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(sslcsf).build();
+        CloseableHttpResponse response = null;
+        try {
+            response = httpClient.execute(httPost);
+            HttpEntity entity = response.getEntity();
+            String xmlStr = EntityUtils.toString(entity, "UTF-8");
+            logger.info("*******退款（WX Response：" + xmlStr);
+            return xmlStr;
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            return null;
+        } finally {
+            try {
+                if (response != null) {
+                    response.close();
+                }
+            } catch (IOException e) {
+                logger.error(e.getMessage(), e);
+            }
+        }
+    }
+
+    /**
+     * 支付交易ID
+     */
+    public static String getBundleId() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        String tradeno = dateFormat.format(new Date());
+        String str = "000000" + (int) (Math.random() * 1000000);
+        tradeno = tradeno + str.substring(str.length() - 6);
+        return tradeno;
+    }
+
+    /**
+     * 方法描述：根据签名加密请求参数
+     * 创建时间：2017年6月8日  上午11:28:52
+     * 作者： xubo
+     *
+     * @param
+     * @return
+     */
+    public static String arraySign(Map<Object, Object> params, String paySignKey) {
+        boolean encode = false;
+        Set<Object> keysSet = params.keySet();
+        Object[] keys = keysSet.toArray();
+        Arrays.sort(keys);
+        StringBuffer temp = new StringBuffer();
+        boolean first = true;
+        for (Object key : keys) {
+            if (first) {
+                first = false;
+            } else {
+                temp.append("&");
+            }
+            temp.append(key).append("=");
+            Object value = params.get(key);
+            String valueString = "";
+            if (null != value) {
+                valueString = value.toString();
+            }
+            if (encode) {
+                try {
+                    temp.append(URLEncoder.encode(valueString, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                temp.append(valueString);
+            }
+        }
+        temp.append("&key=");
+        temp.append(paySignKey);
+        System.out.println(temp.toString());
+        String packageSign = MD5.getMessageDigest(temp.toString());
+        return packageSign;
+    }
+
+    /**
+     * 请求，只请求一次，不做重试
+     *
+     * @param url
+     * @param data
+     * @return
+     * @throws Exception
+     */
+    public static String requestOnce(final String url, String data) throws Exception {
+        BasicHttpClientConnectionManager connManager;
+        connManager = new BasicHttpClientConnectionManager(
+                RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                        .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                        .build(),
+                null,
+                null,
+                null
+        );
+
+        HttpClient httpClient = HttpClientBuilder.create()
+                .setConnectionManager(connManager)
+                .build();
+
+        HttpPost httpPost = new HttpPost(url);
+
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(5000)
+                .setConnectTimeout(5000)
+                .setConnectionRequestTimeout(10000).build();
+
+        httpPost.setConfig(requestConfig);
+
+        StringEntity postEntity = new StringEntity(data, "UTF-8");
+        httpPost.addHeader("Content-Type", "text/xml");
+        httpPost.addHeader("User-Agent", "wxpay sdk java v1.0 " + "mchId");
+        httpPost.setEntity(postEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        HttpEntity httpEntity = httpResponse.getEntity();
+        String reusltObj = EntityUtils.toString(httpEntity, "UTF-8");
+        logger.info("请求结果:" + reusltObj);
+        return reusltObj;
+
+    }
+
+    /**
+     * 方法描述：微信查询退款逻辑
+     * 创建时间：2017年4月12日  上午11:04:25
+     * 作者： xubo
+     *
+     * @param
+     * @return
+     */
+
+
+//    public Map<String, Object> wxRefundquery(String out_trade_no, String out_refund_no) {
+//        Map<Object, Object> params = new HashMap<Object, Object>();
+//        //微信分配的公众账号ID（企业号corpid即为此appId）
+//        params.put("appid", "xx");
+//        //微信支付分配的商户号
+//        params.put("mch_id", "xx");
+//        //随机字符串，不长于32位。推荐随机数生成算法
+//        params.put("nonce_str", CharUtil.getRandomString(16));
+//        //商户侧传给微信的订单号
+//        params.put("out_trade_no", out_trade_no);
+//        //签名前必须要参数全部写在前面
+//        //签名
+//        params.put("sign", arraySign(params, "wx.paySignKey"));
+//        String mapToXml = MapUtils.convertMap2Xml(params);
+//        HttpPost httPost = new HttpPost("refundqueryUrl");
+//        httPost.addHeader("Connection", "keep-alive");
+//        httPost.addHeader("Accept", "*/*");
+//        httPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+//        httPost.addHeader("Host", "api.mch.weixin.qq.com");
+//        httPost.addHeader("X-Requested-With", "XMLHttpRequest");
+//        httPost.addHeader("Cache-Control", "max-age=0");
+//        httPost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) ");
+//        httPost.setEntity(new StringEntity(mapToXml, "UTF-8"));
+//        CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(WechatConfig.getSslcsf()).build();
+//        CloseableHttpResponse response = null;
+//        try {
+//            response = httpClient.execute(httPost);
+//            HttpEntity entity = response.getEntity();
+//            String xmlStr = EntityUtils.toString(entity, "UTF-8");
+//            System.out.println(xmlStr);
+//            Map<String, Object> result = XmlUtil.xmlStrToMap(xmlStr);//.xmlStrToBean(xmlStr, WechatRefundApiResult.class);
+//            return result;
+//            //将信息保存到数据库
+//        } catch (Exception e) {
+//            logger.error(e.getMessage(), e);
+//            return null;
+//        } finally {
+//            try {
+//                if (response != null) {
+//                    response.close();
+//                }
+//            } catch (IOException e) {
+//                logger.error(e.getMessage(), e);
+//            }
+//        }
+//    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java
new file mode 100644
index 00000000..821e7931
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java
@@ -0,0 +1,271 @@
+package com.yxt.supervise.customer.biz.wechat;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.supervise.customer.biz.util.JedisLock;
+import com.yxt.supervise.customer.biz.util.JsonUtils;
+import com.yxt.supervise.customer.biz.util.MyX509TrustManager;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.junit.Test;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import javax.annotation.Resource;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 对接微信接口服务
+ * Created by fei on 2017/4/24.
+ */
+@Service
+public class WechatApiService {
+    public final static String access_token_url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET";
+    // 存放：1.token，2：获取token的时间,3.过期时间
+    public final static Map<String, Object> accessTokenMap = new HashMap<String, Object>();
+    private static final String WECHAT_API = "https://api.weixin.qq.com/cgi-bin";
+    private static final String WECHAT_API_TOKEN = WECHAT_API + "/token";
+    private static final String WECHAT_API_TICKET = WECHAT_API + "/ticket/getticket?type=jsapi&access_token=";
+    //private final HttpClient httpclient;
+
+//    @Resource
+//    private SysAppletSetMapper appletSetMapper;
+//    private Jedis jedis;
+//    @Resource
+//    private JedisPool jedisPool;
+    public String getAccessToken() throws Exception {
+//        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+//        if (null == appletSet) {
+//            throw new ApiMallPlusException("没有设置支付配置");
+//        }
+        String appId="wx1d44e0fcd110351a";
+        String appsecret="4764e32722a7d98656dea6afd9405701";
+        String url="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appsecret;
+        RestTemplate restTemplate=new RestTemplate();
+        String re= restTemplate.getForObject(url,String.class);
+        com.alibaba.fastjson.JSONObject jsonObject= com.alibaba.fastjson.JSONObject.parseObject(re);
+        String at=jsonObject.getString("access_token");
+        System.out.println(at);
+        return at;
+    }
+
+//    public WechatApiService() {
+//        RequestConfig config = RequestConfig.custom()
+//                .setConnectTimeout(5000)
+//                .setSocketTimeout(20000)
+//                .setConnectionRequestTimeout(3000)
+//                .build();
+//        httpclient = HttpClients.custom().setDefaultRequestConfig(config).build();
+//    }
+//
+//    /**
+//     * 发起https请求并获取结果
+//     *
+//     * @param requestUrl    请求地址
+//     * @param requestMethod 请求方式（GET、POST）
+//     * @param outputStr     提交的数据
+//     * @return JSONObject(通过JSONObject.get ( key)的方式获取json对象的属性值)
+//     */
+//    public static JSONObject handleRequest(String requestUrl, String requestMethod, String outputStr) {
+//        JSONObject jsonObject = null;
+//
+//        try {
+//            URL url = new URL(requestUrl);
+//            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+//            SSLContext ctx = SSLContext.getInstance("SSL", "SunJSSE");
+//            TrustManager[] tm = {new MyX509TrustManager()};
+//            ctx.init(null, tm, new SecureRandom());
+//            SSLSocketFactory sf = ctx.getSocketFactory();
+//            conn.setSSLSocketFactory(sf);
+//            conn.setDoInput(true);
+//            conn.setDoOutput(true);
+//            conn.setRequestMethod(requestMethod);
+//            conn.setUseCaches(false);
+//
+//            if ("GET".equalsIgnoreCase(requestMethod)) {
+//                conn.connect();
+//            }
+//
+//            if (StringUtils.isNotEmpty(outputStr)) {
+//                OutputStream out = conn.getOutputStream();
+//                out.write(outputStr.getBytes("utf-8"));
+//                out.close();
+//            }
+//
+//            InputStream in = conn.getInputStream();
+//            BufferedReader br = new BufferedReader(new InputStreamReader(in, "utf-8"));
+//            StringBuffer buffer = new StringBuffer();
+//            String line = null;
+//
+//            while ((line = br.readLine()) != null) {
+//                buffer.append(line);
+//            }
+//
+//            in.close();
+//            conn.disconnect();
+//
+//            jsonObject = JSONObject.fromObject(buffer.toString());
+//        } catch (MalformedURLException e) {
+//            e.printStackTrace();
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        } catch (NoSuchAlgorithmException e) {
+//            e.printStackTrace();
+//        } catch (NoSuchProviderException e) {
+//            e.printStackTrace();
+//        } catch (KeyManagementException e) {
+//            e.printStackTrace();
+//        }
+//        return jsonObject;
+//    }
+//
+//    /**
+//     * 获取默认公众号的 access_token
+//     *
+//     * @return access_token
+//     * @throws Exception
+//     */
+//
+//
+//
+//
+//    /**
+//     * 获取  access_token
+//     * https://mp.weixin.qq.com/wiki?action=doc&id=mp1421140183
+//     *
+//     * @return access_token
+//     * @throws Exception
+//     */
+//    public String getAccessToken(String appid, String appSecret) throws Exception {
+//
+//        String key = "access_token:" + appid;
+//        jedis = jedisPool.getResource();
+//        if (jedis.ttl(key) > 30) {
+//            try {
+//                return jedis.get(key);
+//            } finally {
+//                jedis.close();
+//            }
+//
+//        }
+//
+//        //https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET
+//        String lockKey = "lock_" + key;
+//        JedisLock lock = new JedisLock(jedis, lockKey);
+//        boolean acquired = lock.acquire();
+//        if (!acquired) {
+//            jedis.close();
+//            throw new Exception("acquired lock: " + lockKey + " timeout");
+//        }
+//        try {
+//            if (jedis.ttl(key) > 30) {
+//                try {
+//                    return jedis.get(key);
+//                } finally {
+//                    jedis.close();
+//                }
+//            }
+//
+//            HttpGet get = new HttpGet(WECHAT_API_TOKEN + "?grant_type=client_credential&appid=" + appid + "&secret=" + appSecret);
+//            HttpResponse response = httpclient.execute(get);
+//            String text = EntityUtils.toString(response.getEntity());
+//            Map<String, Object> resultMap = JsonUtils.readJsonToMap(text);
+//            String accessToken = (String) resultMap.get("access_token");
+//            int expiresIn = (int) resultMap.get("expires_in");
+//
+//            jedis.set(key, accessToken);
+//            jedis.expire(key, expiresIn);
+//            return accessToken;
+//        } finally {
+//            lock.release();
+//            jedis.close();
+//        }
+//    }
+//
+//    /**
+//     * 获取默认公众号 jsapi_ticket
+//     *
+//     * @return jsapi_ticket
+//     * @throws Exception
+//     */
+//
+//    public String getJsTicket() throws Exception {
+////        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+////        if (null == appletSet) {
+////            throw new ApiMallPlusException("没有设置支付配置");
+////        }
+////        return getJsTicket(appletSet.getAppid(), appletSet.getAppsecret());
+//        return null;
+//    }
+//
+//
+//    /**
+//     * 获取 jsapi_ticket
+//     * https://mp.weixin.qq.com/wiki?action=doc&id=mp1421141115
+//     *
+//     * @param appid
+//     * @param appSecret
+//     * @return ticket
+//     * @throws Exception
+//     */
+//    public String getJsTicket(String appid, String appSecret) throws Exception {
+//        jedis = jedisPool.getResource();
+//        String key = "jsapi_ticket:" + appid;
+//
+//        if (jedis.ttl(key) > 30) {
+//            try {
+//                return jedis.get(key);
+//            } finally {
+//                jedis.close();
+//            }
+//        }
+//
+//        String lockKey = "lock_" + key;
+//        JedisLock lock = new JedisLock(jedis, lockKey);
+//        boolean acquired = lock.acquire();
+//        if (!acquired) {
+//            jedis.close();
+//            throw new Exception("acquired lock: " + lockKey + " timeout");
+//        }
+//
+//        try {
+//            if (jedis.ttl(key) > 30) {
+//                return jedis.get(key);
+//            }
+//
+//            HttpGet get = new HttpGet(WECHAT_API_TICKET + getAccessToken(appid, appSecret));
+//            HttpResponse response = httpclient.execute(get);
+//            String text = EntityUtils.toString(response.getEntity());
+//            Map<String, Object> resultMap = JsonUtils.readJsonToMap(text);
+//            String ticket = (String) resultMap.get("ticket");
+//            int expiresIn = (int) resultMap.get("expires_in");
+//
+//            jedis.set(key, ticket);
+//            jedis.expire(key, expiresIn);
+//            return ticket;
+//        } finally {
+//            lock.release();
+//            jedis.close();
+//        }
+//    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
new file mode 100644
index 00000000..4ca3c9b6
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
@@ -0,0 +1,48 @@
+package com.yxt.supervise.customer.biz.wechat;
+
+import com.yxt.supervise.customer.biz.util.WeixinCheckoutUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 15:44
+ */
+@Api(tags = "测试")
+@RestController
+@RequestMapping("v1/wechat")
+public class WechatRest {
+    String token="yxthryy";
+    @Autowired
+    WechatService wechatService;
+    @ApiOperation("token")
+    @GetMapping(value = "token")
+    public String wechate(String signature,String timestamp,String nonce,String echostr){
+        String token="";
+        if (signature != null && WeixinCheckoutUtil.checkSignature(signature, timestamp, nonce)) {
+            token=wechatService.push();
+        }
+
+        return token;
+    }
+
+  @GetMapping(value = "authGet",produces = "text/plain;charset=utf-8")
+    public String authGet(@RequestParam(name = "signature", required = false) String signature,
+      @RequestParam(name = "timestamp", required = false) String timestamp,
+      @RequestParam(name = "nonce", required = false) String nonce,
+      @RequestParam(name = "echostr", required = false) String echostr) {
+
+    if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) {
+      throw new IllegalArgumentException("请求参数非法，请核实!");
+        }
+    if (WeixinCheckoutUtil.checkSignature( signature, timestamp, nonce)) {
+      return echostr;
+        }
+    return "非法请求";
+  }
+
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java
new file mode 100644
index 00000000..12c9bd33
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.biz.wechat;
+
+
+import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 14:00
+ */
+@Service
+@Slf4j
+public class WechatService {
+    @Autowired
+    private WechatApiService wechatApiService;
+    public String push() {
+        boolean flag = true;
+//        SysAppletSet appletSet = memberService.getSysAppletSet(0);
+//        if (null == appletSet) {
+//            log.error("没有设置支付配置：userId=" + umsMember.getId() + ",orderId=" + order.getId() + ",formId=" + formId);
+//            flag = false;
+//        }
+//        log.info("发送模版消息：userId=" + umsMember.getId() + ",orderId=" + order.getId() + ",formId=" + formId);
+//        if (StringUtils.isEmpty(formId)) {
+//            flag = false;
+//            log.error("发送模版消息：userId=" + umsMember.getId() + ",orderId=" + order.getId() + ",formId=" + formId);
+//        }
+        String accessToken = null;
+        if (flag) {
+
+            try {
+                accessToken = wechatApiService.getAccessToken();
+
+//                String templateId = appletSet.getTemplateid1();
+//                Map<String, TemplateData> param = new HashMap<String, TemplateData>();
+//                param.put("keyword1", new TemplateData(DateUtils.format(order.getCreateTime(), "yyyy-MM-dd"), "#EE0000"));
+//
+//                param.put("keyword2", new TemplateData(name, "#EE0000"));
+//                param.put("keyword3", new TemplateData(order.getOrderSn(), "#EE0000"));
+//                param.put("keyword3", new TemplateData(order.getPayAmount() + "", "#EE0000"));
+//
+//                JSONObject jsonObject = JSONObject.fromObject(param);
+                JSONObject jsonObject = new JSONObject();
+                //调用发送微信消息给用户的接口    ********这里写自己在微信公众平台拿到的模板ID
+                String weiXinOpenId="";
+                String templateId="fVgBuwpLC43YkeGWfl1Vw0mW0Qu5WP2giD77TfKAEc4";
+                String orderId="";
+//                WX_TemplateMsgUtil.sendWechatMsgToUser(weiXinOpenId, templateId, page + "?id=" + orderId,
+//                        formId, jsonObject, accessToken);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+        return accessToken;
+    }
+}

From 65fff87f3c7a1ceecc22b7433aad6d3cdd0d4375 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Fri, 31 Mar 2023 18:04:20 +0800
Subject: [PATCH 03/23] upload

---
 supervise-customer-ui/.env.development        |   2 +-
 .../src/router/modules/codemenu.js            |  16 +
 .../purchaserequisition/uploadxlsx/index.vue  |   8 +-
 yxt-portal-ui/.env.development                |   2 +-
 yxt-portal-ui/src/views/Home/Home.vue         |   2 +-
 .../src/main/resources/application.yml        |   1 +
 .../PurchaseRequisitionRest.java              |  21 +-
 .../PurchaseRequisitionService.java           | 516 +++++-------------
 .../yxt/supervise/customer/tools/StrTool.java |  54 ++
 .../src/main/resources/application.yml        |   4 +-
 10 files changed, 220 insertions(+), 406 deletions(-)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/tools/StrTool.java

diff --git a/supervise-customer-ui/.env.development b/supervise-customer-ui/.env.development
index 75976752..96a7c40f 100644
--- a/supervise-customer-ui/.env.development
+++ b/supervise-customer-ui/.env.development
@@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api/service'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://8.130.39.13:8112"
-VUE_APP_URL = "http://192.168.3.173:8112"
+VUE_APP_URL = "http://127.0.0.1:8112"
diff --git a/supervise-customer-ui/src/router/modules/codemenu.js b/supervise-customer-ui/src/router/modules/codemenu.js
index fd8a2b1f..c715b7ae 100644
--- a/supervise-customer-ui/src/router/modules/codemenu.js
+++ b/supervise-customer-ui/src/router/modules/codemenu.js
@@ -302,5 +302,21 @@ const codemenu = [{
       noCache: true
     }
   }, ]
+}, {
+  path: '/purchaserequisition',
+  component: Layout,
+  redirect: '/purchaserequisition/uploadxlsx',
+  meta: {
+    title: '采购订单管理'
+  },
+  children: [{
+    path: '/purchaserequisition/uploadxlsx',
+    component: () => import('@/views/purchaserequisition/uploadxlsx/index.vue'),
+    name: 'purchaserequisitionUploadxlsx',
+    meta: {
+      title: '上传采购订单',
+      noCache: true
+    }
+  }]
 }]
 export default codemenu
diff --git a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
index 6808567d..274727fb 100644
--- a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
+++ b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
@@ -351,10 +351,10 @@
       },
       handleBeforeUpload(file) {
         console.log('handleBeforeUpload', file)
-        req.checkCodeByFileName(file.name).then(res => {
-          console.log('eeee', res)
-          return false
-        })
+        // req.checkCodeByFileName(file.name).then(res => {
+        //   console.log('eeee', res)
+        //   return false
+        // })
       },
       submitUpload() {
         this.$refs.upload.submit()
diff --git a/yxt-portal-ui/.env.development b/yxt-portal-ui/.env.development
index 8e04a50e..bee6aa64 100644
--- a/yxt-portal-ui/.env.development
+++ b/yxt-portal-ui/.env.development
@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.3.20:8112"
+VUE_APP_URL = "http://127.0.0.1:8112"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index 01e4fe42..4ac75d4d 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -428,7 +428,7 @@
         if (index === 9) {
           window.open('/#/index', '_blank')
         } else if (index === 0) {
-          window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
+          window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 1) {
           window.open('http://192.168.3.8:9531#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 2) {
diff --git a/yxt_supervise/gateway/src/main/resources/application.yml b/yxt_supervise/gateway/src/main/resources/application.yml
index 9444ea91..b0a49ca2 100644
--- a/yxt_supervise/gateway/src/main/resources/application.yml
+++ b/yxt_supervise/gateway/src/main/resources/application.yml
@@ -53,6 +53,7 @@ spring:
             - StripPrefix=1
 ignore:
   whites:
+    - /customer/v1/wechat/authGet #app端登录
     - /portal/v1/regions/treeList
     - /portal/v1/sysuser/login #pc端登录
     - /portal/v1/sysuser/loginByNoVeriCode #登录无验证码
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
index 157b28fa..4185d05a 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
@@ -6,15 +6,13 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
 import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdQuery;
-import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
-import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionFeign;
-import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
-import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
+import com.yxt.supervise.customer.api.purchaserequisition.*;
 import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandQuery;
 import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -36,6 +34,7 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
 
     @Autowired
     PurchaseRequisitionService purchaseRequisitionService;
+
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<PurchaseRequisitionVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionQuery> pq) {
@@ -43,15 +42,16 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
         PagerVo<PurchaseRequisitionVo> pv = purchaseRequisitionService.listPageVo(pq);
         return rb.success().setData(pv);
     }
+
     @PostMapping("/exportExcel")
     @ApiOperation(value = "采购订单数据导出")
     public void exportExcel(@RequestBody PagerQuery<PurchaseRequisitionQuery> pq, HttpServletResponse response) throws IOException {
         //得到所有要导出的数据
         List<PurchaseRequisitionExcelVo> excelVos = purchaseRequisitionService.exportExcel(pq);
         String fileName = "采购订单" + System.currentTimeMillis() + ".xlsx";
-        response.setContentType( "application/vnd.ms-excel");
+        response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf8");
-        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName);
         // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
         // 如果这里想使用03 则 传入excelType参数即可
         ServletOutputStream outputStream = response.getOutputStream();
@@ -62,9 +62,14 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
 
     @ApiOperation("上传采购订单的EXCEL文件")
     @PostMapping(value = "/uploadXlsxFile")
-    public ResultBean importBrandSort(@RequestParam("file") MultipartFile file) {
+    public ResultBean<PurchaseRequisition> uploadXlsxFile(@RequestParam("file") MultipartFile file) {
         ResultBean rb = ResultBean.fireFail();
-        log.debug("---{},{}", file.getOriginalFilename(), file.getName());
+        String filename = file.getOriginalFilename();
+        if (StringUtils.isBlank(filename))
+            return rb.setMsg("文件名不可为空");
+        if (filename.length() < 15)
+            return rb.setMsg("文件名格式错误");
+        rb = purchaseRequisitionService.uploadXlsxFile(file);
         return rb;
     }
 
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
index 89409eef..dfbaa25b 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
@@ -1,6 +1,10 @@
 package com.yxt.supervise.customer.biz.purchaserequisition;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.builder.ExcelReaderBuilder;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -8,28 +12,26 @@ import com.yxt.common.base.utils.PagerUtil;
 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.gdwholesalegd.GdWholesaleGd;
-import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
-import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdQuery;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
-import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand;
-import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandQuery;
-import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
+import com.yxt.supervise.customer.biz.purchaserequisitionpro.PurchaseRequisitionProService;
+import com.yxt.supervise.customer.tools.StrTool;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.ss.usermodel.CellType;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.math.BigDecimal;
+import java.io.IOException;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +42,8 @@ import java.util.Map;
 @Service
 public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequisitionMapper, PurchaseRequisition> {
 
+    @Autowired
+    private PurchaseRequisitionProService purchaseRequisitionProService;
 
     public PagerVo<PurchaseRequisitionVo> listPageVo(PagerQuery<PurchaseRequisitionQuery> pq) {
         PurchaseRequisitionQuery query = pq.getParams();
@@ -66,6 +70,7 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
         PagerVo<PurchaseRequisitionVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
     public List<PurchaseRequisitionExcelVo> exportExcel(PagerQuery<PurchaseRequisitionQuery> pq) {
         PurchaseRequisitionQuery query = pq.getParams();
         QueryWrapper<PurchaseRequisition> qw = new QueryWrapper<>();
@@ -90,167 +95,105 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
         return pagging;
     }
 
-
-    public void supplierAnalysis() throws ParseException {
-        ztspglhzb();
-        gysddmxb();
+    public ResultBean<String> checkCodeByFileName(String filename) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(filename))
+            return rb.setMsg("文件名不可为空");
+        if (filename.length() < 15)
+            return rb.setMsg("文件名格式错误");
+        String code = filename.substring(0, 14);
+        PurchaseRequisition purchaseRequisition = fetchByCode(code);
+        if (purchaseRequisition == null)
+            return rb.success().setData("nothas");
+        return rb.success().setData("hased");
     }
 
-    /**
-     * 在途商品管理汇总表
-     *
-     * @throws ParseException
-     */
-    public void ztspglhzb() throws ParseException {
-//        Date date = new Date();
-//        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMdd");
-//        baseMapper.deleteAll();
-//        List<Map<String, Object>> list = baseMapper.ztspglhzb();//--在途商品管理汇总表
-//        for (Map<String, Object> m : list) {
-//            String billTotalPrice = m.get("billTotalPrice") != null ? m.get("billTotalPrice").toString() : "0";//订单总额
-//            String prodValue = m.get("prodValue") != null ? m.get("prodValue").toString() : "0";//实际到货价值
-//            String arrivalDate = m.get("arrivalDate") != null ? m.get("arrivalDate").toString() : "0";//全部到货日期
-//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
-//            m.put("date", sdf.format(date));
-//            m.put("no", sdf1.format(date).toString() + "01");//编号
-//            BigDecimal bigDecimal = new BigDecimal(billTotalPrice); //总金额
-//            BigDecimal bigDecimal1 = new BigDecimal(prodValue);//到货金额
-//            BigDecimal subtract = bigDecimal.subtract(bigDecimal1);//有未到货的货值
-//            Date parse = sdf.parse(arrivalDate);
-//            long nowMillisecond = date.getTime();
-//            long arrivalMillisecond = parse.getTime();//到货日期
-//            if (nowMillisecond > arrivalMillisecond && subtract.compareTo(new BigDecimal("0")) == 1) {//是否延期 大于到货日期 并且在途货值大于0 为延期
-//                m.put("sfyq", "是");
-//            } else {
-//                m.put("sfyq", "否");
-//            }
-//            if (subtract.compareTo(new BigDecimal("0")) == 1) {
-//                m.put("wdhjz", subtract.toString());
-//                m.put("cchjz", "0");
-//            } else {
-//                m.put("wdhjz", "0");
-//                BigDecimal subtract2 = bigDecimal1.subtract(bigDecimal);
-//                m.put("cchjz", subtract2.toString());
-//            }
-//        }
-//        log.info("ztspglhzb:{}", JSONObject.toJSONString(list));
-//        baseMapper.insertZtspglhzb(list);
+    public PurchaseRequisition fetchByCode(String code) {
+        QueryWrapper<PurchaseRequisition> qw = new QueryWrapper<>();
+        qw.eq("code", code);
+        List<PurchaseRequisition> list = baseMapper.selectList(qw);
+        if (list == null || list.isEmpty())
+            return null;
+        return list.get(0);
     }
 
-    /**
-     * 供应商订单明细表
-     */
-    public void gysddmxb() {
-//        Date date = new Date();
-//        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMdd");
-//        List<Map<String, String>> list2 = baseMapper.gysddmxb();//--供应商订单明细表
-//        for (Map<String, String> m : list2) {
-//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
-//            String format = sdf.format(date);
-//            m.put("date", format.toString());
-//            String no = sdf1.format(date).toString() + "01";//编号
-//            m.put("no", no);
-//        }
-//        log.info("gysddmxb:{}", JSONObject.toJSONString(list2));
-//        baseMapper.deleteGysddmxb();
-//        baseMapper.insertGysddmxb(list2);
+    public ResultBean<PurchaseRequisition> uploadXlsxFile(MultipartFile file) {
+        ResultBean rb = ResultBean.fireFail();
+        PurchaseRequisition pr = new PurchaseRequisition();
+        pr.setPurchasingOrgCode("1");
+        pr.setPurchasingOrgName("36524集团");
+        pr.setPurchasingDeptCode("9001");
+        pr.setPurchasingDeptName("365生活通");
+
+        List<PurchaseRequisitionPro> proList = new ArrayList<>();
+        try {
+            ExcelReaderBuilder read = EasyExcel.read(file.getInputStream(), createReadListener(pr, proList));
+            read.sheet().doRead();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return rb.setMsg("读取Excel文件异常：" + e.getMessage());
+        }
+        baseMapper.insert(pr);
+        purchaseRequisitionProService.saveBatch(proList);
+        return rb.success().setData(pr);
     }
 
-    //
-//    public  ResultBean<String>  readBrandPeriodSorXls1(InputStream is)  {
-//       /* int ii=uddatePrice();
-//         if(ii==1){
-//            return;
-//        }*/
-//        HSSFWorkbook hssfWorkbook = null;
-//        try {
-//            hssfWorkbook = new HSSFWorkbook(is);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//
-//        List<String> lisss=new ArrayList<>();
-//        List<String> lisss2=new ArrayList<>();
-//        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
-//        PurchaseRequisition pr=new PurchaseRequisition();
-//        List<PurchaseRequisitionPro> prps=new ArrayList<>();
-//        pr.setPurchasingOrgCode("1");
-//        pr.setPurchasingOrgName("36524集团");
-//        pr.setPurchasingDeptCode("9001");
-//        pr.setPurchasingDeptName("365生活通");
-//        // 循环行Row
-//        for (int rowNum = 0; rowNum <=hssfSheet.getLastRowNum(); rowNum++) {
-//            HSSFRow hssfRow = hssfSheet.getRow(rowNum);
-//            int i = 0;
-//            try{
-//                //设置单号 填单人 填单时间
-//                /*if(rowNum==0){
-//                    for ( ; i < hssfRow.getLastCellNum(); i++) {
-//                        setRow0(pr, hssfRow, i);
-//                    }
-//                }*/
-//                //设置单号 填单人 填单时间
-//                if(rowNum==1){
-//                    for ( ; i < hssfRow.getLastCellNum(); i++) {
-//                        setRow1(pr, hssfRow, i);
-//                    }
-//                }
-//                //设置供货单位 仓位 到货日期
-//                if(rowNum==2){
-//                    for ( ; i < hssfRow.getLastCellNum(); i++) {
-//                        setRow2(pr, hssfRow, i);
-//                    }
-//                }
-//                //设置采购员 入库单位 单据到效期
-//                if(rowNum==3){
-//                    for ( ; i < hssfRow.getLastCellNum(); i++) {
-//                        setRow3(pr, hssfRow, i);
-//                    }
-//                }
-//                //设置采购员 入库单位 单据到效期
-//                if(rowNum==4){
-//                    for ( ; i < hssfRow.getLastCellNum(); i++) {
-//                        setRow4(pr, hssfRow, i);
-//                    }
-//                }
-//                if(rowNum>6){
-//                    ProductInformation p=new ProductInformation();
-//                    PurchaseRequisitionPro prp = new PurchaseRequisitionPro();
-//                    prp.setMainSid(pr.getSid());
-//                    String hsje="";//含税金额
-//                    for ( ; i < hssfRow.getLastCellNum(); i++) {
-//                        HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
-//                        if(brandIdHSSFCell!=null){
-//                            if (i == 1) {//商品代码
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                String code = brandIdHSSFCell.getStringCellValue();
-//                                ProductInformationVo productInformation=productInformationService.selectByCode(code);
-//                                if(productInformation==null){
-//                                    p.setCode(code);
-//                                }else{
-//                                    prp.setCategory(productInformation.getCategory());
-//                                    prp.setCategoryKey(productInformation.getCategoryKey());
-//                                    prp.setBrand(productInformation.getBrand());
-//                                    prp.setBrandCode(productInformation.getBrandSid());
-//                                }
-//                                prp.setProCode(code);
-//                                prp.setContent("code");//规格型号
-//                            }
-//                            if (i == 2) {//名称
+    private ReadListener<Map<Integer, String>> createReadListener(PurchaseRequisition pr, List<PurchaseRequisitionPro> proList) {
+        return new ReadListener<Map<Integer, String>>() {
+            private void full1(Map<Integer, String> map) {
+                String code = map.get(1);
+                pr.setCode(code);
+                pr.setPurchaseDate(map.get(5));
+            }
+
+            private void full2(Map<Integer, String> map) {
+                String str1 = map.get(1);
+                String[] arr1 = StrTool.splitBySquareBrackets(str1);
+                pr.setSupplierName(arr1[0]);
+                pr.setSupplierCode(arr1[1]);
+                pr.setWarehousePosition("供应链仓");
+                pr.setWarehousePositionCode("112");
+                pr.setArrivalDate(map.get(5));
+            }
+
+            private void full3(Map<Integer, String> map) {
+                String str1 = map.get(1);
+                String[] arr1 = StrTool.splitBySquareBrackets(str1);
+                pr.setBuyerName(arr1[0]);
+                pr.setBuyerCode(arr1[1]);
+                pr.setExpiryDate(map.get(5));
+            }
+
+            private void full4(Map<Integer, String> map) {
+                pr.setCompletionStatus(map.get(5));
+                pr.setCompletionStatusKey("0");//0未完成
+            }
+
+            private void addPro(Map<Integer, String> map) {
+                PurchaseRequisitionPro prp = new PurchaseRequisitionPro();
+                prp.setMainSid(pr.getSid());
+                String hsje = "";//含税金额
+                prp.setProCode(map.get(1));
+                // prp.setCategory(productInformation.getCategory());
+                // prp.setCategoryKey(productInformation.getCategoryKey());
+                // prp.setBrand(productInformation.getBrand());
+                // prp.setBrandCode(productInformation.getBrandSid());
+                prp.setContent("code");//规格型号
+                prp.setProName(map.get(2));
+prp.setNumber(map.get(3));
+prp.setPackageSpec(map.get(4));
+                prp.setPackageNumber(map.get(5));
+
+//                             if (i == 7) {//含税单价（元）
 //                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String name = brandIdHSSFCell.getStringCellValue();
-//                                    prp.setProName(name);
-//                                    p.setName(name);
+//                                if(StringUtils.isBlank(prp.getProCode())){
+//                                    continue;
 //                                }
-//                            }
-//                            if (i == 3) {//数量
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value = brandIdHSSFCell.getStringCellValue();
-//                                    prp.setNumber(value);
+//                             if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+//                                 hsje=	brandIdHSSFCell.getStringCellValue();
 //                                }
 //                            }
+
 //                            if (i == 10) {//第二代码
 //                                brandIdHSSFCell.setCellType(CellType.STRING);
 //                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
@@ -258,13 +201,6 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
 //                                    prp.setSecondCode(value);
 //                                }
 //                            }
-//                            if (i == 53) {//包装数量
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value = brandIdHSSFCell.getStringCellValue();
-//                                    prp.setPackageNumber(value);
-//                                }
-//                            }
 //                            if (i == 53) {//包内数量  对应采购订单的规格
 //                                brandIdHSSFCell.setCellType(CellType.STRING);
 //                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
@@ -313,13 +249,6 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
 //                                    productInformationService.insert(p);
 //                                }
 //                            }
-//                            if (i == 4) {//包装规格
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    prp.setPackageSpec(value);
-//                                }
-//                            }
 //                            if (i == 11) {//单位
 //                                brandIdHSSFCell.setCellType(CellType.STRING);
 //                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
@@ -372,15 +301,6 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
 //                                }
 //                            }
 //
-//                             if (i == 7) {//含税单价（元）
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if(StringUtils.isBlank(prp.getProCode())){
-//                                    continue;
-//                                }
-//                             if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                 hsje=	brandIdHSSFCell.getStringCellValue();
-//                                }
-//                            }
 //                        }else{
 //                            System.err.println("rowNum="+rowNum+",i="+i+",value=null");
 //                        }
@@ -388,215 +308,33 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
 //                    if(StringUtils.isNotBlank(prp.getProCode())){
 //                        prps.add(prp);
 //                    }
-//                }
-//            }catch(Exception e){
-//                e.printStackTrace();
-//                System.err.println("i="+i+",value=null");
-//            }
-//
-//            lisss.add(rowNum+"");
-//
-//        }
-//        log.info("productInformation:{}", JSONObject.toJSONString(pr));
-//        ResultBean<String> objectResultBean=ResultBean.fireFail();
-//        SupplierInfoVo supplierInfoVo = supplierInfoService.selectByCodeForIndex(pr.getSupplierCode());
-//        if(supplierInfoVo==null){
-//            return objectResultBean.setMsg("供应商不存在!");
-//        }
-//       // List<Map<String,String>> suplierZtyz=baseMapper.suplierZtyz(pr.getSupplierCode()); 临时注释掉 2023-01-16
-//        List<Map<String,String>> suplierZtyz=baseMapper.suplierZtyz2(pr.getSupplierCode());
-//        if(suplierZtyz.size()>0){
-//            return objectResultBean.setMsg("供应商有在途商品!");
-//        }
-//        purchaseRequisitionService.insert(pr);
-//        for (PurchaseRequisitionPro p: prps){
-//            purchaseRequisitionProService.insert(p);
-//           /* String proCode = p.getProCode();*/
-//            /*int row=purchaseRequisitionProService.selectProdCodeTable(proCode);
-//            if(row==0){
-//                purchaseRequisitionProService.insertProdCodeTable(proCode);
-//            }*/
-//        }
-//        GdRescategoryProdService.resetCache();
-//        log.info("x:{}",JSON.toJSONString(lisss));
-//        String x1 = JSON.toJSONString(lisss2);
-//        log.info("x1:{}",JSON.toJSONString(lisss2));
-//        return  objectResultBean.success().setData(pr.getCode());
-//        //return message;
-//    }
-//
-//    private void setRow0(PurchaseRequisition pr, HSSFRow hssfRow, int i) {
-//        HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
-//        if(brandIdHSSFCell!=null){
-//            if (i == 1) {//单号
-//                brandIdHSSFCell.setCellType(CellType.STRING);
-//                String code = brandIdHSSFCell.getStringCellValue();
-//                if(com.yxt.common.base.utils.StringUtils.isNotBlank(code)){
-//                    PurchaseRequisition purchaseRequisition = purchaseRequisitionService.selectByCode(code);
-//                    if(purchaseRequisition!=null){
-//                        String newCode = purchaseRequisition.getNewCode();
-//                        String[] split = newCode.split(",");
-//                        split[split.length]=code;
-//                        String str="";
-//                        for(String s:split){
-//                            str=str+","+s;
-//                        }
-//                        String substring = str.substring(1, str.length());
-//                        purchaseRequisition.setNewCode(substring);
-//                        purchaseRequisitionService.updateById(purchaseRequisition);
-//                    }
-//                    pr.setOldCode(code);
-//                }
-//            }
-//        }
-//    }
-//    private void setRow1(PurchaseRequisition pr, HSSFRow hssfRow, int i) {
-//        HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
-//        if(brandIdHSSFCell!=null){
-//            if (i == 1) {//单号
-//                brandIdHSSFCell.setCellType(CellType.STRING);
-//                String code = brandIdHSSFCell.getStringCellValue();
-//                PurchaseRequisition purchaseRequisition = baseMapper.selectByCode(code);
-//                Map<String,Object> map=new HashMap<>();
-//                map.put("code",code);
-//                baseMapper.deleteByMap(map);
-//                purchaseRequisition=new PurchaseRequisition();
-//                Map<String,Object> map1=new HashMap<>();
-//                if(purchaseRequisition!=null){
-//                    map1.put("mainSid",purchaseRequisition.getSid());
-//                    purchaseRequisitionProService.deleteByMap(map1);
-//                }
-//
-//                //ProductInformationVo productInformationVo = baseMapper.selectByCode(code);
-//                pr.setCode(code);
-//
-//            }
-//            if (i == 3) {//填单人
-//                brandIdHSSFCell.setCellType(CellType.STRING);
-//                String value = brandIdHSSFCell.getStringCellValue();
-//                //ProductInformationVo productInformationVo = baseMapper.selectByCode(code);
-//                String[] split = value.split("\\[");
-//                String v = split[0];//类别value
-//                String key=split[1].replace("]","");//key
-//                pr.setBuyerName(v);
-//                pr.setBuyerCode(key);
-//            }
-//            if (i == 5) {//填单时间
-//                brandIdHSSFCell.setCellType(CellType.STRING);
-//                String value = brandIdHSSFCell.getStringCellValue();
-//                //ProductInformationVo productInformationVo = baseMapper.selectByCode(code);
-//                pr.setPurchaseDate(value);
-//            }
-//        }
-//    }
-//    private void setRow2(PurchaseRequisition pr, HSSFRow hssfRow, int i) {
-//        HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
-//        if(brandIdHSSFCell!=null){
-//            if (i == 1) {//供货单位  供应商
-//                brandIdHSSFCell.setCellType(CellType.STRING);
-//                String value = brandIdHSSFCell.getStringCellValue();
-//                String[] split = value.split("\\[");
-//                String v = split[0];//类别value
-//                String key=split[1].replace("]","");//key
-//                SupplierInfoVo supplierInfoVo = supplierInfoService.selectByCodeForIndex(key);
-//                pr.setSupplierCode(supplierInfoVo.getCodeUnified());
-//                pr.setSupplierName(v);
-//
-//            }
-//            if (i == 3) {//仓位
-//                brandIdHSSFCell.setCellType(CellType.STRING);
-//                String value = brandIdHSSFCell.getStringCellValue();
-//                String[] split = value.split("\\[");
-//                String v ="供应链仓";// split[0];//类别value
-//                String key="112";//split[1].replace("]","");//key
-//                WarehousePositionVo warehousePositionVo = warehousePositionService.selectByCode(key);
-//                if(warehousePositionVo==null){
-//                    WarehousePosition warehousePosition=new WarehousePosition();
-//                    warehousePosition.setName(v);
-//                    warehousePosition.setCode(key);
-//                    warehousePositionService.insert(warehousePosition);
-//                }
-//                pr.setWarehousePosition(v);
-//                pr.setWarehousePositionCode(key);
-//            }
-//            if (i == 5) {//到货日期
-//                brandIdHSSFCell.setCellType(CellType.STRING);
-//                String value = brandIdHSSFCell.getStringCellValue();
-//                //ProductInformationVo productInformationVo = baseMapper.selectByCode(code);
-//                pr.setArrivalDate(value);
-//            }
-//        }
-//    }
-    private void setRow3(PurchaseRequisition pr, HSSFRow hssfRow, int i) {
-        HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
-        if (brandIdHSSFCell != null) {
-            if (i == 1) {//采购员
-                brandIdHSSFCell.setCellType(CellType.STRING);
-                String value = brandIdHSSFCell.getStringCellValue();
-                //ProductInformationVo productInformationVo = baseMapper.selectByCode(code);
-                String[] split = value.split("\\[");
-                String v = split[0];//类别value
-                String key = split[1].replace("]", "");//key
-                pr.setBuyerName(v);
-                pr.setBuyerCode(key);
-                pr.setLogisticsCompanyCode(key);
-                pr.setLogisticsCompanyName(v);
+                proList.add(prp);
             }
 
-            if (i == 5) {//单据到效期
-                brandIdHSSFCell.setCellType(CellType.STRING);
-                String value = brandIdHSSFCell.getStringCellValue();
-                //ProductInformationVo productInformationVo = baseMapper.selectByCode(code);
-                pr.setExpiryDate(value);
-            }
-        }
-    }
-
-    private void setRow4(PurchaseRequisition pr, HSSFRow hssfRow, int i) {
-        HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
-        if (brandIdHSSFCell != null) {
-            if (i == 5) {//完成状态
-                brandIdHSSFCell.setCellType(CellType.STRING);
-                String value = brandIdHSSFCell.getStringCellValue();
-                //ProductInformationVo productInformationVo = baseMapper.selectByCode(code);
-                pr.setCompletionStatus(value);
-                pr.setCompletionStatusKey("0");//0未完成
+            @Override
+            public void invoke(Map<Integer, String> map, AnalysisContext analysisContext) {
+                ReadRowHolder readRowHolder = analysisContext.readRowHolder();
+                int rowIndex = readRowHolder.getRowIndex();
+                if (1 == rowIndex) {
+                    full1(map);
+                }
+                if (2 == rowIndex) {
+                    full2(map);
+                }
+                if (3 == rowIndex) {
+                    full3(map);
+                }
+                if (4 == rowIndex) {
+                    full4(map);
+                }
+                if (rowIndex > 6)
+                    addPro(map);
             }
-        }
-    }
-
-
-    private void createRow3(HSSFSheet sheet, int rownum, String[] col1, HSSFCellStyle style) {
-        //声明列对象
-        HSSFCell cell = null;
-        //创建标题
-        HSSFRow row2 = sheet.createRow(rownum);
-        for (int i = 0; i < col1.length; i++) {
-            cell = row2.createCell(i);
-            cell.setCellValue(col1[i]);
-            cell.setCellStyle(style);
-        }
-    }
 
-    public ResultBean<String> checkCodeByFileName(String filename) {
-        ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(filename))
-            return rb.setMsg("文件名不可为空");
-        if (filename.length() < 15)
-            return rb.setMsg("文件名格式错误");
-        String code = filename.substring(0, 14);
-        PurchaseRequisition purchaseRequisition = fetchByCode(code);
-        if (purchaseRequisition == null)
-            return rb.success().setData("nothas");
-        return rb.success().setData("hased");
-    }
+            @Override
+            public void doAfterAllAnalysed(AnalysisContext analysisContext) {
 
-    public PurchaseRequisition fetchByCode(String code) {
-        QueryWrapper<PurchaseRequisition> qw = new QueryWrapper<>();
-        qw.eq("code", code);
-        List<PurchaseRequisition> list = baseMapper.selectList(qw);
-        if (list == null || list.isEmpty())
-            return null;
-        return list.get(0);
+            }
+        };
     }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/tools/StrTool.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/tools/StrTool.java
new file mode 100644
index 00000000..a9bcf298
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/tools/StrTool.java
@@ -0,0 +1,54 @@
+package com.yxt.supervise.customer.tools;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StrTool {
+
+    /**
+     * 将字符串通过中括号分解
+     *
+     * @param src
+     * @return
+     */
+    public static String[] splitBySquareBrackets(String src) {
+        String[] strings = new String[3];
+        List<String> list = new ArrayList<>();
+        int i = src.indexOf('[');
+        if (i == -1)
+            return strings;
+        if (i == 0) {
+            int i1 = src.indexOf(']');
+            if (i1 == -1) {
+                String one = src.substring(1);
+                list.add(one);
+            } else {
+                String one = StrUtil.sub(src, 1, i1);
+                list.add(one);
+                if ((i1 + 1) < src.length()) {
+                    String two = src.substring(i1 + 1);
+                    list.add(two);
+                }
+            }
+        } else {
+            String one = StrUtil.sub(src, 0, i);
+            list.add(one);
+            int i1 = src.indexOf(']');
+            if (i1 == -1) {
+                String two = src.substring(i + 1);
+                list.add(two);
+            } else {
+                String two = StrUtil.sub(src, i + 1, i1);
+                list.add(two);
+                if ((i1 + 1) < src.length()) {
+                    String three = src.substring(i1 + 1);
+                    list.add(three);
+                }
+            }
+        }
+        return list.toArray(strings);
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
index f4486602..ea660ca7 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
@@ -2,8 +2,8 @@ spring:
   application:
     name: supervise-customer
   profiles:
-    active: devv
-#    active: test
+#    active: devv
+    active: test
   messages:
     # 国际化资源文件路径
     basename: i18n/messages

From 6b8c955d129c099e5dce98024dbb914e9ef5eb93 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 31 Mar 2023 18:31:18 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E6=8E=A8=E9=80=81=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer/biz/wechat/WechatApiService.java | 19 ++---
 .../customer/biz/wechat/WechatRest.java       | 85 ++++++++++++++++++-
 .../customer/biz/wechat/WechatService.java    |  2 +-
 3 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java
index 821e7931..871a5fb1 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatApiService.java
@@ -53,21 +53,18 @@ public class WechatApiService {
 //    private Jedis jedis;
 //    @Resource
 //    private JedisPool jedisPool;
-    public String getAccessToken() throws Exception {
+public String getAccessToken(String appId,String appsecret) throws Exception {
 //        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
 //        if (null == appletSet) {
 //            throw new ApiMallPlusException("没有设置支付配置");
 //        }
-        String appId="wx1d44e0fcd110351a";
-        String appsecret="4764e32722a7d98656dea6afd9405701";
-        String url="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appsecret;
-        RestTemplate restTemplate=new RestTemplate();
-        String re= restTemplate.getForObject(url,String.class);
-        com.alibaba.fastjson.JSONObject jsonObject= com.alibaba.fastjson.JSONObject.parseObject(re);
-        String at=jsonObject.getString("access_token");
-        System.out.println(at);
-        return at;
-    }
+    String url="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appsecret;
+    RestTemplate restTemplate=new RestTemplate();
+    String re= restTemplate.getForObject(url,String.class);
+    com.alibaba.fastjson.JSONObject jsonObject= com.alibaba.fastjson.JSONObject.parseObject(re);
+    String at=jsonObject.getString("access_token");
+    return at;
+}
 
 //    public WechatApiService() {
 //        RequestConfig config = RequestConfig.custom()
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
index 4ca3c9b6..825572c0 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
@@ -1,11 +1,18 @@
 package com.yxt.supervise.customer.biz.wechat;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yxt.supervise.customer.biz.util.WeixinCheckoutUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author wangpengfei
@@ -15,9 +22,10 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("v1/wechat")
 public class WechatRest {
-    String token="yxthryy";
     @Autowired
     WechatService wechatService;
+    @Autowired
+    private WechatApiService wechatApiService;
     @ApiOperation("token")
     @GetMapping(value = "token")
     public String wechate(String signature,String timestamp,String nonce,String echostr){
@@ -43,6 +51,81 @@ public class WechatRest {
         }
     return "非法请求";
   }
+    @GetMapping("/sendMessage")
+    @Test
+    public void sendMessage() throws Exception {
+        //String openId="otnrM57kui-WCUmRtChhb1HguOgw";
+        //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
+
+        String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
+        String appsecret="4764e32722a7d98656dea6afd9405701";
+        String appId="wx1d44e0fcd110351a";
+        // 模板参数
+        Map<String, String> sendMag = new HashMap<String, String>();
+
+        // openId代表一个唯一微信用户，即微信消息的接收人
+        //String openId = "oLcw_5ti_iJpwibmL0QxfK2ZG9qQ";
+        // 公众号的模板id(也有相应的接口可以查询到)
+        String templateId = "fVgBuwpLC43YkeGWfl1Vw0mW0Qu5WP2giD77TfKAEc4";
+        // 微信的基础accessToken
+        String accessToken=getAccessToken(appId,appsecret);
+        String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken;
+
+        /**
+         *  其他模板可以从模板库中自己添加
+         * 模板ID
+         * B0YStqTYdjHhY9Da9Sy2NM7HXxxxxxxxxxxxxxx
+         * 开发者调用模板消息接口时需提供模板ID
+         * 标题
+         * 产品兑付成功提醒
+         * 行业
+         * 金融业 - 证券|基金|理财|信托
+         * 详细内容
+         * {{first.DATA}}
+         * 产品名称：{{keyword1.DATA}}
+         * 当期兑付本金：{{keyword2.DATA}}
+         * 当期兑付利息：{{keyword3.DATA}}
+         * 已兑付期数：{{keyword4.DATA}}
+         * 兑付日期：{{keyword5.DATA}}
+         * {{remark.DATA}}
+         */
+//        sendMag.put("first", new WeChatTemplateMsg("f123"));
+//        sendMag.put("keyword1", new WeChatTemplateMsg("111"));
+//        sendMag.put("keyword2", new WeChatTemplateMsg("222"));
+//        sendMag.put("keyword3", new WeChatTemplateMsg("333"));
+//        sendMag.put("keyword4", new WeChatTemplateMsg("444"));
+        sendMag.put("remark", "123465");
+
+        RestTemplate restTemplate = new RestTemplate();
+        //拼接base参数
+        Map<String, Object> sendBody = new HashMap<>();
+        sendBody.put("touser", openId);               // openId
+        //sendBody.put("url", "www.baidu.com");         // 点击模板信息跳转地址
+        sendBody.put("topcolor", "#FF0000");          // 顶色
+        sendBody.put("data", sendMag);                   // 模板参数
+        sendBody.put("template_id", templateId);      // 模板Id
+        ResponseEntity<String> forEntity = restTemplate.postForEntity(url, sendBody, String.class);
+        //log.info("结果是: {}",forEntity.getBody());
+        JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());
+        // 0
+        String messageCode = jsonObject.getString("errcode");
+        // 2431260672639467520
+        String msgId = jsonObject.getString("msgid");
+        System.out.println("messageCode : " + messageCode + ", msgId: " +msgId);
+        //return forEntity.getBody();
+    }
+    public String getAccessToken(String appId,String appsecret) throws Exception {
+//        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+//        if (null == appletSet) {
+//            throw new ApiMallPlusException("没有设置支付配置");
+//        }
+        String url="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appsecret;
+        RestTemplate restTemplate=new RestTemplate();
+        String re= restTemplate.getForObject(url,String.class);
+        com.alibaba.fastjson.JSONObject jsonObject= com.alibaba.fastjson.JSONObject.parseObject(re);
+        String at=jsonObject.getString("access_token");
+        return at;
+    }
 
 
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java
index 12c9bd33..8da9ab77 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatService.java
@@ -38,7 +38,7 @@ public class WechatService {
         if (flag) {
 
             try {
-                accessToken = wechatApiService.getAccessToken();
+                //accessToken = wechatApiService.getAccessToken();
 
 //                String templateId = appletSet.getTemplateid1();
 //                Map<String, TemplateData> param = new HashMap<String, TemplateData>();

From ead9faab10004e396126a9d76294c38ccc49274f Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Fri, 31 Mar 2023 18:33:18 +0800
Subject: [PATCH 05/23] upload

---
 docs/databases/table_modify.sql | 35 +++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 docs/databases/table_modify.sql

diff --git a/docs/databases/table_modify.sql b/docs/databases/table_modify.sql
new file mode 100644
index 00000000..d3bcde63
--- /dev/null
+++ b/docs/databases/table_modify.sql
@@ -0,0 +1,35 @@
+ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
+ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifySid modifyBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+
+ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifyBySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifyBySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+
+
+select @@GLOBAL.sql_mode;
+ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+select @@sql_mode;
+ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+
+set @@global.sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';
+
+set sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';
+
+set @@SESSION.sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';
+
+set @@sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';
+
+ALTER TABLE supervise_supplychain.purchase_requisition CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
+ALTER TABLE supervise_supplychain.purchase_requisition CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+ALTER TABLE supervise_supplychain.purchase_requisition ADD remarks varchar(200) NULL COMMENT '备注说明';
+
+
+ALTER TABLE supervise_supplychain.product_information CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
+ALTER TABLE supervise_supplychain.product_information CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+
+
+ALTER TABLE supervise_supplychain.restricted_brand CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
+ALTER TABLE supervise_supplychain.restricted_brand CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+
+ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD taxInclusiveAmount DOUBLE(12,2) DEFAULT NULL COMMENT '含税金额';
+ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD preqCode varchar(100) DEFAULT NULL COMMENT '订单编号';
+

From 18e9d3c53ae398a81d7d48bb4928d6c5bf206bb3 Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Sat, 1 Apr 2023 01:19:43 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E7=83=9F=E8=8D=89=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supervise-customer-ui/.env.production         |  2 +-
 supervise-customer-ui/package.json            |  2 +-
 .../src/views/kucun/xssjgl/index.vue          |  9 ++++--
 .../src/main/resources/application-test.yml   |  2 +-
 .../portal/biz/gdsales/GdSalesService.java    | 29 +++++++++++++++++++
 .../portal/biz/gdsales/GdSalesYcMapper.java   | 19 +++++++-----
 .../portal/biz/gdsales/GdSalesYcService.java  |  5 ++++
 .../src/main/resources/application-devv.yml   |  8 ++---
 .../src/main/resources/application-test.yml   |  4 +--
 .../src/main/resources/application.yml        |  4 +--
 10 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/supervise-customer-ui/.env.production b/supervise-customer-ui/.env.production
index c4d0fd79..811f3444 100644
--- a/supervise-customer-ui/.env.production
+++ b/supervise-customer-ui/.env.production
@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = '/api/service'
 
 ## 配置 正式接口地址
 VUE_APP_URL = "http://120.46.131.15:8111"
diff --git a/supervise-customer-ui/package.json b/supervise-customer-ui/package.json
index 99af34b3..b7226334 100644
--- a/supervise-customer-ui/package.json
+++ b/supervise-customer-ui/package.json
@@ -17,7 +17,7 @@
     "axios": "^0.24.0",
     "bpmn-js": "^9.2.2",
     "core-js": "^2.6.12",
-    "echarts": "^5.4.1",
+    "echarts": "^5.4.2",
     "ejs": "^2.7.4",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
diff --git a/supervise-customer-ui/src/views/kucun/xssjgl/index.vue b/supervise-customer-ui/src/views/kucun/xssjgl/index.vue
index 1b636101..29c2ce4e 100644
--- a/supervise-customer-ui/src/views/kucun/xssjgl/index.vue
+++ b/supervise-customer-ui/src/views/kucun/xssjgl/index.vue
@@ -81,7 +81,8 @@
             <div>共导入数据：{{ currentLog.allNum }} 条；符合监管条件的数据：{{ currentLog.validNum }} 条；用时：{{ currentLog.durations }} 毫秒。</div>
           </el-card>
         </div>
-        <div><el-button :disabled="filecandown" size="small" type="primary" @click="doDownloadHz">下载销售报表文件</el-button></div>
+        <div><el-button :disabled="filecandown" size="small" type="primary" @click="doDownloadHz">下载销售报表文件</el-button>
+        <el-button :disabled="filecandown" size="small" type="primary" @click="doDownloadHzYc">下载烟草分销数据文件</el-button></div>
       </el-card>
       <span slot="footer" class="dialog-footer"><el-button @click="dialogClose">关 闭</el-button></span>
     </el-dialog>
@@ -250,7 +251,11 @@ export default {
     },
     doDownloadHz() {
       window.open(this.currentLog.fileUrl, '_blank')
-      this.dialogClose()
+      // this.dialogClose()
+    },
+    doDownloadHzYc() {
+      window.open(this.currentLog.remarks, '_blank')
+      // this.dialogClose()
     },
     downExcel(row) {
       if (row.fileUrl) {
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml
index e1b5ab04..513ad506 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml
@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/supervise_customer?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
+    url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
     username: root
     password: 1LAiGz$t1*Iw
 #  cloud:
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java
index a44336ed..7d6dc787 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java
@@ -367,6 +367,34 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
         String url = urlPrefix + "kchzb/" + newFileName;
         gdLog.setFileUrl(url);
         gdLog.setOutFilePath(uploadPath + "kchzb/" + newFileName);
+
+        String newFileNameyc = "kchzb/烟草分销数据" + orderDate + "-" + System.currentTimeMillis() + ".xlsx";
+        ExcelWriter writerYcfx = ExcelUtil.getWriter(uploadPath + newFileNameyc);
+        List<GdSalesYc> gdSalesYcs = gdSalesYcService.listFxOfDay(orderDate);
+        writerYcfx.addHeaderAlias("orderType", "订单类型");
+        writerYcfx.addHeaderAlias("orderNo", "销售订单号");
+        writerYcfx.addHeaderAlias("prodCode", "商品编码");
+        writerYcfx.addHeaderAlias("prodBarCode", "商品条码");
+        writerYcfx.addHeaderAlias("prodName", "商品名称");
+        writerYcfx.addHeaderAlias("brandCode", "品牌代码");
+        writerYcfx.addHeaderAlias("brandName", "品牌名称");
+        writerYcfx.addHeaderAlias("categoryb", "商品大类");
+        writerYcfx.addHeaderAlias("categorym", "商品中类");
+        writerYcfx.addHeaderAlias("categorys", "商品小类");
+        writerYcfx.addHeaderAlias("customerCode", "客户代码");
+        writerYcfx.addHeaderAlias("customerName", "客户名称");
+        writerYcfx.addHeaderAlias("saleNum", "销售数量");
+        writerYcfx.addHeaderAlias("storeCode", "销售渠道");
+        writerYcfx.addHeaderAlias("salePrice", "销售价格");
+        writerYcfx.addHeaderAlias("saleCost", "销售成本");
+        writerYcfx.addHeaderAlias("profit", "利润");
+        writerYcfx.addHeaderAlias("dataDate", "数据日期");
+        writerYcfx.setOnlyAlias(true);
+        writerYcfx.write(gdSalesYcs, true);
+        writerYcfx.close();
+
+        String urlyc = urlPrefix + newFileNameyc;
+        gdLog.setRemarks(urlyc);
         gdSalesLogService.updateById(gdLog);
 
         return rb.success().setData(gdLog);
@@ -449,6 +477,7 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
     public double amountOfLsnjmDay(String orderDate) {
         return baseMapper.amountOfLsnjmOnDay(orderDate);
     }
+
     public double amountOfDay(String orderDate) {
         return baseMapper.amountOfDay(orderDate);
     }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java
index 92093496..2b0e6c46 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java
@@ -52,32 +52,35 @@ public interface GdSalesYcMapper extends BaseMapper<GdSalesYc> {
     @Delete("delete from gd_sales_yc where dataDate=#{dataDate} ")
     void clearByDataDate(@Param("dataDate") String dataDate);
 
-    @Select("select count(1) from (select storeCode from gd_sales_yc where dataDate=#{dataDate} group by storeCode) t")
+    @Select("select count(1) from (select storeCode from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} group by storeCode) t")
     int countStoreOnDay(@Param("dataDate") String orderDate);
 
     @Select("select t2.storeCode,si.name,t2.amount from( " +
             "  select storeCode,sum(t1.price) as amount from( " +
-            "    select storeCode,saleNum*salePrice as price from gd_sales_yc where dataDate=#{dataDate} " +
+            "    select storeCode,saleNum*salePrice as price from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
             "  ) t1 group by t1.storeCode " +
             ") t2 left join store_index si on t2.storecode=si.code ")
     List<Map<String, Object>> listOfStoreOnDay(@Param("dataDate") String orderDate);
 
-    @Select("select count(1) from (select prodCode from gd_sales_yc where dataDate=#{dataDate} group by prodCode) t")
+    @Select("select count(1) from (select prodCode from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} group by prodCode) t")
     int countProductOnDay(@Param("dataDate") String orderDate);
 
     @Select("select si.name,t1.* from ( " +
-            "  select storeCode,orderType,orderNo,prodCode,prodName,saleNum,salePrice,saleNum*salePrice as amount  from gd_sales_yc where dataDate=#{dataDate} " +
+            "  select storeCode,orderType,orderNo,prodCode,prodName,saleNum,salePrice,saleNum*salePrice as amount  from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
             ") t1 left join store_index si on t1.storecode=si.code ")
     List<Map<String, Object>> listOfProductOnDay(@Param("dataDate") String orderDate);
 
-    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate}")
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate}")
     double amountOfDay(@Param("dataDate") String orderDate);
 
-    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " +
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
             " and storeCode in (select code from store_index si where si.`type`='连网连锁店') ")
     double amountOfLwlsdDay(@Param("dataDate") String orderDate);
 
-    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " +
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
             " and storeCode in (select code from store_index si where si.`type`='连锁内加盟') ")
-    double amountOfLsnjmDay(String orderDate);
+    double amountOfLsnjmDay(@Param("dataDate") String orderDate);
+
+    @Select("SELECT * FROM gd_sales_yc where orderType='批发' and (customerName='客户' or customerName='客户1') and dataDate=#{dataDate} " )
+    List<GdSalesYc> listFxOfDay(@Param("dataDate") String orderDate);
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java
index 257ed5b9..121e1bbc 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java
@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.supervise.portal.biz.gdsales;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -78,4 +79,8 @@ public class GdSalesYcService extends ServiceImpl<GdSalesYcMapper, GdSalesYc> {
     public double amountOfLsnjmDay(String orderDate) {
         return baseMapper.amountOfLsnjmDay(orderDate);
     }
+
+    public List<GdSalesYc> listFxOfDay(String orderDate) {
+        return baseMapper.listFxOfDay(orderDate);
+    }
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml
index fa82aa6e..93daad3b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml
@@ -22,11 +22,11 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 
 image:
-  xlsxtmpl: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
-#  xlsxtmpl: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
+#  xlsxtmpl: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
+  xlsxtmpl: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
   upload:
-    path: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
-#    path: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
+#    path: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
+    path: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
   url:
     prefix: http://127.0.0.1:7003/upload/
   login:
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml
index 3fbea283..d06562ad 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml
@@ -3,8 +3,8 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
     username: root
-    #password: 1LAiGz$t1*Iw
-    password: root`
+    password: 1LAiGz$t1*Iw
+#    password: root`
 #  cloud:
 #    nacos:
 #      discovery:
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml
index 71a46344..3a7fbf40 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml
@@ -2,8 +2,8 @@ spring:
   application:
     name: supervise-portal
   profiles:
-    active: devv
-#    active: test
+#    active: devv
+    active: test
   messages:
     # 国际化资源文件路径
     basename: i18n/messages

From 001270dc31dc5a080c31410617c5b7c69d82c33e Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 3 Apr 2023 18:10:08 +0800
Subject: [PATCH 07/23] =?UTF-8?q?=E7=83=9F=E8=8D=89=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=83=9F=E8=8D=89=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8E=A8=E9=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseRequisitionStore.java             | 48 +++++++++
 .../PurchaseRequisitionStoreDetailsVo.java    | 45 +++++++++
 .../PurchaseRequisitionStoreDto.java          | 45 +++++++++
 .../PurchaseRequisitionStoreExcelVo.java      | 34 +++++++
 .../PurchaseRequisitionStoreFeign.java        | 17 ++++
 ...PurchaseRequisitionStoreFeignFallback.java | 11 +++
 .../PurchaseRequisitionStoreQuery.java        | 49 ++++++++++
 .../PurchaseRequisitionStoreVo.java           | 45 +++++++++
 .../PurchaseRequisitionTobacco.java           | 70 +++++++++++++
 .../PurchaseRequisitionTobaccoDetailsVo.java  | 72 ++++++++++++++
 .../PurchaseRequisitionTobaccoDto.java        | 71 ++++++++++++++
 .../PurchaseRequisitionTobaccoExcelVo.java    | 35 +++++++
 .../PurchaseRequisitionTobaccoFeign.java      | 17 ++++
 ...rchaseRequisitionTobaccoFeignFallback.java | 11 +++
 .../PurchaseRequisitionTobaccoQuery.java      | 72 ++++++++++++++
 .../PurchaseRequisitionTobaccoVo.java         | 73 ++++++++++++++
 .../customer/api/wechat/Miniprogram.java      | 14 +++
 .../customer/api/wechat/Template.java         | 22 +++++
 .../customer/api/wechat/TemplateData.java     | 26 +++++
 .../api/wechat/WeChatTemplateMsg.java         | 57 +++++++++++
 .../PurchaseRequisitionStoreMapper.java       | 25 +++++
 .../PurchaseRequisitionStoreMapper.xml        | 36 +++++++
 .../PurchaseRequisitionStoreRest.java         | 56 +++++++++++
 .../PurchaseRequisitionStoreService.java      | 67 +++++++++++++
 .../PurchaseRequisitionTobaccoMapper.java     | 25 +++++
 .../PurchaseRequisitionTobaccoMapper.xml      | 38 +++++++
 .../PurchaseRequisitionTobaccoRest.java       | 60 ++++++++++++
 .../PurchaseRequisitionTobaccoService.java    | 67 +++++++++++++
 .../customer/biz/wechat/WechatRest.java       | 98 ++++++++++++++-----
 .../api/supplier/SupplierFeignFallback.java   | 17 ++++
 .../supervise-rms/supervise-rms-biz/pom.xml   |  6 ++
 31 files changed, 1304 insertions(+), 25 deletions(-)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStore.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Miniprogram.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Template.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/TemplateData.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/WeChatTemplateMsg.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java

diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStore.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStore.java
new file mode 100644
index 00000000..1606e005
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStore.java
@@ -0,0 +1,48 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+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;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:45
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草)", description = "采购订单商品信息(烟草)")
+@TableName("purchase_requisition_store")
+public class PurchaseRequisitionStore extends BaseEntity {
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录修改时间")
+    private Date modifyTime;
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+    @ApiModelProperty("创建者")
+    private String createBySid;
+    @ApiModelProperty("更新者")
+    private String updateBySid;
+    @ApiModelProperty("备注")
+    private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java
new file mode 100644
index 00000000..4adba787
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java
@@ -0,0 +1,45 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:45
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 视图数据详情", description = "采购订单商品信息(烟草)视图数据详情")
+public class PurchaseRequisitionStoreDetailsVo implements Vo {
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录修改时间")
+    private Date modifyTime;
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+    @ApiModelProperty("创建者")
+    private String createBySid;
+    @ApiModelProperty("更新者")
+    private String updateBySid;
+    @ApiModelProperty("备注")
+    private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java
new file mode 100644
index 00000000..2707cd84
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java
@@ -0,0 +1,45 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+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/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 数据传输对象", description = "采购订单商品信息(烟草) 数据传输对象")
+public class PurchaseRequisitionStoreDto implements Dto {
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录修改时间")
+    private Date modifyTime;
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+    @ApiModelProperty("创建者")
+    private String createBySid;
+    @ApiModelProperty("更新者")
+    private String updateBySid;
+    @ApiModelProperty("备注")
+    private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreExcelVo.java
new file mode 100644
index 00000000..b218c809
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreExcelVo.java
@@ -0,0 +1,34 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) Excel视图数据对象", description = "采购订单商品信息(烟草) Excel视图数据对象")
+public class PurchaseRequisitionStoreExcelVo implements Vo {
+    @ExcelProperty(value = "创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ExcelProperty(value = "烟草证编码")
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ExcelProperty(value = "门店代码")
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ExcelProperty(value = "门店名称")
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ExcelProperty(value = "金额")
+    @ApiModelProperty("金额")
+    private String price; // 金额
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java
new file mode 100644
index 00000000..8377f69d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java
@@ -0,0 +1,17 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Api(tags = "采购订单商品信息")
+@FeignClient(
+        contextId = "yxt-supervise-PurchaseRequisitionStore",
+        name = "yxt-supervise",
+        path = "v1/purchaserequisitionstore",
+        fallback = PurchaseRequisitionStoreFeignFallback.class)
+public interface PurchaseRequisitionStoreFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java
new file mode 100644
index 00000000..2aff5749
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Component
+public class PurchaseRequisitionStoreFeignFallback implements PurchaseRequisitionStoreFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java
new file mode 100644
index 00000000..adcec7ee
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java
@@ -0,0 +1,49 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 查询条件", description = "采购订单商品信息(烟草) 查询条件")
+public class PurchaseRequisitionStoreQuery implements Query {
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录修改时间")
+    private Date modifyTime;
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+    @ApiModelProperty("创建者")
+    private String createBySid;
+    @ApiModelProperty("更新者")
+    private String updateBySid;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("开始时间")
+    private String startDate;
+    @ApiModelProperty("结束时间")
+    private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java
new file mode 100644
index 00000000..d4c67bd6
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java
@@ -0,0 +1,45 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 视图数据对象", description = "采购订单商品信息(烟草) 视图数据对象")
+public class PurchaseRequisitionStoreVo implements Vo {
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("记录修改时间")
+    private Date modifyTime;
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+    @ApiModelProperty("创建者")
+    private String createBySid;
+    @ApiModelProperty("更新者")
+    private String updateBySid;
+    @ApiModelProperty("备注")
+    private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java
new file mode 100644
index 00000000..027146e0
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java
@@ -0,0 +1,70 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+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/3 16:06
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草)", description = "采购订单表")
+@TableName("purchase_requisition_tobacco")
+public class PurchaseRequisitionTobacco extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("单号")
+    private String code; // 单号
+    @ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+    @ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+    @ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+    @ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+    @ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+    @ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+    @ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+    @ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+    @ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+    @ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+    @ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+    @ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+    @ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+    @ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+    @ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+    @ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+    @ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+    @ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java
new file mode 100644
index 00000000..f05396af
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 视图数据详情", description = "采购订单表 视图数据详情")
+public class PurchaseRequisitionTobaccoDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("单号")
+    private String code; // 单号
+    @ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+    @ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+    @ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+    @ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+    @ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+    @ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+    @ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+    @ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+    @ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+    @ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+    @ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+    @ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+    @ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+    @ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+    @ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+    @ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+    @ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+    @ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java
new file mode 100644
index 00000000..428466e2
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java
@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 数据传输对象", description = "采购订单表 数据传输对象")
+public class PurchaseRequisitionTobaccoDto implements Dto {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("单号")
+    private String code; // 单号
+    @ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+    @ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+    @ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+    @ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+    @ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+    @ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+    @ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+    @ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+    @ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+    @ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+    @ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+    @ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+    @ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+    @ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+    @ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+    @ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+    @ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+    @ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoExcelVo.java
new file mode 100644
index 00000000..6650fe92
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoExcelVo.java
@@ -0,0 +1,35 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:13
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) Excel视图数据对象", description = "采购订单表(烟草) Excel视图数据对象")
+public class PurchaseRequisitionTobaccoExcelVo implements Vo {
+    @ExcelProperty(value = "订单号")
+    @ApiModelProperty("订单号")
+    private String code; // 订单号
+    @ExcelProperty(value = "采购日期")
+    @ApiModelProperty("采购日期")
+    private String purchaseDate; // 采购日期
+    @ExcelProperty(value = "采购日期")
+    @ApiModelProperty("建单日期")
+    private String createTime; // 采购日期
+    @ExcelProperty(value = "到货日期")
+    @ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+    @ExcelProperty(value = "供应商名称")
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ExcelProperty(value = "供应商编码")
+    @ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java
new file mode 100644
index 00000000..49f86a0b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java
@@ -0,0 +1,17 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Api(tags = "采购订单表(烟草)")
+@FeignClient(
+        contextId = "yxt-supervise-PurchaseRequisitionTobacco",
+        name = "yxt-supervise",
+        path = "v1/purchaserequisitiontobacco",
+        fallback = PurchaseRequisitionTobaccoFeignFallback.class)
+public interface PurchaseRequisitionTobaccoFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java
new file mode 100644
index 00000000..e4c369bd
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Component
+public class PurchaseRequisitionTobaccoFeignFallback implements PurchaseRequisitionTobaccoFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java
new file mode 100644
index 00000000..a456a27e
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:08
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 查询条件", description = "采购订单表 查询条件")
+public class PurchaseRequisitionTobaccoQuery implements Query {
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("单号")
+    private String code; // 单号
+    @ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+    @ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+    @ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+    @ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+    @ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+    @ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+    @ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+    @ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+    @ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+    @ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+    @ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+    @ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+    @ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+    @ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+    @ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+    @ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+    @ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+    @ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+    private String startDate;
+    private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java
new file mode 100644
index 00000000..7e92211d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java
@@ -0,0 +1,73 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:08
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 视图数据对象", description = "采购订单表 视图数据对象")
+public class PurchaseRequisitionTobaccoVo implements Vo {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("单号")
+    private String code; // 单号
+    @ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+    @ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+    @ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+    @ApiModelProperty("创建日期")
+    private String createTime;
+    @ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+    @ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+    @ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+    @ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+    @ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+    @ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+    @ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+    @ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+    @ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+    @ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+    @ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+    @ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+    @ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+    @ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+    @ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+    @ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Miniprogram.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Miniprogram.java
new file mode 100644
index 00000000..4847d535
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Miniprogram.java
@@ -0,0 +1,14 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 13:55
+ */
+@Data
+public class Miniprogram {
+    private String appid;
+    private String pagepath;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Template.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Template.java
new file mode 100644
index 00000000..8adf43b5
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/Template.java
@@ -0,0 +1,22 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 14:33
+ */
+@Data
+public class Template {
+    private String value;
+    private String color;
+    public Template(String value) {
+        this.value = value;
+        this.color = "#173177";
+    }
+
+    public Template(String value, String color) {
+        this.value = value;
+        this.color = color;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/TemplateData.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/TemplateData.java
new file mode 100644
index 00000000..ed03877c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/TemplateData.java
@@ -0,0 +1,26 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 13:46
+ */
+@Data
+public class TemplateData {
+    private String value;
+    private String color;
+
+    public String getValue() {
+        return value;
+    }
+    public void setValue(String value) {
+        this.value = value;
+    }
+    public String getColor() {
+        return color;
+    }
+    public void setColor(String color) {
+        this.color = color;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/WeChatTemplateMsg.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/WeChatTemplateMsg.java
new file mode 100644
index 00000000..2795c92a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/wechat/WeChatTemplateMsg.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 13:08
+ */
+@Data
+public class WeChatTemplateMsg {
+    private String template_id;
+    private String touser;
+    private String url;
+
+    private String client_msg_id;
+
+    Map<String, String> miniprogram = new HashMap<>();
+
+    //private Miniprogram miniprogram;
+    private String topcolor;
+    private Map<String,TemplateData> data;
+
+    public String getTemplate_id() {
+        return template_id;
+    }
+    public void setTemplate_id(String template_id) {
+        this.template_id = template_id;
+    }
+    public String getTouser() {
+        return touser;
+    }
+    public void setTouser(String touser) {
+        this.touser = touser;
+    }
+    public String getUrl() {
+        return url;
+    }
+    public void setUrl(String url) {
+        this.url = url;
+    }
+    public String getTopcolor() {
+        return topcolor;
+    }
+    public void setTopcolor(String topcolor) {
+        this.topcolor = topcolor;
+    }
+    public Map<String,TemplateData> getData() {
+        return data;
+    }
+    public void setData(Map<String,TemplateData> data) {
+        this.data = data;
+    }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java
new file mode 100644
index 00000000..ab594a20
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.customer.biz.purchaserequisitionstore;
+
+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.purchaserequisitionstore.PurchaseRequisitionStore;
+import com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStore;
+import com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStoreExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStoreVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 17:00
+ */
+@Mapper
+public interface PurchaseRequisitionStoreMapper extends BaseMapper<PurchaseRequisitionStore> {
+    IPage<PurchaseRequisitionStoreVo> selectPageVo(IPage<PurchaseRequisitionStore> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisitionStore> qw);
+    //查询导出的数据
+    List<PurchaseRequisitionStoreExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisitionStore> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml
new file mode 100644
index 00000000..cac0a4fa
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml
@@ -0,0 +1,36 @@
+<?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.purchaserequisitionstore.PurchaseRequisitionStoreMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStoreVo">
+        SELECT
+        storeCode,
+        storeName,
+        price,
+        createTime,
+        yCode
+        FROM
+        purchase_requisition_store
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by createTime desc
+    </select>
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStoreExcelVo">
+        SELECT
+        storeCode,
+        storeName,
+        price,
+        createTime,
+        yCode
+        FROM
+        purchase_requisition_store
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by createTime desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java
new file mode 100644
index 00000000..3c2ab6ee
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java
@@ -0,0 +1,56 @@
+package com.yxt.supervise.customer.biz.purchaserequisitionstore;
+
+
+
+import com.alibaba.excel.EasyExcel;
+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.purchaserequisitionstore.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 17:00
+ */
+@Api(tags = "采购订单商品信息")
+@RestController
+@RequestMapping("v1/purchaserequisitionstore")
+public class PurchaseRequisitionStoreRest implements PurchaseRequisitionStoreFeign {
+
+    @Autowired
+    private PurchaseRequisitionStoreService purchaseRequisitionStoreService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<PurchaseRequisitionStore>> listPage(@RequestBody PagerQuery<PurchaseRequisitionStoreQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PurchaseRequisitionStoreVo> pv = purchaseRequisitionStoreService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "采购订单商品(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<PurchaseRequisitionStoreQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<PurchaseRequisitionStoreExcelVo> excelVos = purchaseRequisitionStoreService.exportExcel(pq);
+        String fileName = "采购订单商品(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, PurchaseRequisitionStoreExcelVo.class).sheet("采购订单商品(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
+
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java
new file mode 100644
index 00000000..9d812400
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.biz.purchaserequisitionstore;
+
+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.purchaserequisitionstore.PurchaseRequisitionStore;
+import com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStore;
+import com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStoreExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStoreQuery;
+import com.yxt.supervise.customer.api.purchaserequisitionstore.PurchaseRequisitionStoreVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 17:01
+ */
+@Service
+public class PurchaseRequisitionStoreService extends MybatisBaseService<PurchaseRequisitionStoreMapper, PurchaseRequisitionStore> {
+    public PagerVo<PurchaseRequisitionStoreVo> listPageVo(PagerQuery<PurchaseRequisitionStoreQuery> pq) {
+        PurchaseRequisitionStoreQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisitionStore> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.like("storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getStoreName())) {
+                qw.like("storeName", query.getStoreName());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<PurchaseRequisitionStore> page = PagerUtil.queryToPage(pq);
+        IPage<PurchaseRequisitionStoreVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PurchaseRequisitionStoreVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PurchaseRequisitionStoreExcelVo> exportExcel(PagerQuery<PurchaseRequisitionStoreQuery> pq) {
+        PurchaseRequisitionStoreQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisitionStore> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.like("storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getStoreName())) {
+                qw.like("storeName", query.getStoreName());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<PurchaseRequisitionStoreExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java
new file mode 100644
index 00000000..ba1d9361
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.customer.biz.purchaserequisitiontobacco;
+
+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.purchaserequisitiontobacco.PurchaseRequisitionTobacco;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:01
+ */
+@Mapper
+public interface PurchaseRequisitionTobaccoMapper extends BaseMapper<PurchaseRequisitionTobacco> {
+    IPage<PurchaseRequisitionTobaccoVo> selectPageVo(IPage<PurchaseRequisitionTobacco> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisitionTobacco> qw);
+    //查询导出的数据
+    List<PurchaseRequisitionTobaccoExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisitionTobacco> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml
new file mode 100644
index 00000000..01280ba1
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml
@@ -0,0 +1,38 @@
+<?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.purchaserequisitiontobacco.PurchaseRequisitionTobaccoMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo">
+        SELECT
+        code,
+        supplierName,
+        supplierCode,
+        arrivalDate,
+        createTime,
+        purchaseDate
+        FROM
+        purchase_requisition_tobacco
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by createTime desc
+    </select>
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoExcelVo">
+        SELECT
+        code,
+        supplierName,
+        supplierCode,
+        arrivalDate,
+        createTime,
+        purchaseDate
+        FROM
+        purchase_requisition_tobacco
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by createTime desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java
new file mode 100644
index 00000000..4b557418
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java
@@ -0,0 +1,60 @@
+package com.yxt.supervise.customer.biz.purchaserequisitiontobacco;
+
+import com.alibaba.excel.EasyExcel;
+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.purchaserequisitiontobacco.PurchaseRequisitionTobaccoExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoQuery;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoFeign;
+import com.yxt.supervise.customer.biz.purchaserequisitiontobacco.PurchaseRequisitionTobaccoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:03
+ */
+@Api(tags = "采购订单表(烟草)")
+@RestController
+@RequestMapping("v1/purchaserequisitiontobacco")
+@Slf4j
+public class PurchaseRequisitionTobaccoRest implements PurchaseRequisitionTobaccoFeign {
+    @Autowired
+    PurchaseRequisitionTobaccoService purchaseRequisitionTobaccoService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<PurchaseRequisitionTobaccoVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionTobaccoQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PurchaseRequisitionTobaccoVo> pv = purchaseRequisitionTobaccoService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "采购订单(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<PurchaseRequisitionTobaccoQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<PurchaseRequisitionTobaccoExcelVo> excelVos = purchaseRequisitionTobaccoService.exportExcel(pq);
+        String fileName = "采购订单(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, PurchaseRequisitionTobaccoExcelVo.class).sheet("采购订单(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java
new file mode 100644
index 00000000..cad3f676
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.biz.purchaserequisitiontobacco;
+
+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.purchaserequisitiontobacco.PurchaseRequisitionTobacco;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoQuery;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo;
+import com.yxt.supervise.customer.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:03
+ */
+@Service
+public class PurchaseRequisitionTobaccoService extends MybatisBaseService<PurchaseRequisitionTobaccoMapper,PurchaseRequisitionTobacco> {
+    public PagerVo<PurchaseRequisitionTobaccoVo> listPageVo(PagerQuery<PurchaseRequisitionTobaccoQuery> pq) {
+        PurchaseRequisitionTobaccoQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisitionTobacco> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getCode())) {
+                qw.like("code", query.getCode());
+            }
+            if (StringUtils.isNotBlank(query.getSupplierName())) {
+                qw.like("supplierName", query.getSupplierName());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<PurchaseRequisitionTobacco> page = PagerUtil.queryToPage(pq);
+        IPage<PurchaseRequisitionTobaccoVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PurchaseRequisitionTobaccoVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PurchaseRequisitionTobaccoExcelVo> exportExcel(PagerQuery<PurchaseRequisitionTobaccoQuery> pq) {
+        PurchaseRequisitionTobaccoQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisitionTobacco> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getCode())) {
+                qw.like("code", query.getCode());
+            }
+            if (StringUtils.isNotBlank(query.getSupplierName())) {
+                qw.like("supplierName", query.getSupplierName());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(createTime,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<PurchaseRequisitionTobaccoExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
index 825572c0..d6ed589b 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
@@ -1,6 +1,8 @@
 package com.yxt.supervise.customer.biz.wechat;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yxt.supervise.customer.api.wechat.TemplateData;
+import com.yxt.supervise.customer.api.wechat.WeChatTemplateMsg;
 import com.yxt.supervise.customer.biz.util.WeixinCheckoutUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,6 +24,10 @@ import java.util.Map;
 @RestController
 @RequestMapping("v1/wechat")
 public class WechatRest {
+    private static final String WX_URL_ACCESS_TOKEN = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET";
+    private static final String WX_URL_MESSAGE_SEND = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN";
+    private static final String APP_ID="wx1d44e0fcd110351a";
+    private static final String APPSECRET="4764e32722a7d98656dea6afd9405701";
     @Autowired
     WechatService wechatService;
     @Autowired
@@ -51,26 +57,23 @@ public class WechatRest {
         }
     return "非法请求";
   }
-    @GetMapping("/sendMessage")
-    @Test
-    public void sendMessage() throws Exception {
-        //String openId="otnrM57kui-WCUmRtChhb1HguOgw";
-        //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
+    @PostMapping("/sendMessage")
+    public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
 
-        String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
+        String openId="otnrM57kui-WCUmRtChhb1HguOgw";
+        //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
+        //String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
         String appsecret="4764e32722a7d98656dea6afd9405701";
         String appId="wx1d44e0fcd110351a";
         // 模板参数
         Map<String, String> sendMag = new HashMap<String, String>();
-
         // openId代表一个唯一微信用户，即微信消息的接收人
         //String openId = "oLcw_5ti_iJpwibmL0QxfK2ZG9qQ";
         // 公众号的模板id(也有相应的接口可以查询到)
         String templateId = "fVgBuwpLC43YkeGWfl1Vw0mW0Qu5WP2giD77TfKAEc4";
         // 微信的基础accessToken
-        String accessToken=getAccessToken(appId,appsecret);
-        String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken;
-
+        String accessToken=getAccessToken(APP_ID,APPSECRET);
+        String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
         /**
          *  其他模板可以从模板库中自己添加
          * 模板ID
@@ -89,22 +92,32 @@ public class WechatRest {
          * 兑付日期：{{keyword5.DATA}}
          * {{remark.DATA}}
          */
-//        sendMag.put("first", new WeChatTemplateMsg("f123"));
-//        sendMag.put("keyword1", new WeChatTemplateMsg("111"));
-//        sendMag.put("keyword2", new WeChatTemplateMsg("222"));
-//        sendMag.put("keyword3", new WeChatTemplateMsg("333"));
-//        sendMag.put("keyword4", new WeChatTemplateMsg("444"));
+        sendMag.put("first", "f123");
+        sendMag.put("keyword1", "111");
+        sendMag.put("keyword2", "222");
+        sendMag.put("keyword3", "333");
+        sendMag.put("keyword4", "444");
         sendMag.put("remark", "123465");
-
+        Map<String, String> miniprogram = new HashMap<>();
+        miniprogram.put("appid","wx11565021714ba796");
+        miniprogram.put("pagepath","pages/index/index");
+//        System.out.println(data.getMiniprogram());
+//        System.out.println(sendMag);
+//        System.out.println("+++++++++++++++++++++++++++++++++++++++++++++++++++");
+//        System.out.println(data.getData());
         RestTemplate restTemplate = new RestTemplate();
         //拼接base参数
         Map<String, Object> sendBody = new HashMap<>();
+        sendBody.put("miniprogram",miniprogram);
         sendBody.put("touser", openId);               // openId
-        //sendBody.put("url", "www.baidu.com");         // 点击模板信息跳转地址
+        sendBody.put("url", "");         // 点击模板信息跳转地址
         sendBody.put("topcolor", "#FF0000");          // 顶色
         sendBody.put("data", sendMag);                   // 模板参数
-        sendBody.put("template_id", templateId);      // 模板Id
-        ResponseEntity<String> forEntity = restTemplate.postForEntity(url, sendBody, String.class);
+        sendBody.put("template_id", templateId);// 模板Id
+
+        //System.out.println(sendBody);
+        ResponseEntity<String> forEntity = restTemplate.postForEntity(wxUrl, sendBody, String.class);
+        //System.out.println(forEntity.toString());
         //log.info("结果是: {}",forEntity.getBody());
         JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());
         // 0
@@ -115,17 +128,52 @@ public class WechatRest {
         //return forEntity.getBody();
     }
     public String getAccessToken(String appId,String appsecret) throws Exception {
-//        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
-//        if (null == appletSet) {
-//            throw new ApiMallPlusException("没有设置支付配置");
-//        }
-        String url="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appsecret;
+        String url = WX_URL_ACCESS_TOKEN.replace("APPID", appId).replace("APPSECRET", appsecret);
         RestTemplate restTemplate=new RestTemplate();
         String re= restTemplate.getForObject(url,String.class);
         com.alibaba.fastjson.JSONObject jsonObject= com.alibaba.fastjson.JSONObject.parseObject(re);
         String at=jsonObject.getString("access_token");
         return at;
     }
-
+    /**
+     * * 发送模板消息
+     * pagepath 用户点击时需要跳转的小程序页面
+     * openid 接收消息的用户openid
+     * messageContent 推送消息主体内容
+     */
+//    public static void sendTemplateMessage(String openid,String pagepath, String messageContent) {
+//        WxMpInMemoryConfigStorage wxStorage = new WxMpInMemoryConfigStorage();
+//        wxStorage.setAppId(tencentSubscriptionAppid);//appid 公众账号的唯一标识
+//        wxStorage.setSecret(tencentSubscriptionAppSecret);//appsecret 公众账号的**
+//        WxMpService wxMpService = new WxMpServiceImpl();
+//        wxMpService.setWxMpConfigStorage(wxStorage);
+//
+//        WxMpTemplateMessage.MiniProgram miniProgram = new WxMpTemplateMessage.MiniProgram();
+//        miniProgram.setAppid(WxConfig.APP_ID);//小程序appid
+//        miniProgram.setUsePath(true);
+//        miniProgram.setPagePath("/pages/index/index?foo=bar");//用户点击时需要跳转的小程序页面
+//        //2,推送消息
+//        WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+//                .toUser(openid)//要推送的用户openid
+//                .templateId(templateTemplateID)//消息模版id
+//                //.url("http://mp.weixin.qq.com/download")//点击模版消息要访问的网址
+//                .miniProgram(miniProgram)
+//                .build();
+//        //3,如果是正式版发送模版消息，这里需要配置你的信息
+//        templateMessage.addData(new WxMpTemplateData("first","健康预警信息提示", "#FF00FF"));
+//        templateMessage.addData(new WxMpTemplateData("keyword1","红色预警", "#FF00FF"));
+//        templateMessage.addData(new WxMpTemplateData("keyword2","紧急处理", "#FF00FF"));
+//        templateMessage.addData(new WxMpTemplateData("remark",messageContent, "#FF00FF"));
+//
+//        //发起推送
+//        try {
+//            String msg = wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
+//            log.info("推送成功：" + msg);
+//        } catch (Exception e) {
+//            log.info("推送失败：" + e.getMessage());
+//            e.printStackTrace();
+//        }
+//
+//    }
 
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java
index b510d84d..590614cc 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java
@@ -1,7 +1,24 @@
 package com.supervise.rms.api.supplier;
 
+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;
 
 @Component
 public class SupplierFeignFallback implements SupplierFeign {
+    @Override
+    public ResultBean saveSupplier(SupplierDto supplierDto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<SupplierVo>> listPage(PagerQuery<SupplierQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SupplierDetailsVo> fetchDetailsBySid(String sid) {
+        return null;
+    }
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/pom.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/pom.xml
index 3e30b94f..4154e54e 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/pom.xml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/pom.xml
@@ -111,6 +111,12 @@
             <artifactId>fastcsv</artifactId>
             <version>2.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <classifier>jdk15</classifier>
+            <version>2.4</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.apache.poi</groupId>-->
 <!--            <artifactId>poi-ooxml</artifactId>-->

From 994c7fa14e4b092a8ddc84d1090bb451d25d61a8 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 4 Apr 2023 18:00:48 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E6=A8=A1=E7=89=88=E8=B7=B3=E8=BD=AC=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/supervise/customer/biz/wechat/WechatRest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
index d6ed589b..4788e614 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
@@ -60,11 +60,11 @@ public class WechatRest {
     @PostMapping("/sendMessage")
     public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
 
-        String openId="otnrM57kui-WCUmRtChhb1HguOgw";
+        String openId="otnrM521f8KcCsRfL2Jj4Tk8np1g";
         //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
         //String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
-        String appsecret="4764e32722a7d98656dea6afd9405701";
-        String appId="wx1d44e0fcd110351a";
+//        String appsecret="4764e32722a7d98656dea6afd9405701";
+//        String appId="wx1d44e0fcd110351a";
         // 模板参数
         Map<String, String> sendMag = new HashMap<String, String>();
         // openId代表一个唯一微信用户，即微信消息的接收人

From f63455476627a96a04785b881c7433d5c3be78fe Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Tue, 4 Apr 2023 18:09:20 +0800
Subject: [PATCH 09/23] abc

---
 docs/databases/table_create.sql               |  23 ++
 docs/databases/table_modify.sql               |  12 +-
 docs/demofiles/采购订单(示例).xls       | Bin 0 -> 38912 bytes
 .../api/supervise/purchaserequisitionpro.js   |  14 +
 .../purchaserequisition/uploadxlsx/index.vue  | 361 +++++++-----------
 .../PurchaseRequisition.java                  |  13 +
 .../PurchaseRequisitionPro.java               |   6 +
 .../PurchaseRequisitionService.java           | 201 ++++------
 .../PurchaseRequisitionProRest.java           |  32 +-
 .../PurchaseRequisitionProService.java        |  28 +-
 .../src/main/resources/application.yml        |   4 +-
 11 files changed, 317 insertions(+), 377 deletions(-)
 create mode 100644 docs/databases/table_create.sql
 create mode 100644 docs/demofiles/采购订单(示例).xls

diff --git a/docs/databases/table_create.sql b/docs/databases/table_create.sql
new file mode 100644
index 00000000..fb42596f
--- /dev/null
+++ b/docs/databases/table_create.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS `purchase_requisition_checked`;
+CREATE TABLE `purchase_requisition_checked` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`lockVersion` VARCHAR(2) NULL DEFAULT NULL COMMENT '记录版本，锁',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+	`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+	`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
+	`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
+	`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+	`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+	`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+	
+	`prSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '订单SID',
+	`prCode` VARCHAR(100) NULL DEFAULT NULL COMMENT '订单编号',
+	`storeName` VARCHAR(100) NULL DEFAULT NULL COMMENT '仓库/门店名称',
+	`receiptTime` DATETIME NULL DEFAULT NULL COMMENT '收货时间',
+	`billNo` VARCHAR(100) NULL DEFAULT NULL COMMENT '单据号',
+	`billType` VARCHAR(100) NULL DEFAULT NULL COMMENT '单据类型',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  COMMENT='采购订单检查结果';
\ No newline at end of file
diff --git a/docs/databases/table_modify.sql b/docs/databases/table_modify.sql
index d3bcde63..50a5f8d7 100644
--- a/docs/databases/table_modify.sql
+++ b/docs/databases/table_modify.sql
@@ -1,8 +1,5 @@
 ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
-ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifySid modifyBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
-
-ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifyBySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
-ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifyBySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
 
 
 select @@GLOBAL.sql_mode;
@@ -22,14 +19,17 @@ ALTER TABLE supervise_supplychain.purchase_requisition CHANGE createSid createBy
 ALTER TABLE supervise_supplychain.purchase_requisition CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
 ALTER TABLE supervise_supplychain.purchase_requisition ADD remarks varchar(200) NULL COMMENT '备注说明';
 
-
 ALTER TABLE supervise_supplychain.product_information CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
 ALTER TABLE supervise_supplychain.product_information CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
 
-
 ALTER TABLE supervise_supplychain.restricted_brand CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
 ALTER TABLE supervise_supplychain.restricted_brand CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
 
+ALTER TABLE supervise_supplychain.purchase_requisition_pro CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者';
+ALTER TABLE supervise_supplychain.purchase_requisition_pro CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者';
+ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD remarks varchar(200) NULL COMMENT '备注说明';
 ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD taxInclusiveAmount DOUBLE(12,2) DEFAULT NULL COMMENT '含税金额';
+ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD distributionAmount DOUBLE(12,2) DEFAULT NULL COMMENT '配货金额';
 ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD preqCode varchar(100) DEFAULT NULL COMMENT '订单编号';
 
+
diff --git a/docs/demofiles/采购订单(示例).xls b/docs/demofiles/采购订单(示例).xls
new file mode 100644
index 0000000000000000000000000000000000000000..bbe38cbc55ca0dcef30c4d2b45dd17e1efa809ca
GIT binary patch
literal 38912
zcmeI533wDmxA%LJKqmW4GBcSBOBMnNAwV{EAz=x!h9zN>J&+J(l_h{|VU>Lm1p<gD
zBDmqcAR=K=Ku{4xL3|ZN1YFTqMG(#RKULj5RWm)g=zZ?@eDC+%&eJtr)zzm?o%+@3
z>gpvYKCqsD^aa-i#bars_$z-^1}W8rbQ88|Ws5~oI%0$3e^pji@<c_!=Kn7LK^FKE
zx^_n6`C|>hS`90;c_3CZ)*!6GSVOReVhzI@jx_=+5KydGBe6zdwPCembzqIg>ckp@
z)rGYN)|yyrVXcid7Hb^Vc&rIn>tId9S{G|QtVvjtvDU|$g0%tGRIClLHp1E%YZ}&c
ztQlA{v1Vayg0(5uW>}kJZGp8V)>c^Wz}gyX8?4z_bFj9>+74@btR1lCVkMqw?S$<v
zLi|6dS#Mj_-pY9VO-5VfD&z1wQJIb!-~QqNF<N1MI4sUgp`ui<khuuHh494X!@q<T
zpEccy?J@!lOFxu8Q5mfiGCfA~#J>?nDt;!deEPkeLrKHC7xA3AN&#v<4K?qe3`aQp
zb_57{Y$)G^IQ5^~EuRiw%FP7p<ttN^vG^O#Y~LBJP|R#XDU+4Eu|19s@UbMT^{2jj
zyX8|~KCa3OGNTt)ucqt?doOT*nMtXR&VNDiQ=Sjlk5Ey*#5zcsfc|e917)Tt_bDY%
zY#c&TY?KoBKeM!BIt(|F4izwPYiya|O(>2wM;OJz=U9$6S=gF+B1O4&*U}c$_v!4^
z-!F&dTfxEv7KS4<DX+0(K4mHC@KHyQzjDrMYD|c)W@?M}xEoa+10Q2kK6CF?7QyDr
z2IlwpC+R{df*hA9-=OrDQF^GtbQ6y9trg`r`^f)y)7$uvQ`bj&n2+=%mTvOWKhZ~e
zxbh}7vseBm2J%bLYR38fa3=D$TdI%z0Y1{H^|O8IW2|SG&-~u{kbJX`{4EXir~G&L
zNLLxw?N&RW0lZ9<VoFdhRVLs>n~Jp#PM)n4o-zn0Rd;IbfF>9KIE}IoRC+5#%1C9f
zj{}=w)DYu+U?Y^}t2Dl^c0gNHzqao~t1ej+ayLc_8H#DB5~nJdf-QH=D7}>;@0IIr
zlp_JwNnl6uV{_Pc?SOt5n$+io`6`CeeHB3ae2JcpCTi)s9=y6ny2^$5&c_SR2GVXR
zTD?YLsFiM1FHdpawKK|5RZ)%6H|>gP5C(o?E7eCU4Z`40P9Fqo*A8d_GF`@pxEb+v
za4XPR!}DNGY2#A)US4)CN{*}Q@TxR$3p&rn$%^u8WgL33wp7GXx(U%=D{)5t<@VCa
zK^o=vl}=KP^8f#wZbGBE7jEZZcnW5R-xVb%E(aNSI*p82I!>T0Js^m+3tjoJ^arih
z^&#s+lz_%8Js3UJNKP<dHA?rEAI0R*Rh3*WPY*_CG?GJCU~+y3lS5Z!EFJua^$Nyy
zoRJ*5f-}yqrf;@d9U%_X*Tv*}m&@%ySAj-y=*rM2ovs#*(rrG{>8g_D|42b=<v6wW
zqAN|KbZ<RVnf|(-Tn-NB?e3kQ*Nd)VnS8YSzSw=Sipm2N(9<~&oD;g*<@t+?dH!as
zTwm?(U2YSWpRSnIdJRK;5#@T)RkWHuJSQ$qw?j=WUFSB1$)T%lmS0bA@Hh2I^O2v|
z*SlV^e=|R~v$q|%-MrH?eaPp0dh5gM>n*3L4>??a@BB`d-#fj94>`O)dgtfqXcqYT
zI0YA;>cZQXE{b`&)hhO1%4C%8D?cvc4D$!F^mvqOwc3Jh!Ad}wqMeV7<ePoSp;;l5
zlECDI2ZjftUobgbKIU>f<nwf%Un_T}*`~~-0`#S;(rm?yW3$XL$}B0Jyp##!`)Z2c
zEOT3roz$iMF?D4_SX4|E*OoArMu)l=Rmd6-A>^k5;UjT1kF7a#=IHYX!3Jr825Dx4
zG*XJ>RUR+b<&jd9mYrRyr>RPLR-2rpUTx2v<SF%?o;D$OsoCUsx7)Odrx5b3TnMYf
z;rDfYwK{B8s_SV!>Oc<Er<&wNH8nFbjnqU2eNjtj=+SiKa{VwZ$<0cWAleZ=R3hK1
ztK=z-9IRVfnNsE{ZI(yz<aw*><h=Oei~0c?Ibxbdj+myABc|!(R36vmsnzjpCUWs^
zBdW7%NTaD*>J#$f!-zB^%d1TXhzI#NAXYzs!2z>t<@h)tPCwu_OMsIST0-oSJ`9n7
z1N?Cr$tz9sVcMb@!k}KB)~thL{@X%m9^2g{Mw)1v(XWr{)MY|=bt<!sgxp4T>M<eQ
zIc8*%7uFWdCR&_+RZTpdV-j|`onv-(w%*nn;$oVHxR|CPE~aUS|NQgMx;(8Hi}`#g
zl`JVG;-M)erfEuvX_``ET2)HjoaF_%r={p-#s8e8wr}6=WhrsW*9S;+_e7(ysF=>&
z+M+RFaDw#g7Y%TXCWPN4@)V-Q>DPxQbpM8TF6K1KOkUM7uyG#`hf6nr0$^qDZeCT_
zzl|z3V%lj0yz`^?`3{r8y2d`LNVlc9omdsW-K-y=vAwzIzZ8<D3!x#6I28IDEk-xS
z+%0D0KafFRd{l?-tZ71uij9QahGFT}oF?RWw|^)kOAu02Y;>Bt4Nd6gpj(rFD1`1V
zYC`zEQY5fNYaK04zdj60w<p~~ZqqS)cFN|0kfLHEA-7=@x<RUGa=hC=6he1cH6i@I
zF%sDFH*7+;Xf+|nyZuA#?+}D!WEu(KdhyUl>(EVNO%r|#Ts!D*REO>|YeJ59`-grv
zTM&|wX(U9`jDA^l*7~7~l_`}Em|e;Pf&ok>rP5DnKIG66%1XH`Wr3Az{o-*CKU^_o
zV2-}75{KFDIHl!K|K;}=^&7Z(!^C-UxV8R(IYSl|P_Hr^Q|-Qw;6((nTXm+jtBQJg
zY2#;uHnd06CaNp|+Q9#oRcBh+Nvo_X%J9}I30hTk1TQKO4=9)v(+`6mFgxXHnQBy;
zlph9b8bz1+GfkYNNz=cjNisC4>Ikifm@+e~w5zNd`>jzHgx?@MDuG*+SH`@%#@lYe
zup8~+BI5BxMU~o7%Xzk5VwKvF(<eZ}a7QLUF$I=v*boP^K47jbTgyMH5+`DHuXYHg
z$P`oYvMvSp7p0E!I>avohiH5GAwl2`btO4ob@h)xU1<-`8ll8v4#0GA$-8TkhH?3E
zvPynUDyu2({hCq<?s}vf)Wf3JgHD>f>UG?Qko7#PZq*ObtQC*D7*#d|mF(FNaaA^i
zTbsIWZKyYTY7?nzL+4tmKs+9zsZtwiPfu-9tJH?hz$7|INumZ@yXvMvr?#_BeN*k!
zLAZ;9tdA~RKf|kS{T#?jd$`mH%$TEXD@rbn>XYBT*BvDfm_6Gz8g1*|&ku{oL_X^2
z+Z8o6sAmT1S=A9-v>kKrX2m4?LNZxBtdxZ>rhxcLvxmpjn25mb0aWU*2e*&#RVgPb
z<=#&s$-)iEY<G@nHO$Lw{xL8c?crGi@h}v8*{lKHzRU$*Hfw+;u`x;XTir0vOQNYJ
zB+?$9H6DJhN{cozuxO(yElR^Ks+S!%7QHM=-NMtNwY)5<b%l5|T$S1x^|IPkYUdW6
zNuqt9Ka51jLUdI}Xg1BNT5H0}vo|JGskMe!Jf3)~Qfnj8b*j`_6K%&C%&WP`{dhK4
zU9aZS+>jm5;dzN5*W)RozLyBi-NfTDzA9VX$djd1X*;**7FFBMNOXfLZKsL0;|9K0
z#i{3bR=lBC#kJlNkK5o?wyaS{Y+R*wZqav;Xx{@ABhhIPUDXj<A8+kladN_*6;Jo7
zI9*urb61<HD{kb|Gpnq)TXc5S6*m%{Rb|Dw=n-azGD0{jI9OdMSZ97Obe*t=(t39F
z51@x?73KcCFLUTuTWAt|a!JwHqQ<`S(9LL`$DPxLG&7SndipxYEX0;#rO9bAC)@5m
zeBAI+MH3rM8#^ZKc=zCgah9A5vmTwg`fRfidy;btUp%&J&u>cm&91hGx1N0D+$WbV
z&Tsbq7q-)zx`qu%-5eOUwCKG?i(k7oGj&Ieou789`F84<3y1ArU!CSW`tpjXFFGHY
z)N59q)2kOg`^vxKK7OUa>G&U0|21TH;ytaG-P!NTsq6K>%>A}Oy<orQf10R*ZneAB
zT6f|cuE^sspHIf~Qaha#{(eCB@im%R_C{Zs)Bn4@Yes%sCnF*7)iz(&D~;^XWogYP
z2j8>aI(2tk{Z?<-kG_yI_p!S_>^k@J`;tGc-l=TJ$)OjU=5F%45mIYnzXrV@yXWwc
z_=bf;6Mxur;o|XYVY}a$`0Ma?dq*6vHvI0x&kcU+X6-zG#{*g4{66*0`KucJv1N5~
zn6;?>55G@Jz4i2-*x3`ReSgH6bjJUWg73DjjO|+feL+e>+3>_hFNE&6Hs-*zd5JSG
z^{V^Tm4I9IUVgF9vrQWWB|Q1#_GHs*uhol+95!d_g;#s*pPI7JWloMw*)gqFjl9vp
z@n1jIb@$ZeC5P{iX;+$YAY%KEy%H1exbl0SKQH$yeXig{-tZ2Wst-IkZfj-mo&#~4
z$6akPJ*!dDv!B%X_3I&5hx+dvbokeSe-`f>aPyR63wZwI=4Dr3df|)De{2%`jOpF%
zmNT#4wfFmt3!B{<|J=QwkKQ>a<hi!HD{s1Hr(J1hYxrjMOTWM4dTYq|u~WWv44FT1
z=A^JMp8Da}ZyF+3dfls&!v>GddTr0L)9Y3TZ41nswx?I@%dZAs?rJM&KVa}ZOM|*z
zdg89GC;Z<DRC?wtP3+vd#Rt~{s`cDAxWmy6Q9rKk@It|<t+kdfzkH)-+{cSPTE4~H
z{OHKT`?kcNv37m#xuLgyzxj6NkH0S4v18SiN7~%H^vh2dPu-b)`K{E0{ttG1;=<EE
z?)&|Zb3OL%+cN9=H%I%8do%5)eU-nQ9lvk()#?Y@+?8?PjbBe?Z^@o@<Gsss{<?O^
z^u@)JF$eBU+<#!tk{)liN}c=4)rvF6f7-CG{O#n9hhEG{|Go6}AC8^z`+ReqZw`Dv
zqSdtP%{wg)nKt&fiZ5F(ztJu7@bP9}9`dW5-tl_O)avIKZ9KO4TFJVOKODVr{LsJJ
zUOCfbYV`KL_x$lv=*w$gA5=PG%!hAw@0HSPL4IoMUzc}JFMZ~RHt~H2t?E=!J}m0$
zzmh(0lkooP<wwq>Jih%yQ|GwGlcL*pdd0qJ+l<fKY}?i6`n4BUEC`#sbN(%JeuL$o
zoapx0p-U4NMBY>VmgVS~+=<OE&t39uNKpC8w4x!|huXb9X578~pIh@wjkwq!UXJ~6
zdSRX2iTUe4Xn$zKlJ8!)yIIH1UmpnX?Aml@)!Vi%w&|~xPu{<3!`}8EO+Dh@rP&jI
z)ZX9sjSn32_H5l;Z+p?)ok^KL9J$ow_%k<ay?-@e__G;t->n;xl-N4|&40&yeysHH
z7Z(rho*v%!(0x%qWG8>vI;-pW5ohe*HvDF9yM6siD(5_RV$*Lw!!K;N&F}K`!C|w%
z{P^;ZBQO3mqg`^XcU!!Df4fI2s%34Rpv-?aZ)nSVr`I}G`1{V%jBdj&B&>XS#o_W>
z3yw^4ZVS!(vB}UDOFCR=89C&gfX`gNK7Z=91E&T|JapjJ#{-^zvPN;E+I~kbO?#!+
z%7ZJ~eto5Q^z^kU{~G=3nzw#xWKKTUEPi;m;<aZ=SC=%b-e>hMf4b&<9rtLz-}?4{
zxmIeU2G^GrJo|!jPf_3V3%=UF`>Bh~z8U7%al+Vkw)<0hOn)l+?CGO3H<f>G>-MzY
zQ`dTL+gVoh#JQ#4zH{lx)0eiFuIx52arwlTI$t?*rFOkS+n0~EJbh()$(wiYI(O{B
zyM8H1UfSQ8b=UgJ6>sNG3M+m3)13VL`X%2yJo(nwrT$&&<qSCdNX7TH+SH5rXl2i&
zfgS2hyJ7FNW&H2UlDodM@Vj{HWz#2*t$n&}yTq?+*X?|`-?7H0a`K;z-#Bn=NWg`M
z>wZ#w!1Pa!v_1KK;>Du@fhW7|Nq;Qi;W^b7e(=hH8wHz&)_f-QZ0O0>%MV74?>6dI
z_`Jx`FW-|=7H_?_bjP|oGZU}%ebM$}(Vx#|J<+c8y-()7vFPV}JG|ty*LvIb@0z=|
zzxnvKeGjFly=5Q0sLT~#-*usR@34<UpE}+B*se8`&YYR@LDSxAGCNE<o7u2WufeCD
zE&MoiS<~kuk1cC5eg5f$Lnj)&7yd}s>rZ|4YV=*NP0UN)6A<v`@<+CPyJcIv^P_cZ
z2Yh6^I3=d<#=*-!-8<riip-r4@96A&>We|I4_-3xY@N-g_MczaGW*Q4eH(^$cU<mL
z>+U}fF1!)qUn5)j>B{~+pT#_s5N!_o^v^)w=Q}zl4xLyuW)eFmx=$I~Ki+Zq4eV=*
zSx$QJgXd{PITx<_;GTnNq4)o|aPRyNXZ1RH&{?;%@%Gj28*iJXTu7c%l2GGZjc?EO
zI9xq=k9oo4KVE;b^<TS|-MH}J<v7R2r>Y<PvVHckk_)A+_syAibm8MW>Y4{mo3Lox
zjB~FHeY59>+wOQTy~g%Vuckc|8L{|mk2iboYB%!3qn49ha?fQICeGQh=H8*7#BSIU
zbG~V}Q@=WTf6{E&u2nmaR=#vF?f8}+`{z8DdMP(xT(bwe-ThVJqdOa4%-_3uXVFt1
z)jsjc>o-2;XGP<oL8Ql7(a0oWAFh7nIpnJWlhAED@hr;odkz6qb9E0skY-zOecn{_
z`0=OSu&k-~uf->x{m6g8S53m2W+(Rg?)$J^spdxa4}Yut?mg=tJ{mP5<MZ^Ar(EWi
zS0B1}<NmR)f44HHw<B-K*;XT;A2x60_-5bRN3H3a+`V36@8m}58zzP)by>Ul#L|Kr
zWxJYhTh;fggl$i>J+kLSr|VN@ZT)GJY3AFBdkZZyPAf6%dTy+I>Cfh_C8HY0ItKsM
ztL>z-3#%nR_RjJ1bv8ZKE#TdOZ@h8n3wh)a_e|o+-%;0^xZ^^PObl#4e%$1uag&D@
zOrKCRX)p~No?UY+?_ioG_j;#W^Di~*viZdvbKR@+4zE1?*vyI}<%y1?XI|XV=a1{%
zP8PJ=8Rr<2diLV(%hLw!x_)tMsdMeW3$FGVQnGO5tcyFJ{^gIa>+d<8lHSvQe$q3)
znAQ&YWPS9duPtfyuRc+5bxVuSV%CmXRp;@~0u!Hnxy{Oo7gszSG%R~-`$>as&EC1M
zF!B9q@1B@)qpabWz`m<yv}m)jL(K>JUO&7n>gkh~1Lsqp->|V(lP{9bwmY(Y(pziq
zi$3{KNy(&jX?<o_Po4E##>OkIg7KCc)jEEdmb&WDbKj;^w*GecGvf!2df}(iR`16B
z+~Vi2ZYF)5xq5l#UlG%TS_N&mG5*^gJ-eFxY`9aVjSW3bg&mkZh(nl-sbvGhaRJ6W
zx}Vpe=W}ehbD$9^7wXwfky$OYxqb|z@b(KM5ghHRj-hcfUr513tYUYl>PYHpe4!(2
zVDv5?X<SXuu1Cjn+jccP-moKbrQ8kXIVyGwt%e>hD#f<h7}-;X=LLaV2F>_*$q+6N
zdUmbG8aW8hw`8Mtl`s&N<Bg%^9v3t#&Ha^?LfUFbw&Je<w@eH122By(a+-`c%V?`R
zdxwBtB^ry#oSt~crWCIdO%`%=L)s|3U^E%?MYtftJ4ke=3-9$@yC(h8>s}*Aj->aV
zr1XmyFS58&R;E-`RN$vfDaRvN<(b9Edt5n={KfdIM7mOpID5zjw@m1dL?I|+f7qrx
zbjKEX=(yuJzOu4hDM!4r9LGW~p6^mJiz}7P<HwPX+_aWsEr$5wa%J7Rb$CIsSjj9$
z0;WbXv6izHX_+_{3Bycu!+0THnA_bB8%nIH1t#L?F9V09VdcMRm~P5Y-pzYr%loUp
z*s#Cg(Xv1Df=2aRH>TI``Tw5!>c9m<s`sYtjkve5QD_n1!WJrJIcAgl;%~pnj8#!q
zWcew#lue-nuyY&s`zxkC`PcJZxbCe|3(WM7?%yZ>jXW2w<xRz-Pv1Kbnr1P52h+qS
z?ftFjmxo-HHYF$kdh^=Qv+$XixTG4z;V&I?Sgy)67G~o3aNKx^z*ALL{6^vzk~Z~7
zTG1!Jdk<G7p8o%@Yd;XOh@BQ}&BPlksMD!DI^L`VnXoS%rN=3odOSGfuLn=%1)vO+
zlGZzE#igRyQLf5hKBr6?lD1h0(?KC>e0WX675xibn6@<)^;$cGD`h32yus2TcA&mJ
z7y_C?nb;|<#=2J1{kiI7+;Jn)dUs+4LCoAGTHREcTv0@p5404%I?*)DRSES|Ml~%;
zT7g;IZi}zyLy?Ys_7_~tGfhKESi!aF_?b}j!5aKj%YS<@_R|lgVDpjupiygw^dE@L
z1_j~weYob~4N&7?59Og#vxknN8e`A!{MTpCn7OPUHdALT&r?NH{ZM%KHAyS3=iwkN
z7Zr(|q=b49Wg*E(rK0C9X*UL&br&cP?JkNKip^mwOshW{y{rc|sfJX5x=F%N$e|^7
zlw8k44Z`nZVx~{Lp6Bdwei(9D3R6dYH2VHY(4gg<q!l9y+l&UHd9V@Ht<^B99VF1c
z2}Q^sUi{ANzyVjrAdMPzLJ^sE)ar3P@^>w}o)0Nngp?Qdbz6*m%BYAz)IMYw2r#Xt
zx<lxk9?4S{Y#1;_&A)LV^%A602Gyn{meN(5{4m&WsK*{^JqT!(x2cD@Ahdwhp=fc^
zikm}rEt^mjsF=>Jn!X|YzWXO7<92L)B5qGUZ!#EWdLb(?cFL@Rl7iS#$gLgvLys0k
ztd`%*-PxNGnHd&rIFm<~LM;{!?Y@Sky@OVsF|$E$R5ZWGkJFRkhBHwRq?7$o-f!y~
z^-&x0@T!UuVh9Q=qw;#3TSb;YU#GsBj=9}5tWD87@OByRlq2)Y%Lh(eQZ{E);revu
z3PzzfXj_A+I_bD&L%k0Ll0(1}MpKb3kVKAv|7EhSOZ#zm<AoVGY+SKxHPMDTe=u8l
zsG&l=;neK)Gf+3)osr4ipJA#G*4!Fc)JyPTTw~I_2?VEOWj&h25f><_UIC=hQL&?-
zRB6fEi+308>ruF#{F+wdba)fV1X-wOGfY~kCP*6aZr=NAjusZKe{A;U31kc^DGO&b
zG6dh!4MDEmp!&^`vnl?XQT2bzgHo2lNA6`xEn94)6uCGrrJ5Tlb?<`m@&`uj+(@dV
z>q^nqU}_SwjiEx+BGevIDb0Y6Q1vA<3)g=(|Jb5wYqqVTikFs9HPX~l_!cXLHVsP2
zM1wRzDOqwUq*DtFV^sr}msfiztzZ7?ZL12`Qwd~4Zd|@K*hq8>RF=*yP28f%UuQtS
z7W5Jt$G2-?e&OcLOJ-69mdq?I$zV{DaBYjJ@1xZ+U<>LK8Tev?Y0}IkGc|0eBrj};
zL7`|Rue78~zScUt_cT%KMQW?<Lq{1{j?|;35ZZ^Ij+$XdgjT)Iz4G#72TUrU>Xnwz
zS*kgcYaoyaBvxCv?Zvx0wNbPtP{~`ixJ&*e_;>4~!}H^}j2uIX(^y4o5ZY3~GE|(O
z9;pjSU=bkccwJ9#at_p_f+6d7k9mE9(z{FVy#uK%YCv8V-!g3c4A_r+1iSs{?#V=N
zmRK2T0nf_N-926a-!d$KYSA3B3<_xB?u2e@-L-t@Ms6!&M$@0Re2S+UWXeV&+M2q3
zFDK~ggu?ZkH;){%bPn}DaygkQJqE2zV>Pb3hxMrmb&r;=kYP4&p1o-1W^(Me-Ra2g
zH2U#qT&hZ%yVG&KHD}2I(i)YN^I;T@JQd)fI}Mt3ax}3<<h0N&Pg{e@*BUxMa!Aeb
z=TQ>j)5L8hUJb&>-MZZL|3xG41|SfmijerGZt<FL)ha}d&_suaZ~1_S$dv5FJs<UF
z-SY+K?Jsz5&7vWi=i}!{PA2&rpN-HQI*{+tb?1JEn%$yxU-COkX4cBne9u4_lY2CE
zJU}NF70)bGnofKKCbc9Pp$RU)f^lhL!_79js;BEv{^1IX^x=vS%ywuC-TSJG35LT9
zX@G$<8;<nD%j*$r+lr7rU}IKpJ^9ng?u9+GhqCk(mfnDc^H@q5@@Pw4dbCctsm#Tm
z{p{wI9r5`r_W~By({o?RP7=10_3dlf^@Z(6@e)-Kv;ung+o2VN-}Ch7ANw^an{oGa
zvs(?m!!YavEzHU+W+g@WG>mE+z~UtTl_Yl@&wMCt>bc|oxI`+AaK{61T!O_Nrwb${
z)*Y{oE185KcRUc!WS0r$nW0CL)xDo45%vr6gVBmBBHjB#Fo)YLz#R`o9mbp8@i4Sv
zf{;I)K0zduZ$WEjhP(6A^uwuOcRUh~vXhXX=Ec4UbnmyLFMJ>BjyurxLaMvt(RlN`
zi=a;oe9TLNJQv;$|3iq^z^mq)gyU=CZfufpd@Ve<C(5sli{15tKC$>jQf)#1I9yl0
zA{-x&hv7u~CxE2(LjF3qd=U57!xLdQg#AgFAdVE;D;dvfiTmm62BN)EFl>KCXwL?C
zJZh_8?^HbNv_r68Lp;RvOo-cljc^Gq%4>{IIEneGuZ#QXY%SV@+`ZV|<R7+HbIYeO
zxVWDjwkA*UqZcvx{c!$CD6=2U?9uj3_FHDkQ7FyC(wy|8Xldjr@ZA9^&EFu6e1m5`
zddA$d44PBZ(iBq!D;JK+D~&q5XFg2RdZm#!^vp;1Lp;;Sb9$!Hi|3wcWGl}!da>Ly
zjV$PyW;IBo*;LPbG*R!FM!wrKjr^-;8a*E1nMUs!dZsxI((rVFS3Y_n(DPV&4^T||
zlZNz2Yl~G;c+7+khfx}j`C%WC!ejpUpcpa2V*!W}9XwV|=|H}e#psB(@T6MIgpW}X
z3zU;QG<_FEi}_=6klLT`Bbn6lJVr99%_&CZwq<7k9y1BL_%oT*>U<x`r1s`9l1VMi
zW1>vbzAZc~--olda9jYBNi9#u1)zMlo^%#zk4ZdjUp3`Uc9UkWGRQ<W$id3PYuRi&
zhe9(8EiAOL(8<D@ER17e0t*vaSdWFtEKFfxDhnI2FpY)jEX-hGCJVDz*o1{mS=fw)
z%~{xjg)LdwiiLNuur&+YurQm2ITV($P-)AyS*WyQ+bmStvuzeC9oRMtm0Y&XLZu_y
zW}$K?+h(ECiEXn`>CCoSsB~f5EL6I(Z5Arsa+<T2AgVgCyFb(}G_TbO=Q!RH)fGR)
zs3-A#{)kZ@;;{h4sQ2(#HN>dj@K|-ksK@YFAY#;4c+89#jk|a(2(emvEEq9*&6Mv8
zK`d5}g(4QG$HEYc*JI&`CFrpT#OmlV3u1|S%!*iDJr;>rJw1kVKf58yOSd7GtnafU
zR$q@f5KGZx(TLHzZ~QnXVySv81~GaYjqh_I)<}=lK&-JItBDxRbn%?E5Tl1qd8{^K
zIJ2p-Sj2E=K#j#AmZity5u+#g_;Cq{VK}VD>L5n%6!CqDh|w(*9;=I33q4j3v6gx)
z2{C%_hUZL1j9#GOF`WO|=Ms4=1u=T1g~u8oMgvqHOGPY4k2OS${3PFpv%b<!k2OZD
zy&l6EAAU>AnT}Yl9?L+iqaMpd>`pzFg;*y&)&$#~^;lEHy6CZHh;`Lt7!fGl5S#56
z%)BfebuF9p#H=F9?ylwxMDNH|^7NekO#ZkWo-+XZdgwW;A=VSIz3_5@=w&2Rp)hV$
zP9U>EAbfbP(hI5l_#i133~hVs`$DiUA2F_BDCC&V-=~%vCLI@!Sb?51f|a;h&1sQx
zS`q7`mk=rKi$bigzR!kOKg9Ne)<F0Qls@^T9E8K)K}ZX?n7&<B%F@T>)KKeI6B7C(
zAJ@MY%dgeDHuep`K5m6r#O~5_#<85eRsG|!kL<;zBw!!u!H=theFJqViBitGBn5Wo
zIqRwWc*`WIx^Uf-6@QEg1JUn0D;vvcvE=Z4DMG%KoCa#XRHWua4L_K_Y?&&(p(>r1
z)d;ac(2C1wEXbhGl=3|3lCBwQ9=<OV`{=!+z3^v&=<~XTmE;_%(>e;V@US_v42=v}
zoN0vXZ^#&eG?Hj$1P?`wY-q+g896KFsX2+@VR}xHV6#YY+A@`3x|VYjj5}yjj0hgC
zOCy2{^>P`(!$zp(iUgZ6?r;-q#<&9-T2`nzMS{(^l5-PmMn4mE5ecR@fZYU}8No_L
zZcb-q?(%~OX`%31wtJhUz%ra*GtOUb_RKhc@toYIBEe>yzuW|yasEQivJR^LBEe>y
zzpxK_a490eX0*3h9wQib=Q-U3C!z&pg3%}93Ul1`&{#F&4Aof~A349GOT=PTj>xJR
zXQ^Ce1gt=;nsJtL%g|Ug<NPFQC9-P9`6(AO7MxYH#A+MTr{V!YEBXj85g3I0RF0Wx
z6vS99LY(Ru#8@pxjOS#m#?4f7imV1<+?<Q4D6TtwoLbj?<N}q|Ac<9)b#T)Xgwnd;
z!2+#Zk<}oKm|;_u)ga6^h{uVn260x8FH|)YSq+j{rS~62DI%-%u^G-PuQhpFVubus
z5JqO572B>mFWh&iH~dl}Qli~;_2w7W;{4K^gYK3KlK2h6_{;5qgCu_GEj+R%XEX@o
zFHwrfZxF^`ZVwzJ@f(Ek7o?yqc)N=H(raUSYoR1x{01?82Y=Sle_9ClSM)lRXho6V
zAVYqGBz}W1zTzcwtwer<y!nk=o+IkX`K2o@O0}?>(Y0VM9#Y{P(Un@Rat~tEl63ur
zoMnsDoW!p-S_o$Rjz&)Edo(83OX|Nv<(Is*ySCIj#2E2AMlV+!Ed(=u@z{-8uE=k&
z<ZFXDzgKpsIYoYhC4Pe?euHu4<{mB3XExlvHdq)fC^M%B7WDG9uncE4n6avj7J?;K
zgC$mjC02tus}(&}{Y6%TnXlDG3&9er!4j*%oK@JJs0hZj0=F}78JSf+TA+{m$)g4O
zjG*3vispgoqkx^2ud^TjV)o9*Rp}zZ!OR0|qlI8Yf`cW3gC&B4nFrQJ3&9e>Y_zc9
zdBOgg2d3Ep($&T^!snb(-?1u5A&lU0h!Mdd62bWPA9890he!m6hy<5xQwa`{2o8}5
z4uPe+;BhbBb7;=jJz5Ci9yqO3)leijL?SqZ6a4!&HK#~$h(vIRL~w{iaEL^32q!p|
zY}fY6Il+P=!7C|UCpbj%wjmP1AriqM62T#=w~bTv7YPpG1VazvGDIRcL?SqZ6AZia
zoNj^>ahyyryzOeSS8A+=FjgOV@2L-_q&}+35m^n9MhhW^tcFOehDfZ2=&aItErhW;
zer~|qtM+%nd95~5nlLIEx60Fk)irKu){?k&GVMYcw-Z!;=#EaVaxY@UZK%pE=O<L+
zHk5HY5jm-Uhl<>uFITw@mADO+xD938PSVR2Juls<ppnBYRYQ^6P>I`6&h3PaYEF^c
zP>I`6iQ7<#+fa$yP|oe@S75vS8&3)r6u9NrX$ZOJ4V64^sKjlk#BHd=ZKyiR%~SOk
zxeevqLJy)bRN^*N;x?3X3%m22Zf>b%WNx|V4P~CUm@SduhVmJC-cUyKr!{5{|M}87
zRk}!XsN{J=4QURQXbzQV4rMe?W)vkt2e0e2^IHY`YXsA5D-m3iX@uLHV0Ma165W~1
z#RIUM;4tYrEleUfj1fE)IjR0(BEh#FQwa`}2o9474r2sQ)63O7FZIhX)Wv;fqgJ82
zZSHYLm_%_Hr+6~=J7Jg=7ITW%YGD$^VG_mkB^CGhA&gUe>qXel)ZLf&Wp>oB)xsq2
z8zxaq->z_vb;Bfz!&L8kr`jGO#kj`^OPHVsw}Lp<4U;Gi;}pa8Jg1xDMA%NI7!rF<
zN6l!VQ1iZFjMv|i2d(<@_*PYp$ZMG7eZvfS4U>2clXwl&y)Ruugn9FN<Vis*jaRxK
zKw9#%6P}-gC8r}!^`w8Dkc<BT!FdhmyefQVEL`H1o^^H4jD?H5R%r7I;S#TO-Qy-H
zobftCFIVH0JbgIh)l@N+*^KxVj}x!e=q@qpQnp;pDY6<adE9V`)o_W`aEaA$&T9V`
zU^~+<Rn9BGGTh^aORR=VtkUDoZdSu3R>M_RTd4YrtcG(|p$Bgnk=1aC)o{)#?9OwF
ztcH8D8aGv-LSr?Yv3m3SZ!31M<ns#Q(sfz5#A>)9tKkx>^bro;C%9I0T}Hl@JQ96X
zp|g@+p5lDytF~;U5H5}sh8fK<MBrGGm%wU?hu$D>rpgc9C(gxl5S-fx)z3~;bBc2e
z5scf}$Vq;d9z*9kA{@3@^|QEV3u)SnZiK{b1mkv&UamM&h~V7jOi;@exs8x~Yy{^P
zC6a9-Bp(|gaT_6V8zFHUA#oeQxK+yXb1)yaXg@+)C=^Bt6%#2PA?G$i8Yx6b+(t;;
zMo8R7sND8a^%uE~VBC@(ylx`55fZl%oLk)rBDWFV+`_KzI%(X}H&{9=FCQs=EA|0C
zV-q298zGGeA`H2WkhqPIxQ$>wR+|rtkbEqg59_~1&`R^MbSIT`O=LEp=MHj}GQ`Ou
z7RKsa#K_lKR3AG;%_&}uStM31BC8d%RaWU4CpW7WiB$_@b)H_X$f`wUmEV1^NIupg
zv1(C$>>O1?(Z^aORxJ{%7Kv4h#Hxk+*yil+L(NwO3ks}4Z?fSKl~s$xszqYeBC%?b
zShc9Ec2@NlS+#H<3q5$th^$&9RxPTJovr3{vl@vul*a>nRBI7Nwfydb#c)(>VFY)4
z@VDwio6b<Bi=zaKM6kt>V2ebsMIso_O@R<?KEWap%&yBS77F&)2)3%$ug5g9GJ@x;
zB+=7#xyk~>h+r!xxU5*sDH3dD1Zy+8R*_&_Wd|x`b*n@$UbPW;wlabj>g8$#(>cV-
z2<BG}eBRC~QB0q`bKilma*8eYt6GW_)3apmI}lchVyi^4RifC+J+9IT_M6+VLa?G2
z#jp<dxK@c`t3)xq5ak{zSS5<BD#d(O%qq>`TDixC9^9TH#a4-8E2kK?=Q-UJC&C6Y
z#nksKLY*{^Yh}DX8FivV|Eu#=IU=uCiC3#3uU3gytHi5S;??TSYtPk!RvNGL3<_zS
z%ruH*ye?9?p?@frtK5$m@fyi_#W|2{5XnZh!}Odqs?|mZ^l}=>WRmsK0o_$`d)!Eg
zSDN+hqAb>>X}t1s**t<eI-qMjQHsbajZ09jdR`>|BIXoXjg(lWXCU1(xRDa8k+(BC
z;5F4p2ayu1krJzs604CCtC5`596maTlvs_FMhB77JVK<zYNRweh!kdU6H#kVR!xSZ
zgGjH@L8LS~h?H23G-NeWVl`4?HBuTKL`tms9v#rral};$BM>iFq1BeC%+SBR%T<;l
zM$AM>qk|~v3M@(*9Yl$&md#OpYm~%ll*DQjV|AHcuEr|))+oWZ@;eSu60cE`Z;j%-
z_AFEDBk~$0`PL|j*C>hCD2dl7K0<h&jS!yjH9{DdLw3|g2vHKRQ4+6F60cDbuTd(m
zy;c3i5keFnAwUoE7EuzfQ4+6Fs&D1vq$r8kC<9*aW4dc3@Fx+X7_TiKI5wx#c|I11
zl6Z}hc#SgTHA><&O5!z2@~u%4uWT$3w@A=R^Q|`6nCzU&Y(W3UDi<#q^U*B*Uxr*|
z1!BZ2eYKl%@)-l0#H)?*sy$0%6L}rBQsvbq@rt*KAzQl+voT&*>g9^O+8D3elOEJk
zHi=i8#H)?-sy<0#ll-eq;?*YcYLj@SC(PY5TsF=tpW*uCZNZ9OV*!2Ez$Wo(lX$gB
zyxJsQZJgJ#u4;RTyxKUg>I|1n;?*YcYE%8|N>z$D7O;8qYB<AXW4zWmcVqTF7nZ7W
z#Ib-);?-uzt4-q7Ch=;Mc(r-+y7fW9(i*Sy6eLmDh-rj(V9-vhRBr5y*VTv-uXc%7
zyTq$q;?-`*t6k#NF7aw-yspv9C0^;t8S<}oFJA2uuk>+b_t@1g@oJZNwM)F(C0^|k
zuXc%7dLM$%gd+6GEBCM3ESH_}O8t@BPJDXCF7axYc(tp%@)=pXG#;=^yxJvR?Gmqc
ziC4SiU+uTatKExNyX0T(j92aH8M`5`c8OQJ#H(H6)qb12(sR1RYZ~K~zFwV+&th=@
z>R`OCRc-E2dCgOEiq~57ubOj}2a%Izwj3g_72{O@>X3MKNW3~2uMg?vYW|hl+QE3$
zo>g>6tU4rC9V)AQ4$L93>X2A<NUS;}Rvi+n4$i7NTkwR?;|1S}D=e~Mo_d|-kbJ8{
z@~sYuRfoi?LuHj;OF1M~9h_Blw!k5=>X2A<a8_Y=Iu|(vR;gv=u`8b~aCprYI1FbC
z9E@N-TQFLcE_z&t<Z&H_1Un>x9TLF~iC~8}!4=|tX3gW$v*l#{bfyvB9|no*RFa|@
z!RrwtlA<M#8!dU<XvyP7iv%m$2q9V`I9eh&ni0G~FIOZunh~r$;S((p94!$X%?U<{
z)OOJl!O;@I(GtPY62Z|D!Ss(%$v!kwV0ysE=z!nF)kg=>62Z|D!O;@I(GtPY>S&hF
z6hun|M>B#+4_-HMrXX4(IGPizTfsd#NP$gcf~jWmOhIR5@7`Z>QWai`$Y->~XS5-o
z(Gs805}(l$pV0<<KE(V0=TYO+2@Ofh3|4Ra_hax`jyUP(WPEN!jQDhNKGoSQr^Kg|
z@u|&bIYmDE->-UDr^KgI;?v3a+@zN)^66Ch<X2lxiBI|m1@6&+lk<6n&ty3zKAjSu
zPKi&a#HUl@)5$$7e;WL#kC`monS~AYnJlNor&Hq7De>u)_;jismh<V9_;hj)t3D0x
zlsv3c;?v3bgxz@?y7`Pm8_Ilg59{=LzRPLoVV%sw{xN9m+p~A_Cmo&A7{MtK>@+0U
zDG}_H2zE*YJG}|sU^KrK18RuiOjcjK{|+KHt0cuRf*(eV2#%4)2r&}DG13?zMkKgw
zf=Y0VL~x8ma10}Oi(alsaEwZDq^hAfzZD}99K#7d&&LQc62UPN!7&oSF%rQs62UQ?
z;H@u%QPUech*T^T3S$H{MH?f;NCd}71jk4O$4CUnaDp+`AogM;f@3(r(1Y(2J#36b
za119HcIP=of@2H`ju8m9;;v~V%1&W*<Tcf1Xk!?`Q~WlXYh;a8rHei|Mj|-Ikl+}J
z;24SE7)G%6oJ@>2!G>c5mumeirV+mL1%e+z8r9y#2;Pbq5$sY49-!u=QSPI9PH~j$
zk_f(6CD<hq?2-s}F@hh{r4hl}`wT8V%8lbQ!!F4OyCi~L>L^#sDb9GgB!XQM!7hnl
zmqf5j9V2ujf>XpNH@pcRppJ4~j9~4G%q0=*k_dK51k-;ycY70;M6gR8BXm=(FB0sM
z2zIFi->c?y6P$=PlzlMjRCX_FMhk@+t1ias@-E*5WZmGSWtZe_U5r)jip*ums!L+k
zC9&$#S*7c47h~0SqQjYMlb!6j1DE>TK^EyIJsCk`hrPJVRRh}6vj;r9md&<vC^WOs
z!a^Ghoh+=$!Z;QturQH@^;nq9!W0&!vak^g(^#0!!VDH>vM?*hrhJ0;_D;0nA3-g^
zdtvl9%v9U|fZsEI6@CZ&UdQ@8!e`j;GuWoT1Abev(%v?Hk;<#p=_{Ez(EARov@FA?
z9+%N;M(Q#Wy|9*orzfhT3Fz~d^bv@L4a<?75H!jht&9>f<C7co-wFLY@b7hKGXD4X
z|0xTYpp73^f2;vmt6>EPN+4Eh%pk1v^21+fN_rHR9%iHm#3)V=F<7zEtu?x3LDRrA
zwMP5?clpn-0DVTsR9%VK=y#f$oVEEM5kvgu?l{`GE53A!e<Gw*RMMXR`@gJE0u;-6
ztk7f2W&TUfhcEJeEuX&syp~`4)sEwFCJ&qL<FtInzZU8v&_nyxj`NIbdV2n9`L$o|
zI4AWvvh(@>r+#k@Cw<CHw<<3)z0_a-TkJEr6_x+=_j&~R5_}M-t)eVw^xru_`~{oQ
z3s{~DHS_s}kNkY2M~UU>HD;wj(o1L4kVcn8WNX^r94nTx90cU+I$<Tf#$Y8sM-NMr
zZ(D$sN_ZZPPkt@{nPc%wey|^2{?1p1Vt~;UD}95GK3qc|K2ww&tYsrRKQdtOSrct5
zA07GllcKXGIyMk1KQ>M&S$szc?fxf=ulkd|ey86%y}3~h%i8s*f9j209gtSdBaJ@t
zF&?jj($|=alyP_fGoNjb#VfrN@z`%?q!lB_MC>1qy?0}KoS<lPSVr`8!Y-eiG&EW)
z^h2K+Z*#}rE&n#f-gdVC<nouJmc%{zHENP%tXRsZuh1)F)JNz%pM%x2572&EwBK9U
zrtt$UbUewUi$E-8GZE17)R$<i@w^(RH0o1b!CepZrHSBcBnTXVBirHkZuG{H_(VYw
z_Ryk@Q##`_67=B$Po1c5QJ<wR%F(Ap8?ydLUvH-GIMXlxOlBtXP~Lc~{5#Q2@zIJF
t_-l^OPBcT=9dRi@{kbF3={t)V*w+Ea(`QhdV}Cl*si(Jxg#X;-{{UCuKvDnz

literal 0
HcmV?d00001

diff --git a/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js b/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js
index 0107d253..83d7ec93 100644
--- a/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js
+++ b/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js
@@ -55,5 +55,19 @@ export default {
       method: 'post',
       data: params
     })
+  },
+  // 通过mainsid查询订单内的商品列表
+  listByMainSid: function(sid) {
+    return request({
+      baseURL:'/api/customer',
+      url: '/v1/purchaserequisitionpro/listByMainSid/' + sid
+    })
+  },
+  // 通过mainsid检查商品状态
+  checkByMainSid: function(sid) {
+    return request({
+      baseURL:'/api/customer',
+      url: '/v1/purchaserequisitionpro/checkByMainSid/' + sid
+    })
   }
 }
diff --git a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
index 274727fb..fd2d4030 100644
--- a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
+++ b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
@@ -6,6 +6,23 @@
       <div>{{ viewTitle }}</div>
       <!-- start 添加修改按钮 -->
       <div style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
+        <el-button type="text" @click="handleDownload"><span style="border-bottom: 1px solid blue">下载Excel示例表样</span></el-button>
+        <div style="margin-left: 10px;margin-right: 10px">
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            accept=".xls"
+            :action="updateAction"
+            :file-list="fileList"
+            :on-progress="handleProgress"
+            :on-success="handleSuccess"
+            :multiple="false"
+            :show-file-list="false"
+            :limit="1"
+          >
+            <el-button type="primary" size="small">上传采购订单excel文件</el-button>
+          </el-upload>
+        </div>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
       <!-- end 添加修改按钮 -->
@@ -13,123 +30,88 @@
     </div>
     <!-- 标题按钮部分结束 -->
     <!-- Start 新增修改部分 -->
-    <div class="listconadd" style="padding: 10px;">
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
-          <span>采购订单excel文件上传</span>
-          <el-button style="float: right; padding: 3px 0" type="text" @click="handleDownload">下载Excel示例表样</el-button>
-        </div>
-        <el-row>
-          <el-col :span="8">
-            <div>
-              <el-upload
-                ref="upload"
-                class="upload-demo"
-                accept=".xls"
-                :action="updateAction"
-                :before-upload="handleBeforeUpload"
-                :on-progress="handleProgress"
-                :on-success="handleSuccess"
-                :file-list="fileList"
-                :auto-upload="false"
-                :multiple="false"
-                :limit="1"
-              >
-                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-              </el-upload>
-            </div>
-          </el-col>
-          <el-col :span="16">
-            <div>上传采购订单的Excel文件，文件名以订单号开头，类似《90002303240037石家庄朋硕家居用品有限公司.xls》。</div>
-          </el-col>
-        </el-row>
-      </el-card>
+    <div class="listconadd" style="padding: 20px;">
       <el-collapse v-model="collOrderInfoActiveNames">
         <el-collapse-item title="订单详情" name="1">
-          <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
+          <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd" style="padding: 0px;">
             <div class="title">
               <div>采购订单信息</div>
             </div>
             <el-row>
-              <el-col :span="4" class="tleftb"><span>订单编号</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>订单编号</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
                   <span>{{ formobj.code }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="4" class="tleftb"><span>填单人</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>填单人</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
                   <span>{{ formobj.buyerName }}</span>
                 </el-form-item>
               </el-col>
+              <el-col :span="3" class="tleftb"><span>填单时间</span></el-col>
+              <el-col :span="5" class="trightb">
+                <el-form-item>
+                  <span>{{ formobj.purchaseDate }}</span>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
-              <el-col :span="4" class="tleftb"><span>供货单位</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>供货单位</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
                   <span>{{ formobj.supplierName }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="4" class="tleftb"><span>仓位</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>仓位</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
                   <span>{{ formobj.warehousePosition }}</span>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4" class="tleftb"><span>采购员</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>到货日期</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
-                  <span>{{ formobj.buyerName }}</span>
+                  <span>{{ formobj.arrivalDate }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="4" class="tleftb"><span>入库单位</span></el-col>
-              <el-col :span="8" class="trightb">
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="tleftb"><span>采购员</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
-                  <span>{{ formobj.purchasingDeptName }}</span>
+                  <span>{{ formobj.buyerName }}</span>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4" class="tleftb"><span>要货单位</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>入库单位</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
                   <span>{{ formobj.purchasingDeptName }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="4" class="tleftb"><span>入库仓位</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>单据到效期</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
-                  <span>{{ formobj.warehousePosition }}</span>
+                  <span>{{ formobj.expiryDate }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="4" class="tleftb"><span>填单日期</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>要货单位</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
-                  <span>{{ formobj.purchaseDate }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4" class="tleftb"><span>到货日期</span></el-col>
-              <el-col :span="8" class="trightb">
-                <el-form-item>
-                  <span>{{ formobj.arrivalDate }}</span>
+                  <span>{{ formobj.purchasingDeptName }}</span>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4" class="tleftb"><span>单据到效期</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>入库仓位</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
-                  <span>{{ formobj.expiryDate }}</span>
+                  <span>{{ formobj.warehousePosition }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="4" class="tleftb"><span>完成状态</span></el-col>
-              <el-col :span="8" class="trightb">
+              <el-col :span="3" class="tleftb"><span>完成状态</span></el-col>
+              <el-col :span="5" class="trightb">
                 <el-form-item>
                   <span>{{ formobj.completionStatus }}</span>
                 </el-form-item>
@@ -142,108 +124,17 @@
                 <span>合计金额:{{ amountInTotal }}</span>
               </div>
             </div>
-            <el-table :key="tableKey" :data="formobj.pros" :index="index" border style="width: 100%">
-              <el-table-column fixed label="序号" width="80px" type="index" :index="index + 1" align="center" />
-              <el-table-column fixed label="操作" width="100px" align="center" header-align="center">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="danger" @click="dataDelete(scope.$index)">删除</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column label="商品代码" align="center" width="200">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.proCode }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="商品名称" align="center" width="200">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.proName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="规格型号" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.content }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="数量" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.number }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="包装数量" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.packageNumber }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="包内数量" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.packageInsideNumber }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="包装规格" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.packageSpec }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="单位" align="center" width="200">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.unit }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="包装价格(元)" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.packagePrice }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="包合计(元)" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.packageTotalPrice }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="单价(元)" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.unitPrice }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="含税单价(元)" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.unitPriceTax }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="合计(元)" align="center" width="120">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.totalPrice }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="商品品类名称" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.category }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="商品品类编码" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.categoryKey }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="品牌名称" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.brand }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="品牌编码" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.brandCode }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="发货日期" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issuanceDate }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="零售金额" align="center" width="150">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.retailAmount }}</span>
-                </template>
-              </el-table-column>
+            <el-table :data="prolist" :index="index" border style="width: 100%">
+              <el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
+              <el-table-column label="商品代码" align="center" width="100" prop="proCode" />
+              <el-table-column label="商品名称" align="center" prop="proName" />
+              <el-table-column label="品类编码" align="center" width="100" prop="categoryKey" />
+              <el-table-column label="品类名称" align="center" width="100" prop="category" />
+              <el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
+              <el-table-column label="品牌名称" align="center" width="100" prop="brand" />
+              <el-table-column label="合计(元)" align="center" width="150" prop="totalPrice" />
+              <el-table-column label="数量" align="center" width="100" prop="number" />
+              <el-table-column label="包装规格" align="center" width="150" prop="packageSpec" />
             </el-table>
           </el-form>
         </el-collapse-item>
@@ -274,6 +165,7 @@
 
 <script>
   import req from '@/api/supervise/purchaserequisition'
+  import reqPro from '@/api/supervise/purchaserequisitionpro'
   export default {
     name: 'PurchaserequisitionUploadxlsx',
     data() {
@@ -312,6 +204,7 @@
           completionStatusKey: '', // 完成状态key
           pros: [] // 采购商品明细列表
         },
+        prolist: [],
         rules: {}
       }
     },
@@ -349,16 +242,6 @@
         this.$router.go(-1)
         // this.$emit('doback')
       },
-      handleBeforeUpload(file) {
-        console.log('handleBeforeUpload', file)
-        // req.checkCodeByFileName(file.name).then(res => {
-        //   console.log('eeee', res)
-        //   return false
-        // })
-      },
-      submitUpload() {
-        this.$refs.upload.submit()
-      },
       handleProgress(event, file, fileList) {
         // this.progressFlag = true; // 显示进度条
         // this.loadProgress = parseInt(event.percent); // 动态获取文件上传进度
@@ -378,38 +261,38 @@
         //   _this.fullscreenloading.text = '上传完成，正在导入数据库'
         // }
       },
-      handleSuccess(resp, file, fileList) {
-        // if (this.fullscreenloading) this.fullscreenloading.close()
-        // this.fullscreenloading = null
-        console.log('222', resp)
-        // const rdata = resp.data
-        // const _this = this
-        // _this.fullscreenloading.text = '数据导入完成，进行汇总'
-        // _this.uploadResultMesssage = '共导入数据：' + rdata.allNum + ' 条；符合监管条件的数据：' + rdata.validNum + ' 条；用时：' + rdata.durations + ' 毫秒。'
+      // handleSuccess(resp, file, fileList) {
+      //   // if (this.fullscreenloading) this.fullscreenloading.close()
+      //   // this.fullscreenloading = null
+      //   console.log('222', resp)
+      //   // const rdata = resp.data
+      //   // const _this = this
+      //   // _this.fullscreenloading.text = '数据导入完成，进行汇总'
+      //   // _this.uploadResultMesssage = '共导入数据：' + rdata.allNum + ' 条；符合监管条件的数据：' + rdata.validNum + ' 条；用时：' + rdata.durations + ' 毫秒。'
 
-        // kchz()
-        //   .then(res => {
-        //     if (this.fullscreenloading) this.fullscreenloading.close()
-        //     this.fullscreenloading = null
-        //     console.log('333', res)
-        //     _this.hzFilePath = res.data
-        //   })
-        //   .catch(e => {
-        //     if (this.fullscreenloading) this.fullscreenloading.close()
-        //     this.fullscreenloading = null
-        //   })
-        // // kchzyc()
-        // //   .then(res => {
-        // //     if (this.fullscreenloading) this.fullscreenloading.close()
-        // //     this.fullscreenloading = null
-        // //     console.log('444', res)
-        // //     _this.ychzFilePath = res.data
-        // //   })
-        // //   .catch(e => {
-        // //     if (this.fullscreenloading) this.fullscreenloading.close()
-        // //     this.fullscreenloading = null
-        // //   })
-      },
+      //   // kchz()
+      //   //   .then(res => {
+      //   //     if (this.fullscreenloading) this.fullscreenloading.close()
+      //   //     this.fullscreenloading = null
+      //   //     console.log('333', res)
+      //   //     _this.hzFilePath = res.data
+      //   //   })
+      //   //   .catch(e => {
+      //   //     if (this.fullscreenloading) this.fullscreenloading.close()
+      //   //     this.fullscreenloading = null
+      //   //   })
+      //   // // kchzyc()
+      //   // //   .then(res => {
+      //   // //     if (this.fullscreenloading) this.fullscreenloading.close()
+      //   // //     this.fullscreenloading = null
+      //   // //     console.log('444', res)
+      //   // //     _this.ychzFilePath = res.data
+      //   // //   })
+      //   // //   .catch(e => {
+      //   // //     if (this.fullscreenloading) this.fullscreenloading.close()
+      //   // //     this.fullscreenloading = null
+      //   // //   })
+      // },
       showAdd() {
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
@@ -451,6 +334,7 @@
         window.location.href = process.env.VUE_APP_BASE_API + '/v1/purchaserequisition/yb'
       },
       handleSuccess(resp, file, fileList) {
+        this.fileList = []
         if (resp.success) {
           this.$message({
             showClose: true,
@@ -458,21 +342,8 @@
             message: '导入成功'
           })
           this.formobj = resp.data
-          if (this.formobj.pros.length > 0) {
-            this.totalQuantity = this.formobj.pros.length
-            var aa = 0
-            for (var i = 0; i < this.formobj.pros.length; i++) {
-              if (this.formobj.pros[i].totalPrice !== '') {
-                aa = parseFloat(aa) + parseFloat(this.formobj.pros[i].totalPrice)
-              }
-            }
-            this.amountInTotal = aa
-          }
-
-          console.log(',,1111', this.formobj.code)
-          if (this.formobj.code) {
-            this.candownload = false
-          }
+          this.loadProList()
+          this.checkPro()
         } else {
           this.$message({
             showClose: true,
@@ -481,6 +352,36 @@
           })
         }
       },
+      loadProList() {
+        if (this.formobj.sid) {
+          reqPro.listByMainSid(this.formobj.sid).then(resp => {
+            this.prolist = resp.data
+            this.totalQuantity = this.prolist.length
+            var aa = 0
+            for (var i = 0; i < this.prolist.length; i++) {
+              if (this.prolist[i].totalPrice !== '') {
+                aa = parseFloat(aa) + parseFloat(this.prolist[i].totalPrice)
+              }
+            }
+            this.amountInTotal = aa
+          })
+        }
+      },
+      checkPro() {
+        if (this.formobj.sid) {
+          reqPro.checkByMainSid(this.formobj.sid).then(resp => {
+            this.prolist = resp.data
+            this.totalQuantity = this.prolist.length
+            var aa = 0
+            for (var i = 0; i < this.prolist.length; i++) {
+              if (this.prolist[i].totalPrice !== '') {
+                aa = parseFloat(aa) + parseFloat(this.prolist[i].totalPrice)
+              }
+            }
+            this.amountInTotal = aa
+          })
+        }
+      },
       dataDelete(index) {
         const tip = '请确认是否删除所选记录?'
         this.$confirm(tip, '提示', {
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
index 1e398463..4312268b 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
@@ -56,4 +56,17 @@ public class PurchaseRequisition extends BaseEntity {
     private String completionStatus;//完成状态
     @ApiModelProperty("完成状态")
     private String completionStatusKey;//完成状态
+
+
+    @ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState = "0";
+
+    @ApiModelProperty("监管审批意见")
+    private String purchaseRemarks;
+
+    @ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState = "0"; // 银行0未审核，1审核通过，2审核不通过',
+
+    @ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见',
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java
index 4755f0c5..514dfd43 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java
@@ -58,4 +58,10 @@ public class PurchaseRequisitionPro extends BaseEntity {
     private String secondCode;// 第二代码
     @ApiModelProperty("零售金额")
     private String retailAmount;// 零售金额
+    @ApiModelProperty("含税金额")
+    private Double taxInclusiveAmount;// 含税金额
+    @ApiModelProperty("配货金额")
+    private Double distributionAmount;// 配货金额
+    @ApiModelProperty("订单编号")
+    private String preqCode;// 订单编号
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
index dfbaa25b..3ed05adf 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
@@ -133,9 +134,30 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
             e.printStackTrace();
             return rb.setMsg("读取Excel文件异常：" + e.getMessage());
         }
-        baseMapper.insert(pr);
-        purchaseRequisitionProService.saveBatch(proList);
-        return rb.success().setData(pr);
+
+        boolean canInsert = checkOrderAndDelete(pr);
+        if (canInsert) {
+            baseMapper.insert(pr);
+            purchaseRequisitionProService.saveBatch(proList);
+            return rb.success().setData(pr);
+        }
+        return rb.setMsg("该订单号已经审核过，不可修改。");
+    }
+
+    private boolean checkOrderAndDelete(PurchaseRequisition pr) {
+        String code = pr.getCode();
+        if (StringUtils.isBlank(code)) {
+            return false;
+        }
+        PurchaseRequisition ppr = this.fetchByCode(code);
+        if (ppr == null)
+            return true;
+        if ("0".equals(ppr.getPurchaseState()) && "0".equals(ppr.getBankState())) {
+            purchaseRequisitionProService.deletebyMainSid(ppr.getSid());
+            this.deleteBySid(ppr.getSid());
+            return true;
+        }
+        return false;
     }
 
     private ReadListener<Map<Integer, String>> createReadListener(PurchaseRequisition pr, List<PurchaseRequisitionPro> proList) {
@@ -172,6 +194,7 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
             private void addPro(Map<Integer, String> map) {
                 PurchaseRequisitionPro prp = new PurchaseRequisitionPro();
                 prp.setMainSid(pr.getSid());
+                prp.setPreqCode(pr.getCode());
                 String hsje = "";//含税金额
                 prp.setProCode(map.get(1));
                 // prp.setCategory(productInformation.getCategory());
@@ -180,134 +203,56 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                 // prp.setBrandCode(productInformation.getBrandSid());
                 prp.setContent("code");//规格型号
                 prp.setProName(map.get(2));
-prp.setNumber(map.get(3));
-prp.setPackageSpec(map.get(4));
+                prp.setNumber(map.get(3));
+                prp.setPackageSpec(map.get(4));
                 prp.setPackageNumber(map.get(5));
+                hsje = map.get(7);
+                Double d = 0.0;
+                try {
+                    d = Double.valueOf(hsje);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                prp.setTaxInclusiveAmount(d);
+                prp.setSecondCode(map.get(10));
+                prp.setUnit(map.get(11));
+                prp.setRetailAmount(map.get(12));
+                String s15 = map.get(15);
+                Double distributionAmount = 0.0;
+                try {
+                    distributionAmount = Double.valueOf(s15);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                prp.setDistributionAmount(distributionAmount);
+                prp.setPackagePrice(map.get(34)); //包装价格（元）
+                prp.setPackageTotalPrice(map.get(37));//包合计（元）
+                String value = map.get(51);
+                String[] split = value.split("\\[");
+                String v = split[0];//类别value
+                String key = split[1].replace("]", "");//key
+                prp.setCategory(v);
+                prp.setCategoryKey(key);
+
+                prp.setPackageNumber(map.get(53));
+                prp.setPackageInsideNumber(map.get(53));
+                BigDecimal v3 = new BigDecimal(map.get(53));//包内数量  规格
+                String packagePrice = prp.getPackagePrice();//包装价格
+                BigDecimal v4 = new BigDecimal(packagePrice);
+                BigDecimal divide = v4.divide(v3, 2, BigDecimal.ROUND_HALF_UP);//单价
+                String number = prp.getNumber();//数量
+                BigDecimal v5 = new BigDecimal(number);
+                BigDecimal v6 = divide.multiply(v5);//订货总金额
+                String packageInsideNumber = prp.getPackageInsideNumber();
+                BigDecimal vv = new BigDecimal(packagePrice).divide(new BigDecimal(packageInsideNumber), 2, BigDecimal.ROUND_HALF_UP);
+                prp.setUnitPrice(vv.toString());
+                BigDecimal bigDecimal = new BigDecimal(hsje);
+                BigDecimal v10 = bigDecimal.divide(new BigDecimal(map.get(53)), 2, BigDecimal.ROUND_HALF_UP);
+                prp.setUnitPriceTax(v10.toString());
+                prp.setTotalPrice(v6.toString());
 
-//                             if (i == 7) {//含税单价（元）
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if(StringUtils.isBlank(prp.getProCode())){
-//                                    continue;
-//                                }
-//                             if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                 hsje=	brandIdHSSFCell.getStringCellValue();
-//                                }
-//                            }
+                prp.setRetailAmount(map.get(54));
 
-//                            if (i == 10) {//第二代码
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value = brandIdHSSFCell.getStringCellValue();
-//                                    prp.setSecondCode(value);
-//                                }
-//                            }
-//                            if (i == 53) {//包内数量  对应采购订单的规格
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    prp.setPackageNumber(value);
-//                                    prp.setPackageInsideNumber(value);
-//                                    BigDecimal v3 = new BigDecimal(value);//包内数量  规格
-//                                    String packagePrice = prp.getPackagePrice();//包装价格
-//                                    BigDecimal v4 = new BigDecimal(packagePrice);
-//                                    BigDecimal divide = v4.divide(v3, 2,BigDecimal.ROUND_HALF_UP);//单价
-//                                    String number = prp.getNumber();//数量
-//                                    BigDecimal v5 = new BigDecimal(number);
-//                                    BigDecimal v6 = divide .multiply( v5);//订货总金额
-//                                    String packageInsideNumber = prp.getPackageInsideNumber();
-//                                    BigDecimal v = new BigDecimal(packagePrice).divide(new BigDecimal(packageInsideNumber),2,BigDecimal.ROUND_HALF_UP);
-//                                    prp.setUnitPrice(v.toString());
-//                                    BigDecimal bigDecimal = new BigDecimal(hsje);
-//                                    BigDecimal v10 = bigDecimal.divide(new BigDecimal(value),2,BigDecimal.ROUND_HALF_UP);
-//                                    prp.setUnitPriceTax(v10.toString());
-//                                    prp.setTotalPrice(v6.toString());
-//                                    ProductInformationVo productInformationVo = productInformationService.selectByCode(prp.getProCode());
-//                                    productInformationVo.setNewestPurchasePrice(divide.toString());
-//                                    BigDecimal v122 = new BigDecimal(packagePrice).divide(new BigDecimal(prp.getPackageNumber()),2,BigDecimal.ROUND_HALF_UP);
-//                                    productInformationVo.setLatestPurchasePrice(v122.toString());
-//                                    ProductInformation pif=new ProductInformation();
-//                                    BeanUtil.copyProperties(productInformationVo,pif);
-//                                    productInformationService.updateById(pif);
-//                                }
-//
-//                                if(StringUtils.isNotBlank(p.getCode())){
-//                                    p.setBrandSid("supervise");
-//                                    p.setBrand("监管");
-//                                    String categoryKey = prp.getCategoryKey();
-//                                    DictCommonDetailsVo category = dictCommonService.fetchByKeyAndType(categoryKey, "category");
-//                                    if(category==null){
-//                                        category=new DictCommonDetailsVo();
-//                                        category.setDictKey(categoryKey);
-//                                        category.setDictValue(prp.getCategory());
-//                                        category.setDictType("category");
-//                                        DictCommon dictCommon = new DictCommon();
-//                                        BeanUtil.copyProperties(category,dictCommon);
-//                                        dictCommonService.insert(dictCommon);
-//                                    }
-//                                    p.setCategoryKey(category.getDictKey());
-//                                    p.setCategory(category.getDictValue());
-//                                    productInformationService.insert(p);
-//                                }
-//                            }
-//                            if (i == 11) {//单位
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    prp.setUnit(value);
-//                                    p.setUnit(value);
-//                                }
-//                            }
-//                            if (i == 34) {//包装价格（元）
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    prp.setPackagePrice(value);
-//                                   // prp.setPackageInsideNumber(i1+"");
-//
-//                                }
-//                            }
-//                            if (i == 37) {//包合计（元）
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    prp.setPackageTotalPrice(value);
-//                                    //latestPurchasePrice
-//                                }
-//                            }
-//
-//                            if (i == 54) {//零售金额
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    prp.setRetailAmount(value);
-//                                }
-//                            }
-//                            if (i == 51) {//品类
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    String[] split = value.split("\\[");
-//                                    String v = split[0];//类别value
-//                                    String key=split[1].replace("]","");//key
-//                                    prp.setCategory(v);
-//                                    prp.setCategoryKey(key);
-//                                }
-//                            }
-//                            if (i == 12) {//配货价格
-//                                brandIdHSSFCell.setCellType(CellType.STRING);
-//                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-//                                    String value=	brandIdHSSFCell.getStringCellValue();
-//                                    prp.setRetailAmount(value);
-//                                }
-//                            }
-//
-//                        }else{
-//                            System.err.println("rowNum="+rowNum+",i="+i+",value=null");
-//                        }
-//                    }
-//                    if(StringUtils.isNotBlank(prp.getProCode())){
-//                        prps.add(prp);
-//                    }
                 proList.add(prp);
             }
 
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java
index f976f207..8b46761d 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java
@@ -7,19 +7,13 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProFeign;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProQuery;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.*;
 import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -37,6 +31,7 @@ import java.util.List;
 public class PurchaseRequisitionProRest implements PurchaseRequisitionProFeign {
     @Autowired
     PurchaseRequisitionProService purchaseRequisitionProService;
+
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<PurchaseRequisitionProVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionProQuery> pq) {
@@ -44,15 +39,16 @@ public class PurchaseRequisitionProRest implements PurchaseRequisitionProFeign {
         PagerVo<PurchaseRequisitionProVo> pv = purchaseRequisitionProService.listPageVo(pq);
         return rb.success().setData(pv);
     }
+
     @PostMapping("/exportExcel")
     @ApiOperation(value = "采购订单商品导出")
     public void exportExcel(@RequestBody PagerQuery<PurchaseRequisitionProQuery> pq, HttpServletResponse response) throws IOException {
         //得到所有要导出的数据
         List<PurchaseRequisitionProExcelVo> excelVos = purchaseRequisitionProService.exportExcel(pq);
         String fileName = "采购订单商品" + System.currentTimeMillis() + ".xlsx";
-        response.setContentType( "application/vnd.ms-excel");
+        response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf8");
-        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName);
         // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
         // 如果这里想使用03 则 传入excelType参数即可
         ServletOutputStream outputStream = response.getOutputStream();
@@ -60,4 +56,20 @@ public class PurchaseRequisitionProRest implements PurchaseRequisitionProFeign {
         outputStream.flush();
         outputStream.close();
     }
+
+    @ApiOperation("通过订单sid查询订单内的商品列表")
+    @GetMapping("/listByMainSid/{mainsid}")
+    public ResultBean<List<PurchaseRequisitionPro>> listByMainSid(@PathVariable("mainsid") String mainsid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<PurchaseRequisitionPro> list = purchaseRequisitionProService.listByMainSid(mainsid);
+        return rb.success().setData(list);
+    }
+
+    @ApiOperation("通过mainsid检查商品状态")
+    @GetMapping("/checkByMainSid/{mainsid}")
+    public ResultBean<List<PurchaseRequisitionPro>> checkByMainSid(@PathVariable("mainsid") String mainsid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> list = purchaseRequisitionProService.checkByMainSid(mainsid);
+        return rb.success().setData(list);
+    }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
index 08e66e79..185dcc3a 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
@@ -5,22 +5,31 @@ 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.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
 import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo;
 import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProQuery;
 import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo;
+import com.yxt.supervise.customer.biz.productinformation.ProductInformationService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author wangpengfei
  * @date 2023/3/30 15:49
  */
 @Service
-public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRequisitionProMapper,PurchaseRequisitionPro> {
+public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRequisitionProMapper, PurchaseRequisitionPro> {
+
+    @Autowired
+    private ProductInformationService productInformationService;
+
     public PagerVo<PurchaseRequisitionProVo> listPageVo(PagerQuery<PurchaseRequisitionProQuery> pq) {
         PurchaseRequisitionProQuery query = pq.getParams();
         QueryWrapper<PurchaseRequisitionPro> qw = new QueryWrapper<>();
@@ -55,6 +64,7 @@ public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRe
         PagerVo<PurchaseRequisitionProVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
     public List<PurchaseRequisitionProExcelVo> exportExcel(PagerQuery<PurchaseRequisitionProQuery> pq) {
         PurchaseRequisitionProQuery query = pq.getParams();
         QueryWrapper<PurchaseRequisitionPro> qw = new QueryWrapper<>();
@@ -87,4 +97,20 @@ public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRe
         List<PurchaseRequisitionProExcelVo> pagging = baseMapper.exportExcel(qw);
         return pagging;
     }
+
+    public void deletebyMainSid(String mainSid) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("mainSid", mainSid);
+        baseMapper.deleteByMap(map);
+    }
+
+    public List<PurchaseRequisitionPro> listByMainSid(String mainsid) {
+        QueryWrapper<PurchaseRequisitionPro> qw = new QueryWrapper<>();
+        qw.eq("mainSid", mainsid);
+        return baseMapper.selectList(qw);
+    }
+
+    public List<String> checkByMainSid(String mainsid) {
+        return null;
+    }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
index ea660ca7..f4486602 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
@@ -2,8 +2,8 @@ spring:
   application:
     name: supervise-customer
   profiles:
-#    active: devv
-    active: test
+    active: devv
+#    active: test
   messages:
     # 国际化资源文件路径
     basename: i18n/messages

From b4a54d72df0d1bbafcca016f386bfc1147e07036 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Thu, 6 Apr 2023 18:25:57 +0800
Subject: [PATCH 10/23] 11111

---
 .../src/api/supervise/purchaserequisition.js  |   7 ++
 .../purchaserequisition/uploadxlsx/index.vue  |  27 +++--
 .../PurchaseRequisition.java                  |   2 +
 .../PurchaseRequisitionProCheckVo.java        | 111 ++++++++++++++++++
 .../PurchaseRequisitionCheckVo.java           |  77 ++++++++++++
 .../ProductInformationService.java            |   9 ++
 .../PurchaseRequisitionRest.java              |  19 ++-
 .../PurchaseRequisitionService.java           |   5 +-
 .../PurchaseRequisitionProRest.java           |   2 +-
 .../PurchaseRequisitionProService.java        |  74 +++++++++++-
 .../RestrictedBrandService.java               |  10 ++
 .../RestrictedCategoryService.java            |  23 ++--
 .../SupplierBankInfoService.java              |  19 +++
 13 files changed, 352 insertions(+), 33 deletions(-)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java

diff --git a/supervise-customer-ui/src/api/supervise/purchaserequisition.js b/supervise-customer-ui/src/api/supervise/purchaserequisition.js
index 130dad8d..3c6769e8 100644
--- a/supervise-customer-ui/src/api/supervise/purchaserequisition.js
+++ b/supervise-customer-ui/src/api/supervise/purchaserequisition.js
@@ -55,5 +55,12 @@ export default {
       method: 'post',
       data: params
     })
+  },
+  // 检测供应商信息状态
+  checkSupplier: function(sid) {
+    return request({
+      baseURL:'/api/customer',
+      url: '/v1/purchaserequisition/checkSupplier/' + sid
+    })
   }
 }
diff --git a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
index fd2d4030..76df9abd 100644
--- a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
+++ b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
@@ -155,7 +155,20 @@
           <el-button style="float: right; padding: 3px 0" type="text" @click="handleDownload">重新检测</el-button>
         </div>
         <div>
-          商品信息检测
+          <div v-if="proChecklist.length>0">
+            <el-table :data="proChecklist" :index="index" border style="width: 100%">
+              <el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
+              <el-table-column label="商品代码" align="center" width="100" prop="productCode" />
+              <el-table-column label="商品名称" align="center" prop="productName" />
+              <el-table-column label="品类编码" align="center" width="100" prop="categoryCode" />
+              <el-table-column label="品类名称" align="center" width="100" prop="categoryName" />
+              <el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
+              <el-table-column label="品牌名称" align="center" width="100" prop="brandName" />
+              <el-table-column label="状态" align="center" width="150" prop="resState" />
+              <el-table-column label="检测结果" align="center" width="100" prop="msg" />
+            </el-table>
+          </div>
+          <div v-else> <el-alert title="所有商品信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
         </div>
       </el-card>
     </div>
@@ -205,6 +218,7 @@
           pros: [] // 采购商品明细列表
         },
         prolist: [],
+        proChecklist: [],
         rules: {}
       }
     },
@@ -370,15 +384,8 @@
       checkPro() {
         if (this.formobj.sid) {
           reqPro.checkByMainSid(this.formobj.sid).then(resp => {
-            this.prolist = resp.data
-            this.totalQuantity = this.prolist.length
-            var aa = 0
-            for (var i = 0; i < this.prolist.length; i++) {
-              if (this.prolist[i].totalPrice !== '') {
-                aa = parseFloat(aa) + parseFloat(this.prolist[i].totalPrice)
-              }
-            }
-            this.amountInTotal = aa
+            this.proChecklist = resp.data
+            this.loadProList()
           })
         }
       },
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
index 4312268b..972ad7f1 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
@@ -38,6 +38,8 @@ public class PurchaseRequisition extends BaseEntity {
     private String supplierName; // 供应商名称
     @ApiModelProperty("供应商编码")
     private String supplierCode; // 供应商编码
+    @ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商编码
     @ApiModelProperty("物流公司名称")
     private String logisticsCompanyName; // 物流公司名称
     @ApiModelProperty("物流公司编码")
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java
new file mode 100644
index 00000000..1c5c03b4
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java
@@ -0,0 +1,111 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+import com.yxt.common.core.vo.Vo;
+
+public class PurchaseRequisitionProCheckVo implements Vo {
+    public PurchaseRequisitionProCheckVo() {
+    }
+
+    public PurchaseRequisitionProCheckVo(int resState) {
+        this.resState = resState;
+    }
+
+    public PurchaseRequisitionProCheckVo(String prSid, String prCode, String productCode, String productName, int resState) {
+        this.prSid = prSid;
+        this.prCode = prCode;
+        this.productCode = productCode;
+        this.productName = productName;
+        this.resState = resState;
+    }
+
+    private String prSid;
+    private String prCode;
+    private String productCode;
+    private String productName;
+    private String brandName;
+    private String brandCode;
+    private String categoryName;
+    private String categoryCode;
+    private int resState = 0; // 0=正常；1=商品不存在；2=品牌不符；3=品类不符
+    private String msg;
+
+    public String getPrSid() {
+        return prSid;
+    }
+
+    public void setPrSid(String prSid) {
+        this.prSid = prSid;
+    }
+
+    public String getPrCode() {
+        return prCode;
+    }
+
+    public void setPrCode(String prCode) {
+        this.prCode = prCode;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+
+    public String getBrandCode() {
+        return brandCode;
+    }
+
+    public void setBrandCode(String brandCode) {
+        this.brandCode = brandCode;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public String getCategoryCode() {
+        return categoryCode;
+    }
+
+    public void setCategoryCode(String categoryCode) {
+        this.categoryCode = categoryCode;
+    }
+
+    public int getResState() {
+        return resState;
+    }
+
+    public void setResState(int resState) {
+        this.resState = resState;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
new file mode 100644
index 00000000..88923fe4
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
@@ -0,0 +1,77 @@
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+public class PurchaseRequisitionCheckVo {
+    public PurchaseRequisitionCheckVo() {
+    }
+
+    public PurchaseRequisitionCheckVo(String prSid, String prCode, int resState) {
+        this.prSid = prSid;
+        this.prCode = prCode;
+        this.resState = resState;
+    }
+
+    private String prSid;
+    private String prCode;
+    private String supplierCode;
+    private String supplierName;
+    private String supplierCodeUnified;
+
+    private int resState = 0; // 0=正常；1=无供应商信息；2=供应商编码不符；3=有在途
+    private String msg;
+
+    public String getPrSid() {
+        return prSid;
+    }
+
+    public void setPrSid(String prSid) {
+        this.prSid = prSid;
+    }
+
+    public String getPrCode() {
+        return prCode;
+    }
+
+    public void setPrCode(String prCode) {
+        this.prCode = prCode;
+    }
+
+    public String getSupplierCode() {
+        return supplierCode;
+    }
+
+    public void setSupplierCode(String supplierCode) {
+        this.supplierCode = supplierCode;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierCodeUnified() {
+        return supplierCodeUnified;
+    }
+
+    public void setSupplierCodeUnified(String supplierCodeUnified) {
+        this.supplierCodeUnified = supplierCodeUnified;
+    }
+
+    public int getResState() {
+        return resState;
+    }
+
+    public void setResState(int resState) {
+        this.resState = resState;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java
index f530be20..ed63f76a 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationService.java
@@ -536,4 +536,13 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
     public ProductInformationVo limitJudgement(String code) {
         return baseMapper.limitJudgement(code);
     }
+
+    public ProductInformation fetchByCode(String proCode) {
+        QueryWrapper<ProductInformation> qw = new QueryWrapper<>();
+        qw.eq("code",proCode);
+        List<ProductInformation> list = baseMapper.selectList(qw);
+        if(list==null||list.isEmpty())
+            return null;
+        return list.get(0);
+    }
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
index 4185d05a..d22b068b 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
@@ -4,11 +4,10 @@ import com.alibaba.excel.EasyExcel;
 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.gdwholesalegd.GdWholesaleGdExcelVo;
-import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdQuery;
 import com.yxt.supervise.customer.api.purchaserequisition.*;
-import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandQuery;
-import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
+import com.yxt.supervise.customer.api.supplierbankinfo.PurchaseRequisitionCheckVo;
+import com.yxt.supervise.customer.biz.supplierbankinfo.SupplierBankInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +32,9 @@ import java.util.List;
 public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
 
     @Autowired
-    PurchaseRequisitionService purchaseRequisitionService;
+    private PurchaseRequisitionService purchaseRequisitionService;
+    @Autowired
+    private SupplierBankInfoService supplierBankInfoService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
@@ -79,4 +80,12 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
         log.debug("--checkCodeByFileName---{}", filename);
         return purchaseRequisitionService.checkCodeByFileName(filename);
     }
+
+    @ApiOperation("检测供应商信息状态")
+    @GetMapping("/checkSupplier/{sid}")
+    public ResultBean<List<PurchaseRequisitionPro>> checkSupplier(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<PurchaseRequisitionCheckVo> list = supplierBankInfoService.checkPurchaseRequisition(sid);
+        return rb.success().setData(list);
+    }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
index 3ed05adf..057fa0f4 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
@@ -12,10 +12,7 @@ import com.yxt.common.base.utils.PagerUtil;
 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.purchaserequisition.PurchaseRequisition;
-import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
-import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
-import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
+import com.yxt.supervise.customer.api.purchaserequisition.*;
 import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
 import com.yxt.supervise.customer.biz.purchaserequisitionpro.PurchaseRequisitionProService;
 import com.yxt.supervise.customer.tools.StrTool;
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java
index 8b46761d..5d9fd274 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java
@@ -69,7 +69,7 @@ public class PurchaseRequisitionProRest implements PurchaseRequisitionProFeign {
     @GetMapping("/checkByMainSid/{mainsid}")
     public ResultBean<List<PurchaseRequisitionPro>> checkByMainSid(@PathVariable("mainsid") String mainsid) {
         ResultBean rb = ResultBean.fireFail();
-        List<String> list = purchaseRequisitionProService.checkByMainSid(mainsid);
+        List<PurchaseRequisitionProCheckVo> list = purchaseRequisitionProService.checkByMainSid(mainsid);
         return rb.success().setData(list);
     }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
index 185dcc3a..1a027ca1 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
@@ -1,21 +1,25 @@
 package com.yxt.supervise.customer.biz.purchaserequisitionpro;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProQuery;
-import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo;
+import com.yxt.supervise.customer.api.productinformation.ProductInformation;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.*;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand;
+import com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategory;
 import com.yxt.supervise.customer.biz.productinformation.ProductInformationService;
+import com.yxt.supervise.customer.biz.restrictedbrand.RestrictedBrandService;
+import com.yxt.supervise.customer.biz.restrictedcategory.RestrictedCategoryService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +33,10 @@ public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRe
 
     @Autowired
     private ProductInformationService productInformationService;
+    @Autowired
+    private RestrictedCategoryService restrictedCategoryService;
+    @Autowired
+    private RestrictedBrandService restrictedBrandService;
 
     public PagerVo<PurchaseRequisitionProVo> listPageVo(PagerQuery<PurchaseRequisitionProQuery> pq) {
         PurchaseRequisitionProQuery query = pq.getParams();
@@ -110,7 +118,61 @@ public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRe
         return baseMapper.selectList(qw);
     }
 
-    public List<String> checkByMainSid(String mainsid) {
-        return null;
+    public List<PurchaseRequisitionProCheckVo> checkByMainSid(String mainsid) {
+        List<PurchaseRequisitionProCheckVo> voList = new ArrayList<>();
+        List<PurchaseRequisitionPro> prolist = this.listByMainSid(mainsid);
+        for (PurchaseRequisitionPro pro : prolist) {
+            String proCode = pro.getProCode();
+            String proName = pro.getProName();
+            String mainSid = pro.getMainSid();
+            String preqCode = pro.getPreqCode();
+            ProductInformation pi = productInformationService.fetchByCode(proCode);
+            if (pi == null) {
+                PurchaseRequisitionProCheckVo vo = new PurchaseRequisitionProCheckVo(mainSid, preqCode, proCode, proName, 1);
+                vo.setMsg("商品档案无此商品");
+                voList.add(vo);
+                continue;
+            }
+            String brand = pi.getBrand();
+            String brandSid = pi.getBrandSid();
+            String category = pi.getCategory();
+            String categoryKey = pi.getCategoryKey();
+
+            RestrictedBrand rb = restrictedBrandService.fetchByCode(brandSid);
+            if (rb == null) {
+                PurchaseRequisitionProCheckVo vo = new PurchaseRequisitionProCheckVo(mainSid, preqCode, proCode, proName, 2);
+                vo.setBrandCode(brandSid);
+                vo.setBrandName(brand);
+                vo.setCategoryCode(categoryKey);
+                vo.setCategoryName(category);
+                vo.setMsg("品牌【" + brand + "】不属于监管品牌");
+                voList.add(vo);
+            }
+            RestrictedCategory rc = restrictedCategoryService.fetchByCode(categoryKey);
+            if (rc == null) {
+                PurchaseRequisitionProCheckVo vo = new PurchaseRequisitionProCheckVo(mainSid, preqCode, proCode, proName, 3);
+                vo.setBrandCode(brandSid);
+                vo.setBrandName(brand);
+                vo.setCategoryCode(categoryKey);
+                vo.setCategoryName(category);
+                vo.setMsg("品类【" + category + "】不属于监管品类");
+                voList.add(vo);
+            }
+            String brandCode = pro.getBrandCode();
+            if (StringUtils.isBlank(brandCode)) {
+                this.updateBrandCateBySid(pro.getSid(), brandSid, brand, categoryKey, category);
+            }
+        }
+        return voList;
+    }
+
+    private void updateBrandCateBySid(String sid, String brandSid, String brand, String categoryKey, String category) {
+        UpdateWrapper<PurchaseRequisitionPro> uw = new UpdateWrapper<>();
+        uw.set("brandCode", brandSid);
+        uw.set("brand", brand);
+        uw.set("categoryKey", categoryKey);
+        uw.set("category", category);
+        uw.eq("sid", sid);
+        this.update(uw);
     }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java
index 318d2eae..47bc01af 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandService.java
@@ -181,4 +181,14 @@ public class RestrictedBrandService extends MybatisBaseService<RestrictedBrandMa
     public RestrictedBrand selectByBrands(String brandCode) {
         return baseMapper.selectByBrands(brandCode);
     }
+
+    public RestrictedBrand fetchByCode(String code) {
+        QueryWrapper<RestrictedBrand> qw = new QueryWrapper<>();
+        qw.eq("code", code);
+        List<RestrictedBrand> list = baseMapper.selectList(qw);
+        if (list == null || list.isEmpty())
+            return null;
+        return list.get(0);
+
+    }
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java
index 46f467b4..ac0c59db 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryService.java
@@ -164,13 +164,13 @@ public class RestrictedCategoryService extends MybatisBaseService<RestrictedCate
                                     pr.setCategorys(value);
                                 }
                             }
-							/*if (i == 2) {//名称
-								brandIdHSSFCell.setCellType(CellType.STRING);
-								if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-									String value = brandIdHSSFCell.getStringCellValue();
-									pr.setBrands(value);
-								}
-							}*/
+                            /*if (i == 2) {//名称
+                                brandIdHSSFCell.setCellType(CellType.STRING);
+                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                                    String value = brandIdHSSFCell.getStringCellValue();
+                                    pr.setBrands(value);
+                                }
+                            }*/
                         } else {
                             System.err.println("rowNum=" + rowNum + ",i=" + i + ",value=null");
                         }
@@ -192,6 +192,15 @@ public class RestrictedCategoryService extends MybatisBaseService<RestrictedCate
         //return message;
     }
 
+    public RestrictedCategory fetchByCode(String categoryKey) {
+        QueryWrapper<RestrictedCategory> qw = new QueryWrapper<>();
+        qw.eq("categoryKey", categoryKey);
+        List<RestrictedCategory> list = baseMapper.selectList(qw);
+        if (list == null || list.isEmpty())
+            return null;
+        return list.get(0);
+    }
+
   /*  public Map<String, String> limitJudgement(String categoryKey, String brandCode) {
         Map<String, String> result = new HashMap<>();
         RestrictedCategory r = baseMapper.selectByCategorys(categoryKey);
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
index a7603c3e..a70231f5 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
@@ -33,12 +33,15 @@ import com.yxt.common.base.utils.PagerUtil;
 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.purchaserequisition.PurchaseRequisition;
 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.purchaserequisition.PurchaseRequisitionService;
 import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService;
 import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -64,6 +67,9 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
 	@Resource
 	private SupplierIndexService supplierIndexService;
 
+	@Autowired
+	private PurchaseRequisitionService purchaseRequisitionService;
+
 	private QueryWrapper<SupplierBankInfo> createQueryWrapper(SupplierBankInfoQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -239,4 +245,17 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
 	public SupplierBankInfo selectByCode(String codeUnified) {
 		return baseMapper.selectByCode(codeUnified);
 	}
+
+    public List<PurchaseRequisitionCheckVo> checkPurchaseRequisition(String purchaseRequisitionSid) {
+		List<PurchaseRequisitionCheckVo> list = new ArrayList<>();
+		PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
+		if(pr==null)
+			return list;
+		String supplierCode = pr.getSupplierCode();
+		String supplierName = pr.getSupplierName();
+		String supplierOnlyCode = pr.getSupplierOnlyCode();
+
+
+		return list;
+    }
 }
\ No newline at end of file

From 4f36f54de61aed88e21c1286e3b258c9fab57d41 Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Thu, 6 Apr 2023 23:19:59 +0800
Subject: [PATCH 11/23] 11

---
 .../SupplierBankInfoService.java              | 379 +++++++++---------
 .../supplierindex/SupplierIndexService.java   |  10 +-
 2 files changed, 204 insertions(+), 185 deletions(-)

diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
index a70231f5..7a0e4eb9 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
@@ -36,6 +36,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
 import com.yxt.supervise.customer.api.supplierbankinfo.*;
 import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
+import com.yxt.supervise.customer.api.supplierindex.SupplierIndex;
 import com.yxt.supervise.customer.api.supplierindex.SupplierIndexQuery;
 import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService;
 import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService;
@@ -62,200 +63,212 @@ import java.util.*;
  */
 @Service
 public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfoMapper, SupplierBankInfo> {
-	@Resource
-	private SupplierContractInfoService supplierContractInfoService;
-	@Resource
-	private SupplierIndexService supplierIndexService;
+    @Resource
+    private SupplierContractInfoService supplierContractInfoService;
+    @Resource
+    private SupplierIndexService supplierIndexService;
 
-	@Autowired
-	private PurchaseRequisitionService purchaseRequisitionService;
+    @Autowired
+    private PurchaseRequisitionService purchaseRequisitionService;
 
-	private QueryWrapper<SupplierBankInfo> createQueryWrapper(SupplierBankInfoQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<SupplierBankInfo> qw = new QueryWrapper<>();
+    private QueryWrapper<SupplierBankInfo> createQueryWrapper(SupplierBankInfoQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SupplierBankInfo> qw = new QueryWrapper<>();
 
-		if (StringUtils.isNotBlank(query.getCodeUnified())) {
-			qw.like("codeUnified", query.getCodeUnified());
-		}
-		if (StringUtils.isNotBlank(query.getName())) {
-			qw.like("name", query.getName());
-		}
-		if (StringUtils.isNotBlank(query.getContacts())) {
-			qw.like("contacts", query.getContacts());
-		}
-		if (StringUtils.isNotBlank(query.getLegalRepresentative())) {
-			qw.like("legalRepresentative", query.getLegalRepresentative());
-		}
-		if (StringUtils.isNotBlank(query.getBusinessLicenseNo())) {
-			qw.like("businessLicenseNo", query.getBusinessLicenseNo());
-		}if (StringUtils.isNotBlank(query.getBankAccountNumber())) {
-			qw.like("bankAccountNumber", query.getBankAccountNumber());
-		}
-		return qw;
-	}
-	
-	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);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(SupplierBankInfoDto dto){
+        if (StringUtils.isNotBlank(query.getCodeUnified())) {
+            qw.like("codeUnified", query.getCodeUnified());
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("name", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getContacts())) {
+            qw.like("contacts", query.getContacts());
+        }
+        if (StringUtils.isNotBlank(query.getLegalRepresentative())) {
+            qw.like("legalRepresentative", query.getLegalRepresentative());
+        }
+        if (StringUtils.isNotBlank(query.getBusinessLicenseNo())) {
+            qw.like("businessLicenseNo", query.getBusinessLicenseNo());
+        }
+        if (StringUtils.isNotBlank(query.getBankAccountNumber())) {
+            qw.like("bankAccountNumber", query.getBankAccountNumber());
+        }
+        return qw;
+    }
+
+    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);
+        return p;
+    }
+
+    public void saveOrUpdateDto(SupplierBankInfoDto dto) {
         String dtoSid = dto.getSid();
-		if (StringUtils.isBlank(dtoSid)) {
+        if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-			return;
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(SupplierBankInfoDto dto){
-		SupplierBankInfo entity = new SupplierBankInfo();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-		List<String> codeIndex = dto.getCodeIndex();
-		baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),entity.getSid(),entity.getCodeUnified());
-		for (String index : codeIndex) {
-			if (!index.equals(entity.getCodeUnified())){
-				baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),entity.getSid(),index);
-			}
-		}
-		baseMapper.deleteSupplierFiles(entity.getSid(),"1");
-		String[] businessLicenseFiles = dto.getBusinessLicenseFiles();
-		if(businessLicenseFiles!=null){
-			List<Map<String,String>> maps=new ArrayList<>();
-			for(String s:businessLicenseFiles){
-				Map<String,String>m=new HashMap<>();
-				m.put("mainSid",entity.getSid());
-				m.put("url",s);
-				m.put("type","1");
-				m.put("sid", UUID.randomUUID().toString());
-				maps.add(m);
-			}
-			if(maps.size()>0){
-				baseMapper.insertSupplierFiles(maps);
-			}
-		}
-		baseMapper.deleteSupplierFiles(entity.getSid(),"2");
-		String[] contractFiles = dto.getContractInfo().getContractFiles();
-		if(contractFiles!=null){
-			List<Map<String,String>> maps=new ArrayList<>();
-			for(String s:contractFiles){
-				Map<String,String>m=new HashMap<>();
-				m.put("mainSid",entity.getSid());
-				m.put("url",s);
-				m.put("type","2");
-				m.put("sid", UUID.randomUUID().toString());
-				maps.add(m);
-			}
-			if(maps.size()>0){
-				baseMapper.insertSupplierFiles(maps);
-			}
-		}
-		SupplierContractInfoDto supplierContractInfoDto = dto.getContractInfo();
-		supplierContractInfoDto.setSupplierSid(entity.getSid());
-		supplierContractInfoService.saveOrUpdateDto(supplierContractInfoDto);
-	}
-	
-	public void updateByDto(SupplierBankInfoDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(SupplierBankInfoDto dto) {
+        SupplierBankInfo entity = new SupplierBankInfo();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        List<String> codeIndex = dto.getCodeIndex();
+        baseMapper.insertSUpplierIndex(entity.getName(), entity.getCodeUnified(), entity.getSid(), entity.getCodeUnified());
+        for (String index : codeIndex) {
+            if (!index.equals(entity.getCodeUnified())) {
+                baseMapper.insertSUpplierIndex(entity.getName(), entity.getCodeUnified(), entity.getSid(), index);
+            }
+        }
+        baseMapper.deleteSupplierFiles(entity.getSid(), "1");
+        String[] businessLicenseFiles = dto.getBusinessLicenseFiles();
+        if (businessLicenseFiles != null) {
+            List<Map<String, String>> maps = new ArrayList<>();
+            for (String s : businessLicenseFiles) {
+                Map<String, String> m = new HashMap<>();
+                m.put("mainSid", entity.getSid());
+                m.put("url", s);
+                m.put("type", "1");
+                m.put("sid", UUID.randomUUID().toString());
+                maps.add(m);
+            }
+            if (maps.size() > 0) {
+                baseMapper.insertSupplierFiles(maps);
+            }
+        }
+        baseMapper.deleteSupplierFiles(entity.getSid(), "2");
+        String[] contractFiles = dto.getContractInfo().getContractFiles();
+        if (contractFiles != null) {
+            List<Map<String, String>> maps = new ArrayList<>();
+            for (String s : contractFiles) {
+                Map<String, String> m = new HashMap<>();
+                m.put("mainSid", entity.getSid());
+                m.put("url", s);
+                m.put("type", "2");
+                m.put("sid", UUID.randomUUID().toString());
+                maps.add(m);
+            }
+            if (maps.size() > 0) {
+                baseMapper.insertSupplierFiles(maps);
+            }
+        }
+        SupplierContractInfoDto supplierContractInfoDto = dto.getContractInfo();
+        supplierContractInfoDto.setSupplierSid(entity.getSid());
+        supplierContractInfoService.saveOrUpdateDto(supplierContractInfoDto);
+    }
+
+    public void updateByDto(SupplierBankInfoDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		SupplierBankInfo entity = baseMapper.selectBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-		supplierIndexService.delByMainSid(dtoSid);
-		List<String> codeIndex = dto.getCodeIndex();
-		baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),dtoSid,entity.getCodeUnified());
-		for (String index : codeIndex) {
-			if (!index.equals(entity.getCodeUnified())){
-				baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),entity.getSid(),index);
-			}
-		}
-		baseMapper.deleteSupplierFiles(entity.getSid(),"1");
-		String[] businessLicenseFiles = dto.getBusinessLicenseFiles();
-		if(businessLicenseFiles!=null){
-			List<Map<String,String>> maps=new ArrayList<>();
-			for(String s:businessLicenseFiles){
-				Map<String,String>m=new HashMap<>();
-				m.put("mainSid",entity.getSid());
-				m.put("url",s);
-				m.put("type","1");
-				m.put("sid", UUID.randomUUID().toString());
-				maps.add(m);
-			}
-			baseMapper.insertSupplierFiles(maps);
-		}
-		baseMapper.deleteSupplierFiles(entity.getSid(),"2");
-		String[] contractFiles = dto.getContractInfo().getContractFiles();
-		if(contractFiles!=null){
-			List<Map<String,String>> maps=new ArrayList<>();
-			for(String s:contractFiles){
-				Map<String,String>m=new HashMap<>();
-				m.put("mainSid",entity.getSid());
-				m.put("url",s);
-				m.put("type","2");
-				m.put("sid", UUID.randomUUID().toString());
-				maps.add(m);
-			}
-			baseMapper.insertSupplierFiles(maps);
-		}
-		SupplierContractInfoDto supplierContractInfoDto = dto.getContractInfo();
-		supplierContractInfoDto.setSupplierSid(entity.getSid());
-		supplierContractInfoService.saveOrUpdateDto(supplierContractInfoDto);
-	}
-	public ResultBean delBySids(String sids) {
-		ResultBean<Object> resultBean = ResultBean.fireFail();
-		String[] split = sids.split(",");
-		int i= baseMapper.delBySids(split);
-		return  resultBean.success().setData("1");
-	}
-	public SupplierBankInfoDetailsVo fetchDetailsVoBySid(String sid){
-		SupplierBankInfo entity = baseMapper.selectBySid(sid);
-		SupplierBankInfoDetailsVo vo = new SupplierBankInfoDetailsVo();
-		SupplierContractInfoDto contractInfo = new SupplierContractInfoDto();
-		BeanUtil.copyProperties(entity, vo);
-		String s1=baseMapper.selectSupplierFiles(sid,"1");
-		if(StringUtils.isNotBlank(s1)){
-			vo.setBusinessLicenseFiles(s1.split(","));
-		}else{
-			vo.setBusinessLicenseFiles(new String[]{});
-		}
-		String s2=baseMapper.selectSupplierFiles(sid,"2");
-		if(StringUtils.isNotBlank(s2)){
-			contractInfo.setContractFiles(s2.split(","));
-			contractInfo.setContractFiles(s2.split(","));
-		}else{
-			contractInfo.setContractFiles(new String[]{});
-		}
-		vo.setContractInfo(contractInfo);
-		return vo;
-	}
+        }
+        SupplierBankInfo entity = baseMapper.selectBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        supplierIndexService.delByMainSid(dtoSid);
+        List<String> codeIndex = dto.getCodeIndex();
+        baseMapper.insertSUpplierIndex(entity.getName(), entity.getCodeUnified(), dtoSid, entity.getCodeUnified());
+        for (String index : codeIndex) {
+            if (!index.equals(entity.getCodeUnified())) {
+                baseMapper.insertSUpplierIndex(entity.getName(), entity.getCodeUnified(), entity.getSid(), index);
+            }
+        }
+        baseMapper.deleteSupplierFiles(entity.getSid(), "1");
+        String[] businessLicenseFiles = dto.getBusinessLicenseFiles();
+        if (businessLicenseFiles != null) {
+            List<Map<String, String>> maps = new ArrayList<>();
+            for (String s : businessLicenseFiles) {
+                Map<String, String> m = new HashMap<>();
+                m.put("mainSid", entity.getSid());
+                m.put("url", s);
+                m.put("type", "1");
+                m.put("sid", UUID.randomUUID().toString());
+                maps.add(m);
+            }
+            baseMapper.insertSupplierFiles(maps);
+        }
+        baseMapper.deleteSupplierFiles(entity.getSid(), "2");
+        String[] contractFiles = dto.getContractInfo().getContractFiles();
+        if (contractFiles != null) {
+            List<Map<String, String>> maps = new ArrayList<>();
+            for (String s : contractFiles) {
+                Map<String, String> m = new HashMap<>();
+                m.put("mainSid", entity.getSid());
+                m.put("url", s);
+                m.put("type", "2");
+                m.put("sid", UUID.randomUUID().toString());
+                maps.add(m);
+            }
+            baseMapper.insertSupplierFiles(maps);
+        }
+        SupplierContractInfoDto supplierContractInfoDto = dto.getContractInfo();
+        supplierContractInfoDto.setSupplierSid(entity.getSid());
+        supplierContractInfoService.saveOrUpdateDto(supplierContractInfoDto);
+    }
+
+    public ResultBean delBySids(String sids) {
+        ResultBean<Object> resultBean = ResultBean.fireFail();
+        String[] split = sids.split(",");
+        int i = baseMapper.delBySids(split);
+        return resultBean.success().setData("1");
+    }
 
-	public SupplierBankInfo selectByCode(String codeUnified) {
-		return baseMapper.selectByCode(codeUnified);
-	}
+    public SupplierBankInfoDetailsVo fetchDetailsVoBySid(String sid) {
+        SupplierBankInfo entity = baseMapper.selectBySid(sid);
+        SupplierBankInfoDetailsVo vo = new SupplierBankInfoDetailsVo();
+        SupplierContractInfoDto contractInfo = new SupplierContractInfoDto();
+        BeanUtil.copyProperties(entity, vo);
+        String s1 = baseMapper.selectSupplierFiles(sid, "1");
+        if (StringUtils.isNotBlank(s1)) {
+            vo.setBusinessLicenseFiles(s1.split(","));
+        } else {
+            vo.setBusinessLicenseFiles(new String[]{});
+        }
+        String s2 = baseMapper.selectSupplierFiles(sid, "2");
+        if (StringUtils.isNotBlank(s2)) {
+            contractInfo.setContractFiles(s2.split(","));
+            contractInfo.setContractFiles(s2.split(","));
+        } else {
+            contractInfo.setContractFiles(new String[]{});
+        }
+        vo.setContractInfo(contractInfo);
+        return vo;
+    }
+
+    public SupplierBankInfo selectByCode(String codeUnified) {
+        return baseMapper.selectByCode(codeUnified);
+    }
 
     public List<PurchaseRequisitionCheckVo> checkPurchaseRequisition(String purchaseRequisitionSid) {
-		List<PurchaseRequisitionCheckVo> list = new ArrayList<>();
-		PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
-		if(pr==null)
-			return list;
-		String supplierCode = pr.getSupplierCode();
-		String supplierName = pr.getSupplierName();
-		String supplierOnlyCode = pr.getSupplierOnlyCode();
+        List<PurchaseRequisitionCheckVo> list = new ArrayList<>();
+        PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
+        if (pr == null)
+            return list;
+        String supplierCode = pr.getSupplierCode();
+        String supplierName = pr.getSupplierName();
+        String supplierOnlyCode = pr.getSupplierOnlyCode();
+
+        SupplierIndex si = supplierIndexService.fetchbyCode(supplierCode);
+        if (si == null) {
+
+        }
+
+
+        return list;
+    }
 
+    public void checkInTransitByUniCode(String supplierOnlyCode) {
 
-		return list;
     }
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java
index c4252688..b10cbd30 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java
@@ -62,8 +62,8 @@ public class SupplierIndexService extends ServiceImpl<SupplierIndexMapper, Suppl
         QueryWrapper<SupplierIndex> qw = new QueryWrapper<>();
         SupplierIndexQuery params = pq.getParams();
         String name = params.getName();
-        if(StringUtils.isNotBlank(name)){
-            qw.like("i.name",name);
+        if (StringUtils.isNotBlank(name)) {
+            qw.like("i.name", name);
         }
         IPage<SupplierIndex> page = PagerUtil.queryToPage(pq);
         IPage<SupplierIndexVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -114,4 +114,10 @@ public class SupplierIndexService extends ServiceImpl<SupplierIndexMapper, Suppl
     public void delByMainSid(String dtoSid) {
         baseMapper.delByMainSid(dtoSid);
     }
+
+    public SupplierIndex fetchbyCode(String supplierCode) {
+        QueryWrapper<SupplierIndex> qw = new QueryWrapper<>();
+        qw.eq("code", supplierCode);
+        return baseMapper.selectOne(qw);
+    }
 }

From 9c47c1ded18859aa018a34321463a48ac93f148f Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 7 Apr 2023 18:12:03 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=96=B0=E5=A2=9E=E5=92=8C=E4=BF=AE=E6=94=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer/biz/wechat/WechatRest.java       |  25 +-
 .../system/sysstaffinfo/SysStaffinfo.java     |   2 +
 .../system/sysstaffinfo/SysStaffinfoDto.java  |  29 +-
 .../sysstaffinfo/SysStaffinfoFeign.java       |  11 +-
 .../SysStaffinfoFeignFallback.java            |  16 +-
 .../sysstaffinfo/SysStaffinfoQuery.java       |   8 +
 .../system/sysstaffinfo/SysStaffinfoVo.java   |  22 +
 .../sysstaffinfo/SysStaffinfoMapper.java      |   8 +
 .../sysstaffinfo/SysStaffinfoMapper.xml       |  54 ++
 .../system/sysstaffinfo/SysStaffinfoRest.java |  26 +-
 .../sysstaffinfo/SysStaffinfoService.java     | 558 +++++++++++++++---
 .../supervise/system/sysuser/SysUserRest.java |  21 +-
 12 files changed, 650 insertions(+), 130 deletions(-)

diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
index 4788e614..0d735f7c 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
@@ -1,6 +1,7 @@
 package com.yxt.supervise.customer.biz.wechat;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yxt.supervise.customer.api.wechat.Template;
 import com.yxt.supervise.customer.api.wechat.TemplateData;
 import com.yxt.supervise.customer.api.wechat.WeChatTemplateMsg;
 import com.yxt.supervise.customer.biz.util.WeixinCheckoutUtil;
@@ -60,13 +61,19 @@ public class WechatRest {
     @PostMapping("/sendMessage")
     public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
 
-        String openId="otnrM521f8KcCsRfL2Jj4Tk8np1g";
+
+        //
+        //String openId="otnrM57kui-WCUmRtChhb1HguOgw";
+        //郭
+        String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
+        //刘
         //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
-        //String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
+        //聂总
+        //otnrM521f8KcCsRfL2Jj4Tk8np1g
 //        String appsecret="4764e32722a7d98656dea6afd9405701";
 //        String appId="wx1d44e0fcd110351a";
         // 模板参数
-        Map<String, String> sendMag = new HashMap<String, String>();
+        Map<String, Template> sendMag = new HashMap<String, Template>();
         // openId代表一个唯一微信用户，即微信消息的接收人
         //String openId = "oLcw_5ti_iJpwibmL0QxfK2ZG9qQ";
         // 公众号的模板id(也有相应的接口可以查询到)
@@ -92,12 +99,12 @@ public class WechatRest {
          * 兑付日期：{{keyword5.DATA}}
          * {{remark.DATA}}
          */
-        sendMag.put("first", "f123");
-        sendMag.put("keyword1", "111");
-        sendMag.put("keyword2", "222");
-        sendMag.put("keyword3", "333");
-        sendMag.put("keyword4", "444");
-        sendMag.put("remark", "123465");
+        sendMag.put("first", new Template("f123"));
+        sendMag.put("keyword1", new Template("111"));
+        sendMag.put("keyword2", new Template("222"));
+        sendMag.put("keyword3", new Template("333"));
+        sendMag.put("keyword4", new Template("444"));
+        sendMag.put("remark", new Template("123465"));
         Map<String, String> miniprogram = new HashMap<>();
         miniprogram.put("appid","wx11565021714ba796");
         miniprogram.put("pagepath","pages/index/index");
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
index 655c15ff..8a26d6f4 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
@@ -170,4 +170,6 @@ public class SysStaffinfo extends BaseEntity {
     private String postRank;
     @ApiModelProperty("身份证地址")
     private String idAddrs;
+    @ApiModelProperty("微信")
+    private String openId;
 }
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
index b03aef22..7ffa47bf 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
@@ -32,31 +32,31 @@ public class SysStaffinfoDto implements Dto {
 
     private static final long serialVersionUID = 8637516813924395044L;
     @ApiModelProperty(value = "姓名", required = true)
-    @NotBlank(message = "姓名不能为空")
+    //@NotBlank(message = "姓名不能为空")
     private String name;
     @ApiModelProperty(value = "性别key", required = true)
-    @NotBlank(message = "性别不能为空")
+    //@NotBlank(message = "性别不能为空")
     private String genderKey;
     @ApiModelProperty(value = "性别", required = true)
-    @NotBlank(message = "性别不能为空")
+    //@NotBlank(message = "性别不能为空")
     private String gender;
     @ApiModelProperty(value = "员工编号")
     private String jobNumber;
     @ApiModelProperty(value = "身份证号", required = true)
-    @Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号")
-    @NotBlank(message = "身份证号不能为空")
+    //@Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号")
+    //@NotBlank(message = "身份证号不能为空")
     private String idNo;
     @ApiModelProperty(value = "证件有效期", required = true)
-    @NotBlank(message = "证件有效期不能为空")
+    //@NotBlank(message = "证件有效期不能为空")
     private String idTerm;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty("生日")
+    //@ApiModelProperty("生日")
     private Date birthday;
     @ApiModelProperty(value = "民族", required = true)
-    @NotBlank(message = "民族不能为空")
+    //@NotBlank(message = "民族不能为空")
     private String national;
     @ApiModelProperty(value = "民族key", required = true)
-    @NotBlank(message = "民族不能为空")
+    //@NotBlank(message = "民族不能为空")
     private String nationalKey;
     @ApiModelProperty(value = "籍贯", required = false)
     private String nativePlace;
@@ -75,8 +75,8 @@ public class SysStaffinfoDto implements Dto {
     @ApiModelProperty(value = "住址", required = false)
     private String address;
     @ApiModelProperty(value = "手机号", required = true)
-    @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确")
-    @NotBlank(message = "手机号不能为空")
+    //@Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确")
+    //@NotBlank(message = "手机号不能为空")
     private String mobile;
     @ApiModelProperty(value = "邮箱", required = false)
     //@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确")
@@ -94,10 +94,10 @@ public class SysStaffinfoDto implements Dto {
     @ApiModelProperty(value = "婚姻状况key", required = false)
     private String maritalStatusKey;
     @ApiModelProperty(value = "员工类型", required = true)
-    @NotBlank(message = "员工类型不能为空")
+    //@NotBlank(message = "员工类型不能为空")
     private String personType;
     @ApiModelProperty(value = "员工类型key", required = true)
-    @NotBlank(message = "员工类型不能为空")
+    //@NotBlank(message = "员工类型不能为空")
     private String personTypeKey;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("入职时间")
@@ -181,5 +181,6 @@ public class SysStaffinfoDto implements Dto {
     private Date quitDate;
     @ApiModelProperty(value = "离职原因")
     private String quitReason;
-
+    @ApiModelProperty(value = "微信")
+    private String openId;
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
index 5f71ece3..5e6714dd 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
@@ -44,7 +44,9 @@ public interface SysStaffinfoFeign {
     @ApiOperation("员工管理分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<SysStaffinfoVo>> listPage(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
-
+    @ApiOperation("员工管理分页列表 新")
+    @PostMapping("/listPageNew")
+    public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
     /**
      * 员工信息新增保存
      *
@@ -54,6 +56,9 @@ public interface SysStaffinfoFeign {
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@Valid @RequestBody SysStaffinfoDto dto);
+    @ApiOperation("新增保存")
+    @PostMapping("/saveNew")
+    public ResultBean saveNew(@Valid @RequestBody SysStaffinfoDto dto);
 
     /**
      * 员工信息修改保存
@@ -65,7 +70,9 @@ public interface SysStaffinfoFeign {
     @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
     public ResultBean update(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid);
-
+    @ApiOperation("修改保存")
+    @PostMapping("/updateNew/{sid}")
+    public ResultBean updateNew(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid);
     /**
      * 员工信息删除操作，即离职
      *
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
index b163c462..ebc92b8c 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
@@ -31,17 +31,31 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问");
     }
-	
+    @Override
+    public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(PagerQuery<SysStaffinfoQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui_portal/sysstaffinfo/listPageNew无法访问");
+    }
     @Override
     public ResultBean save(SysStaffinfoDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/save无法访问");
     }
 
+    @Override
+    public ResultBean saveNew(SysStaffinfoDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean update(SysStaffinfoDto dto, String sid) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/update无法访问");
     }
 
+    @Override
+    public ResultBean updateNew(SysStaffinfoDto dto, String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean del(SysStaffQuery sysStaffQuery) {
         return null;
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
index d494c502..76ce7058 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
@@ -37,6 +37,14 @@ public class SysStaffinfoQuery implements Query {
     private String joinCompnyDateEnd;
     @ApiModelProperty(value = "所在部门sid")
     private String orgSid;
+    @ApiModelProperty(value = "所在部门sid")
+    private String orgName;
     @ApiModelProperty(value = "所在岗位sid")
     private String postSid;
+    @ApiModelProperty(value = "角色sid")
+    private String roleSid;
+    @ApiModelProperty(value = "角色sid")
+    private String roleName;
+    @ApiModelProperty(value = "用户名")
+    private String userName;
 }
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
index 6b69bb32..81877bd2 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
@@ -42,6 +42,28 @@ public class SysStaffinfoVo implements Vo {
     private String postName;
     @ApiModelProperty(value = "部门sid")
     private String orgSid;
+    @ApiModelProperty(value = "记录是否可用，1:可用，0:不可用")
+    private String isEnable;
+    @ApiModelProperty(value = "部门名")
+    private String departmentName;
+    @ApiModelProperty(value = "部门sid")
+    private String departmentSid;
+    @ApiModelProperty(value = "岗位sid")
+    private String postSid;
+    @ApiModelProperty(value = "岗位名称")
+    private String userName;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "角色")
+    private String roleName;
+    @ApiModelProperty(value = "类型code")
+    private String userType;
+    @ApiModelProperty(value = "用户类型:1监管、2客户、3银行")
+    private String userTypeKey;
+    @ApiModelProperty(value = "微信")
+    private String openId;
+    @ApiModelProperty(value = "职位")
+    private String position;
 
 
 }
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
index 8bb18dc5..0292162f 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
@@ -68,6 +68,14 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
      * @return
      */
     IPage<SysStaffinfoVo> pagerList(IPage<SysStaffinfoQuery> page, @Param(Constants.WRAPPER) Wrapper<SysStaffinfoVo> qw);
+    /**
+     * 员工管理分页列表 新
+     *
+     * @param page 分页
+     * @param qw   查询条件
+     * @return
+     */
+    IPage<SysStaffinfoVo> pagerListNew(IPage<SysStaffinfoQuery> page, @Param(Constants.WRAPPER) Wrapper<SysStaffinfoVo> qw);
 
     /**
      * 根据员工sid和员工手机号码查询员工信息是否已存在
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
index c60ffb2b..123229ce 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
@@ -124,6 +124,60 @@
                            ON ssp.staffSid = si.sid
             ${ew.customSqlSegment}
     </select>
+    <select id="pagerListNew" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo">
+        SELECT DISTINCT sta.Sid,
+                        user.isEnable,
+                        (
+                            SELECT GROUP_CONCAT(org.name)
+                            FROM sys_staff_org staffOrg
+                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                            WHERE staffOrg.staffSid = user.staffSid
+                        )              departmentName,
+                        (
+                            SELECT GROUP_CONCAT(org.sid)
+                            FROM sys_staff_org staffOrg
+                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                            WHERE staffOrg.staffSid = user.staffSid
+                        )              sysStaffOrg,
+                        (
+                            SELECT GROUP_CONCAT(post.name)
+                            FROM sys_staff_post staffPost
+                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+                            WHERE staffPost.staffSid = user.staffSid
+                        )              postName,
+                        (
+                            SELECT GROUP_CONCAT(post.sid)
+                            FROM sys_staff_post staffPost
+                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+                            WHERE staffPost.staffSid = user.staffSid
+                        )              sysStaffPost,
+                        user.userName,
+                        user.sid       userSid,
+                        staff.name,
+                        (
+                            SELECT GROUP_CONCAT(role.name)
+                            FROM sys_user_role user_role
+                                     LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+                            WHERE user_role.userSid = USER.sid
+                        )              roleName,
+--                         dict.dictValue userType,
+                        user.userType  userTypeKey,
+                        sta.mobile,
+                        sta.position,
+                        sta.openId,
+                        CASE
+                            WHEN user.userType='1' THEN '监管'
+                            WHEN user.userType='2' THEN '客户'
+                            WHEN user.userType='3' THEN '银行'
+                            end userType
+        FROM sys_staffinfo sta
+                 LEFT JOIN sys_user user on user.staffSid =sta.sid
+            LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
+            LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+            LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
+            LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
+        ${ew.customSqlSegment}
+    </select>
     <!--根据员工手机号和sid查询员工信息是否已存在-->
     <select id="selectByMobileAndSid" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfo">
         select *
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
index d650b38f..2d446c9e 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
@@ -64,7 +64,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         PagerVo<SysStaffinfoVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);
     }
-
+    @Override
+    public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq) {
+        ResultBean<PagerVo<SysStaffinfoVo>> rb = ResultBean.fireFail();
+        IPage<SysStaffinfoVo> page = sysStaffinfoService.lpagerListNew(pq);
+        PagerVo<SysStaffinfoVo> pv = new PagerVo<>();
+        PagerVo<SysStaffinfoVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
+    }
     /**
      * 员工信息的新增保存
      *
@@ -80,6 +87,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         }
         return rb.success().setMsg(resultBean.getMsg());
     }
+    public ResultBean saveNew(SysStaffinfoDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean resultBean = sysStaffinfoService.saveStaffInfoNew(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setMsg(resultBean.getMsg());
+    }
 
     /**
      * 员工信息的修改保存
@@ -97,7 +112,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         }
         return rb.success().setMsg(resultBean.getMsg());
     }
-
+    public ResultBean updateNew(SysStaffinfoDto dto, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean resultBean = sysStaffinfoService.updateStaffInfoNew(dto, sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setMsg(resultBean.getMsg());
+    }
     /**
      * 进行删除操作，即设置员工类型为离职类型02的操作。
      *
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
index e136c67a..e0137724 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
@@ -200,6 +200,59 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         return sysStaffinfoVoIPage;
     }
 
+    public IPage<SysStaffinfoVo> lpagerListNew(PagerQuery<SysStaffinfoQuery> pagerQuery) {
+        // mybits所用的分页对对象
+        IPage<SysStaffinfoQuery> page = PagerUtil.queryToPage(pagerQuery);
+        // mybits所用的查询条件封装类
+        //QueryWrapper<SysStaffinfoVo> qw = createQueryWrapper(pagerQuery.getParams());
+        SysStaffinfoQuery query=pagerQuery.getParams();
+        QueryWrapper<SysStaffinfoVo> qw = new QueryWrapper<>();
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getName())) {
+            qw.like("staff.name", query.getName());
+        }
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getUserName())) {
+            qw.like("user.userName", query.getUserName());
+        }
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getRoleName())) {
+            qw.like("role.name", query.getRoleName());
+        }
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgName())) {
+            qw.like("org.name", query.getOrgName());
+        }
+        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getMobile())) {
+            qw.eq("sta.mobile", query.getMobile());
+        }
+        qw.ne("staff.personTypeKey","01");
+        IPage<SysStaffinfoVo> sysStaffinfoVoIPage = baseMapper.pagerListNew(page, qw);
+        List<SysStaffinfoVo> records = sysStaffinfoVoIPage.getRecords();
+        for (SysStaffinfoVo record : records) {
+            String orgSid = record.getOrgSid();
+            String orgName = "";
+            if (StringUtils.isNotBlank(orgSid)) {
+                String[] split = orgSid.split(",");
+                for (String s : split) {
+                    //获取本级sid获取本级部门信息
+                    SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s);
+                    if(sysOrganization == null){
+                        sysStaffOrgService.delByOrgSid(s);
+                    }else{
+                        //从本级部门信息中获取上级sid
+                        String psid = sysOrganization.getPsid();
+                        //从本级部门信息中获取本级部门名称
+                        String bjName = sysOrganization.getName();
+                        //获取上级sid获取上级部门信息
+                        SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid);
+                        //从上级部门信息中获取上级部门名称
+                        String sjName = sysOrganization1.getName();
+                        orgName += sjName + "-" + bjName + ",";
+                    }
+                }
+                orgName = orgName.substring(0, orgName.length() - 1);
+                record.setOrgName(orgName);
+            }
+        }
+        return sysStaffinfoVoIPage;
+    }
     public List<AppContactSysOrganizationVo> selectContactsByOrgsid(String sid) {
         List<AppContactSysOrganizationVo> list = baseMapper.selectContactsByOrgsid(sid);
         list.stream().forEach(vo -> {
@@ -235,35 +288,35 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             jobNumber = addOne(jobNumber);
         }
         //查询员工的手机号是否重复
-        SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
-        SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
-        if (sysStaffinfo1 != null || sysUser1 != null) {
-            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
-        }
+//        SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
+//        SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
+//        if (sysStaffinfo1 != null || sysUser1 != null) {
+//            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
+//        }
         //查询是否存在该身份证号的员工
-        SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo());
-        if (sysStaffinfo2 != null) {
-            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
-        }
+//        SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo());
+//        if (sysStaffinfo2 != null) {
+//            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
+//        }
         //判断身份证号出生日期和填写的出生日期是否相同
         String idNo = dto.getIdNo();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         String birthday = simpleDateFormat.format(dto.getBirthday());
         String substring = idNo.substring(6, 14);
-        if (!birthday.equals(substring)) {
-            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
-        }
-        //查询部门和岗位是否为空
-        if (dto.getSysStaffOrg() == null) {
-            return rb.setMsg("员工部门信息不能为空");
-        }
-        if (dto.getSysStaffPost() == null) {
-            return rb.setMsg("员工岗位信息不能为空");
-        }
-        Date joinCompnyDate = dto.getJoinCompnyDate();
-        if (joinCompnyDate == null) {
-            return rb.setMsg("员工入职日期不能为空");
-        }
+//        if (!birthday.equals(substring)) {
+//            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
+//        }
+//        //查询部门和岗位是否为空
+//        if (dto.getSysStaffOrg() == null) {
+//            return rb.setMsg("员工部门信息不能为空");
+//        }
+//        if (dto.getSysStaffPost() == null) {
+//            return rb.setMsg("员工岗位信息不能为空");
+//        }
+//        Date joinCompnyDate = dto.getJoinCompnyDate();
+//        if (joinCompnyDate == null) {
+//            return rb.setMsg("员工入职日期不能为空");
+//        }
         //添加员工基础信息
         SysStaffinfo sysStaffinfo3 = new SysStaffinfo();
         dto.fillEntity(sysStaffinfo3);
@@ -271,76 +324,236 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         sysStaffinfo3.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
         sysStaffinfo3.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName()));
         //是否意外险参保
-        if (dto.getIsHaveInsurance() != null) {
-            //意外险参保：是
-            if (dto.getIsHaveInsurance() == 1) {
-                //意外险参保地以及意外险参保开始时间和结束时间不能为空
-                if (dto.getInsuranceStartDate() == null) {
-                    return rb.setMsg("意外险参保时间不能为空");
-                }
-                if (dto.getInsuranceEndDate() == null) {
-                    return rb.setMsg("意外险终止时间不能为空");
-                }
-                if (StringUtils.isBlank(dto.getInsuranceAddr())) {
-                    return rb.setMsg("意外险参保地不能为空");
-                }
-            } else {
-                sysStaffinfo3.setIsHaveInsurance(0);
-                sysStaffinfo3.setInsuranceStartDate(null);
-                sysStaffinfo3.setInsuranceEndDate(null);
-                sysStaffinfo3.setInsuranceAddr(null);
-            }
-        }
-        if ("01".equals(dto.getPersonTypeKey())) {
-            if (dto.getQuitDate() == null) {
-                return rb.setMsg("离职日期不能为空");
-            }
-            if (StringUtils.isBlank(dto.getQuitReason())) {
-                return rb.setMsg("离职原因不能为空");
-            }
-        }
-        //身份证(人像面)
-        if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardA())) {
-            if (sysStaffinfo3.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
-                sysStaffinfo3.setIdCardA(sysStaffinfo3.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
-            }
-        }
-        //身份证(国徽面)
-        if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardB())) {
-            if (sysStaffinfo3.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
-                sysStaffinfo3.setIdCardB(sysStaffinfo3.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
-            }
-        }
-        //学历证书diploma
-        if (StringUtils.isNotBlank(sysStaffinfo3.getDiploma())) {
-            if (sysStaffinfo3.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
-                sysStaffinfo3.setDiploma(sysStaffinfo3.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
-            }
-        }
-        //学位证书degreeCertificate
-        if (StringUtils.isNotBlank(sysStaffinfo3.getDegreeCertificate())) {
-            if (sysStaffinfo3.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
-                sysStaffinfo3.setDegreeCertificate(sysStaffinfo3.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
-            }
-        }
-        //前公司离职证明leaveCertificate
-        if (StringUtils.isNotBlank(sysStaffinfo3.getLeaveCertificate())) {
-            if (sysStaffinfo3.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
-                sysStaffinfo3.setLeaveCertificate(sysStaffinfo3.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
-            }
+//        if (dto.getIsHaveInsurance() != null) {
+//            //意外险参保：是
+//            if (dto.getIsHaveInsurance() == 1) {
+//                //意外险参保地以及意外险参保开始时间和结束时间不能为空
+//                if (dto.getInsuranceStartDate() == null) {
+//                    return rb.setMsg("意外险参保时间不能为空");
+//                }
+//                if (dto.getInsuranceEndDate() == null) {
+//                    return rb.setMsg("意外险终止时间不能为空");
+//                }
+//                if (StringUtils.isBlank(dto.getInsuranceAddr())) {
+//                    return rb.setMsg("意外险参保地不能为空");
+//                }
+//            } else {
+//                sysStaffinfo3.setIsHaveInsurance(0);
+//                sysStaffinfo3.setInsuranceStartDate(null);
+//                sysStaffinfo3.setInsuranceEndDate(null);
+//                sysStaffinfo3.setInsuranceAddr(null);
+//            }
+//        }
+//        if ("01".equals(dto.getPersonTypeKey())) {
+//            if (dto.getQuitDate() == null) {
+//                return rb.setMsg("离职日期不能为空");
+//            }
+//            if (StringUtils.isBlank(dto.getQuitReason())) {
+//                return rb.setMsg("离职原因不能为空");
+//            }
+//        }
+//        //身份证(人像面)
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardA())) {
+//            if (sysStaffinfo3.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setIdCardA(sysStaffinfo3.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //身份证(国徽面)
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardB())) {
+//            if (sysStaffinfo3.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setIdCardB(sysStaffinfo3.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //学历证书diploma
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getDiploma())) {
+//            if (sysStaffinfo3.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setDiploma(sysStaffinfo3.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //学位证书degreeCertificate
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getDegreeCertificate())) {
+//            if (sysStaffinfo3.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setDegreeCertificate(sysStaffinfo3.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //前公司离职证明leaveCertificate
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getLeaveCertificate())) {
+//            if (sysStaffinfo3.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setLeaveCertificate(sysStaffinfo3.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //员工照片
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getPhoto())) {
+//            if (sysStaffinfo3.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setPhoto(sysStaffinfo3.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+        //增加员工的关联的部门信息
+        SysStaffOrg sysStaffOrg = new SysStaffOrg();
+        SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
+//        if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
+//            return rb.setMsg("所在部门不能为空");
+//        }
+        sysStaffOrgDto.fillEntity(sysStaffOrg);
+        sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
+        sysStaffOrg.setManageType("3");
+        sysStaffOrgService.save(sysStaffOrg);
+        //增加员工的关联的岗位信息
+        SysStaffPost sysStaffPost = new SysStaffPost();
+        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
+//        if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
+//            return rb.setMsg("岗位不能为空");
+//        }
+
+        save(sysStaffinfo3);
+        //添加用户信息
+        SysUser sysUser = new SysUser();
+        sysUser.setStaffSid(sysStaffinfo3.getSid());
+        sysUser.setUserName(jobNumber);
+        sysUser.setMobile(sysStaffinfo3.getMobile());
+        sysUser.setUserType(1);
+        String password = sysStaffinfo3.getMobile().substring(5, 11);
+        String md5 = Encodes.md5(password);
+        sysUser.setPassword(md5);
+        boolean isSave = sysUserService.save(sysUser);
+        sysStaffPostDto.fillEntity(sysStaffPost);
+        sysStaffPost.setStaffSid(sysStaffinfo3.getSid());
+        sysStaffPost.setStartDate(new Date());
+        sysStaffPostService.save(sysStaffPost);
+        if (!isSave) {
+            return rb.setMsg("添加员工信息失败");
         }
-        //员工照片
-        if (StringUtils.isNotBlank(sysStaffinfo3.getPhoto())) {
-            if (sysStaffinfo3.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
-                sysStaffinfo3.setPhoto(sysStaffinfo3.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
-            }
+        SysUserRole sysUserRole = new SysUserRole();
+        sysUserRole.setUserSid(sysUser.getSid());
+        sysUserRole.setRoleSid(sysRoleVo.getSid());
+        sysUserRoleService.save(sysUserRole);
+        return rb.success().setMsg("添加员工信息成功");
+
+    }
+    public ResultBean saveStaffInfoNew(SysStaffinfoDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        SysRoleVo sysRoleVo = sysRoleService.fetchByName("试用期员工");
+//        if (sysRoleVo == null) {
+//            return rb.setMsg("缺少默认试用期员工角色");
+//        }
+        //员工类型
+        //String personTypeKey = dto.getPersonTypeKey();
+        String jobNumber = "";
+        SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber();
+        if (sysStaffinfo == null) {
+            //无此员工类型的员工
+            jobNumber = addOne("0000");
+        } else {
+            jobNumber = sysStaffinfo.getJobNumber();
+            jobNumber = addOne(jobNumber);
         }
+        //查询员工的手机号是否重复
+//        SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
+//        SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
+//        if (sysStaffinfo1 != null || sysUser1 != null) {
+//            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
+//        }
+        //查询是否存在该身份证号的员工
+//        SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo());
+//        if (sysStaffinfo2 != null) {
+//            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
+//        }
+        //判断身份证号出生日期和填写的出生日期是否相同
+        String idNo = dto.getIdNo();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        String birthday = simpleDateFormat.format(dto.getBirthday());
+        String substring = idNo.substring(6, 14);
+//        if (!birthday.equals(substring)) {
+//            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
+//        }
+//        //查询部门和岗位是否为空
+//        if (dto.getSysStaffOrg() == null) {
+//            return rb.setMsg("员工部门信息不能为空");
+//        }
+//        if (dto.getSysStaffPost() == null) {
+//            return rb.setMsg("员工岗位信息不能为空");
+//        }
+//        Date joinCompnyDate = dto.getJoinCompnyDate();
+//        if (joinCompnyDate == null) {
+//            return rb.setMsg("员工入职日期不能为空");
+//        }
+        //添加员工基础信息
+        SysStaffinfo sysStaffinfo3 = new SysStaffinfo();
+        dto.fillEntity(sysStaffinfo3);
+        sysStaffinfo3.setJobNumber(jobNumber);
+        sysStaffinfo3.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
+        sysStaffinfo3.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName()));
+        //是否意外险参保
+//        if (dto.getIsHaveInsurance() != null) {
+//            //意外险参保：是
+//            if (dto.getIsHaveInsurance() == 1) {
+//                //意外险参保地以及意外险参保开始时间和结束时间不能为空
+//                if (dto.getInsuranceStartDate() == null) {
+//                    return rb.setMsg("意外险参保时间不能为空");
+//                }
+//                if (dto.getInsuranceEndDate() == null) {
+//                    return rb.setMsg("意外险终止时间不能为空");
+//                }
+//                if (StringUtils.isBlank(dto.getInsuranceAddr())) {
+//                    return rb.setMsg("意外险参保地不能为空");
+//                }
+//            } else {
+//                sysStaffinfo3.setIsHaveInsurance(0);
+//                sysStaffinfo3.setInsuranceStartDate(null);
+//                sysStaffinfo3.setInsuranceEndDate(null);
+//                sysStaffinfo3.setInsuranceAddr(null);
+//            }
+//        }
+//        if ("01".equals(dto.getPersonTypeKey())) {
+//            if (dto.getQuitDate() == null) {
+//                return rb.setMsg("离职日期不能为空");
+//            }
+//            if (StringUtils.isBlank(dto.getQuitReason())) {
+//                return rb.setMsg("离职原因不能为空");
+//            }
+//        }
+//        //身份证(人像面)
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardA())) {
+//            if (sysStaffinfo3.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setIdCardA(sysStaffinfo3.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //身份证(国徽面)
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardB())) {
+//            if (sysStaffinfo3.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setIdCardB(sysStaffinfo3.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //学历证书diploma
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getDiploma())) {
+//            if (sysStaffinfo3.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setDiploma(sysStaffinfo3.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //学位证书degreeCertificate
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getDegreeCertificate())) {
+//            if (sysStaffinfo3.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setDegreeCertificate(sysStaffinfo3.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //前公司离职证明leaveCertificate
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getLeaveCertificate())) {
+//            if (sysStaffinfo3.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setLeaveCertificate(sysStaffinfo3.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //员工照片
+//        if (StringUtils.isNotBlank(sysStaffinfo3.getPhoto())) {
+//            if (sysStaffinfo3.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo3.setPhoto(sysStaffinfo3.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
         //增加员工的关联的部门信息
         SysStaffOrg sysStaffOrg = new SysStaffOrg();
         SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
-        if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
-            return rb.setMsg("所在部门不能为空");
-        }
+//        if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
+//            return rb.setMsg("所在部门不能为空");
+//        }
         sysStaffOrgDto.fillEntity(sysStaffOrg);
         sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
         sysStaffOrg.setManageType("3");
@@ -348,9 +561,9 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         //增加员工的关联的岗位信息
         SysStaffPost sysStaffPost = new SysStaffPost();
         SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
-        if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
-            return rb.setMsg("岗位不能为空");
-        }
+//        if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
+//            return rb.setMsg("岗位不能为空");
+//        }
 
         save(sysStaffinfo3);
         //添加用户信息
@@ -377,7 +590,6 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         return rb.success().setMsg("添加员工信息成功");
 
     }
-
     /**
      * 字符串+1方法，该方法将其结尾的整数+1,适用于任何以整数结尾的字符串,不限格式，不限分隔符。
      *
@@ -574,6 +786,168 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         return rb.success().setMsg("更新员工信息成功");
     }
 
+    public ResultBean updateStaffInfoNew(SysStaffinfoDto dto, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该人员的组织机构list
+        List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
+        List<String> orgList = new ArrayList<>();
+        if (sysStaffOrgVos.size() > 0) {
+            for (SysStaffOrgVo vv : sysStaffOrgVos) {
+                String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+                if (sysOrganization != null) {
+                    orgList.add(orgSid);
+                } else {
+                    continue;
+                }
+            }
+        }
+        //根据员工sid查询员工的信息
+        SysStaffinfo sysStaffinfo = fetchBySid(sid);
+//        if (sysStaffinfo == null) {
+//            return rb.setMsg("此员工信息不存在");
+//        }
+//        //查询员工的手机号是否重复
+//        SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid);
+//        if (sysStaffinfo2 != null) {
+//            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
+//        }
+//        //查询是否存在该身份证号的员工
+//        SysStaffinfo sysStaffinfo3 = baseMapper.selectByIdNoAndSid(dto.getIdNo(), sid);
+//        if (sysStaffinfo3 != null) {
+//            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
+//        }
+        //更新员工基础信息
+        BeanUtil.copyProperties(dto, sysStaffinfo);
+        sysStaffinfo.setJobNumber(dto.getJobNumber());
+        sysStaffinfo.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
+        sysStaffinfo.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName()));
+        //是否意外险参保
+//        if (dto.getIsHaveInsurance() != null) {
+//            //意外险参保：是
+//            if (dto.getIsHaveInsurance() == 1) {
+//                //意外险参保地以及意外险参保开始时间和结束时间不能为空
+//                if (dto.getInsuranceStartDate() == null) {
+//                    return rb.setMsg("意外险参保时间不能为空");
+//                }
+//                if (dto.getInsuranceEndDate() == null) {
+//                    return rb.setMsg("意外险终止时间不能为空");
+//                }
+//                if (StringUtils.isBlank(dto.getInsuranceAddr())) {
+//                    return rb.setMsg("意外险参保地不能为空");
+//                }
+//            } else {
+//                sysStaffinfo.setIsHaveInsurance(0);
+//                sysStaffinfo.setInsuranceStartDate(null);
+//                sysStaffinfo.setInsuranceEndDate(null);
+//                sysStaffinfo.setInsuranceAddr(null);
+//            }
+//        }
+//        if ("01".equals(dto.getPersonTypeKey())) {
+//            if (dto.getQuitDate() == null) {
+//                return rb.setMsg("离职日期不能为空");
+//            }
+//            if (StringUtils.isBlank(dto.getQuitReason())) {
+//                return rb.setMsg("离职原因不能为空");
+//            }
+//        }
+//        //身份证(人像面)
+//        if (StringUtils.isNotBlank(sysStaffinfo.getIdCardA())) {
+//            if (sysStaffinfo.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo.setIdCardA(sysStaffinfo.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //身份证(国徽面)
+//        if (StringUtils.isNotBlank(sysStaffinfo.getIdCardB())) {
+//            if (sysStaffinfo.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo.setIdCardB(sysStaffinfo.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //学历证书diploma
+//        if (StringUtils.isNotBlank(sysStaffinfo.getDiploma())) {
+//            if (sysStaffinfo.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo.setDiploma(sysStaffinfo.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //学位证书degreeCertificate
+//        if (StringUtils.isNotBlank(sysStaffinfo.getDegreeCertificate())) {
+//            if (sysStaffinfo.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo.setDegreeCertificate(sysStaffinfo.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //前公司离职证明leaveCertificate
+//        if (StringUtils.isNotBlank(sysStaffinfo.getLeaveCertificate())) {
+//            if (sysStaffinfo.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo.setLeaveCertificate(sysStaffinfo.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+//        //员工照片
+//        if (StringUtils.isNotBlank(sysStaffinfo.getPhoto())) {
+//            if (sysStaffinfo.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
+//                sysStaffinfo.setPhoto(sysStaffinfo.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
+//            }
+//        }
+        //更新用户信息
+        sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
+        //更新员工的关联的部门信息
+        SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
+
+        int count = sysStaffOrgService.selectByStaffAndOrg(sysStaffOrgDto.getOrgSidPath(), sid, "2");
+        if (count > 0) {
+            sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2");
+        }
+        SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath());
+        if(sysStaffOrg == null){
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid);
+            sysStaffOrg = staffOrgResultBean.getData();
+            if(sysStaffOrg == null){
+                sysStaffOrg = new SysStaffOrg();
+                sysStaffOrg.setStaffSid(sid);
+                BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+                sysStaffOrg.setManageType("3");
+                sysStaffOrgService.insert(sysStaffOrg);
+            }else{
+                BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+                sysStaffOrg.setManageType("3");
+                sysStaffOrgService.updateById(sysStaffOrg);
+            }
+        }else{
+            BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+            sysStaffOrg.setManageType("3");
+            sysStaffOrgService.updateById(sysStaffOrg);
+        }
+
+        //更新员工的关联的岗位信息
+        SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
+        SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid());
+        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
+        sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid());
+        boolean isUpdate = updateById(sysStaffinfo);
+        if (!isUpdate) {
+            return rb.setMsg("更新员工信息失败");
+        }
+        List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
+        List<String> orgList1 = new ArrayList<>();
+        if (sysStaffOrgVos1.size() > 0) {
+            for (SysStaffOrgVo vv : sysStaffOrgVos1) {
+                String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+                if (sysOrganization != null) {
+                    orgList1.add(orgSid);
+                } else {
+                    continue;
+                }
+            }
+        }
+        List<String> reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList());
+        if (reduce1.size() > 0) {
+            //根据staffSid查询token
+            String token = sysUserService.selectByStaffsid(sid).getToken();
+            //清空该token
+            redisUtil.remove(token);
+        }
+        return rb.success().setMsg("更新员工信息成功");
+    }
     /**
      * 根据员工sid查询员工信息
      *
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
index 63a58ebb..299f06cb 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
@@ -115,16 +115,17 @@ public class SysUserRest implements SysUserFeign {
         if (userType == 0) {
             return new ResultBean<SysUserVo>().fail().setMsg("用户类型不能为空");
         }
-        if (StringUtils.isBlank(verificationCode)) {
-            return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
-        } else {
-            Map<String, Object> stringObjectMap = sysUserService.mobileValidateRegister(mobile, verificationCode);
-            String code = stringObjectMap.get("code").toString();
-            String details = stringObjectMap.get("details").toString();
-            if (Tools.CODE_FAIL.equals(code)) {
-                return ResultBean.fireFail().setMessage(details).setMsg(details);
-            }
-        }
+        //取消验证码
+//        if (StringUtils.isBlank(verificationCode)) {
+//            return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
+//        } else {
+//            Map<String, Object> stringObjectMap = sysUserService.mobileValidateRegister(mobile, verificationCode);
+//            String code = stringObjectMap.get("code").toString();
+//            String details = stringObjectMap.get("details").toString();
+//            if (Tools.CODE_FAIL.equals(code)) {
+//                return ResultBean.fireFail().setMessage(details).setMsg(details);
+//            }
+//        }
         //"15097329653";
         String password = mobile.substring(5, 11);
         String md5 = Encodes.md5(password);

From 2e03cc07776e523b1798978a1649a57ab5ce23b6 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Fri, 7 Apr 2023 19:13:16 +0800
Subject: [PATCH 13/23] 11

---
 .../PurchaseRequisitionCheckVo.java           |  2 +-
 .../SupplierBankInfoService.java              | 48 +++++++++++++++++--
 .../supplierindex/SupplierIndexService.java   |  8 +++-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
index 88923fe4..091f563b 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
@@ -16,7 +16,7 @@ public class PurchaseRequisitionCheckVo {
     private String supplierName;
     private String supplierCodeUnified;
 
-    private int resState = 0; // 0=正常；1=无供应商信息；2=供应商编码不符；3=有在途
+    private int resState = 0; // 0=正常；1=无供应商信息；2=供应商编码不符；3=有在途；4=供应商索引编码重复；5=没有对应订单
     private String msg;
 
     public String getPrSid() {
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
index 7a0e4eb9..e328ee13 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
@@ -37,7 +37,6 @@ import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
 import com.yxt.supervise.customer.api.supplierbankinfo.*;
 import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
 import com.yxt.supervise.customer.api.supplierindex.SupplierIndex;
-import com.yxt.supervise.customer.api.supplierindex.SupplierIndexQuery;
 import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService;
 import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService;
 import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService;
@@ -253,13 +252,47 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
     public List<PurchaseRequisitionCheckVo> checkPurchaseRequisition(String purchaseRequisitionSid) {
         List<PurchaseRequisitionCheckVo> list = new ArrayList<>();
         PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
-        if (pr == null)
+        if (pr == null) {
+            PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(purchaseRequisitionSid, "", 5);
+            vo.setMsg("没有对应采购订单");
+            list.add(vo);
             return list;
+        }
+        String prCode = pr.getCode();
+        String prSid = pr.getSid();
         String supplierCode = pr.getSupplierCode();
         String supplierName = pr.getSupplierName();
         String supplierOnlyCode = pr.getSupplierOnlyCode();
 
-        SupplierIndex si = supplierIndexService.fetchbyCode(supplierCode);
+        List<SupplierIndex> silist = supplierIndexService.listByCode(supplierCode);
+        if (silist != null && silist.size() > 1) {
+            PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 4);
+            vo.setSupplierCode(supplierCode);
+            vo.setSupplierName(supplierName);
+            vo.setSupplierCodeUnified(supplierOnlyCode);
+            vo.setMsg("【" + supplierCode + "】在索引表中有重复值");
+            list.add(vo);
+            return list;
+        }
+
+        if (silist == null || silist.isEmpty()) {
+            SupplierBankInfo sbi = this.fetchByName(supplierName);
+            if (sbi == null) {
+                PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 1);
+                vo.setSupplierCode(supplierCode);
+                vo.setSupplierName(supplierName);
+                vo.setSupplierCodeUnified(supplierOnlyCode);
+                vo.setMsg("没有该供应商信息");
+                list.add(vo);
+                return list;
+            } else {
+                String sbiCodeUnified = sbi.getCodeUnified();
+                String sbiSid = sbi.getSid();
+
+            }
+        }
+
+        SupplierIndex si = null;
         if (si == null) {
 
         }
@@ -268,6 +301,15 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
         return list;
     }
 
+    public SupplierBankInfo fetchByName(String supplierName) {
+        QueryWrapper<SupplierBankInfo> qw = new QueryWrapper<>();
+        qw.eq("name", supplierName);
+        List<SupplierBankInfo> list = baseMapper.selectList(qw);
+        if (list == null || list.isEmpty())
+            return null;
+        return list.get(0);
+    }
+
     public void checkInTransitByUniCode(String supplierOnlyCode) {
 
     }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java
index b10cbd30..2e48fe56 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java
@@ -4,7 +4,6 @@ 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.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
@@ -115,9 +114,14 @@ public class SupplierIndexService extends ServiceImpl<SupplierIndexMapper, Suppl
         baseMapper.delByMainSid(dtoSid);
     }
 
-    public SupplierIndex fetchbyCode(String supplierCode) {
+    public SupplierIndex fetchByCode(String supplierCode) {
         QueryWrapper<SupplierIndex> qw = new QueryWrapper<>();
         qw.eq("code", supplierCode);
         return baseMapper.selectOne(qw);
     }
+    public List<SupplierIndex> listByCode(String supplierCode) {
+        QueryWrapper<SupplierIndex> qw = new QueryWrapper<>();
+        qw.eq("code", supplierCode);
+        return baseMapper.selectList(qw);
+    }
 }

From d778bd37f219090ce12f6bd762731a972e6a14aa Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Sun, 9 Apr 2023 16:59:47 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E7=83=9F=E8=8D=89=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/biz/gdsales/GdSalesYcMapper.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java
index 2b0e6c46..e0a5e3c4 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java
@@ -52,35 +52,35 @@ public interface GdSalesYcMapper extends BaseMapper<GdSalesYc> {
     @Delete("delete from gd_sales_yc where dataDate=#{dataDate} ")
     void clearByDataDate(@Param("dataDate") String dataDate);
 
-    @Select("select count(1) from (select storeCode from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} group by storeCode) t")
+    @Select("select count(1) from (select storeCode from gd_sales_yc where dataDate=#{dataDate} group by storeCode) t")
     int countStoreOnDay(@Param("dataDate") String orderDate);
 
     @Select("select t2.storeCode,si.name,t2.amount from( " +
             "  select storeCode,sum(t1.price) as amount from( " +
-            "    select storeCode,saleNum*salePrice as price from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
+            "    select storeCode,saleNum*salePrice as price from gd_sales_yc where dataDate=#{dataDate} " +
             "  ) t1 group by t1.storeCode " +
             ") t2 left join store_index si on t2.storecode=si.code ")
     List<Map<String, Object>> listOfStoreOnDay(@Param("dataDate") String orderDate);
 
-    @Select("select count(1) from (select prodCode from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} group by prodCode) t")
+    @Select("select count(1) from (select prodCode from gd_sales_yc where dataDate=#{dataDate} group by prodCode) t")
     int countProductOnDay(@Param("dataDate") String orderDate);
 
     @Select("select si.name,t1.* from ( " +
-            "  select storeCode,orderType,orderNo,prodCode,prodName,saleNum,salePrice,saleNum*salePrice as amount  from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
+            "  select storeCode,orderType,orderNo,prodCode,prodName,saleNum,salePrice,saleNum*salePrice as amount  from gd_sales_yc where dataDate=#{dataDate} " +
             ") t1 left join store_index si on t1.storecode=si.code ")
     List<Map<String, Object>> listOfProductOnDay(@Param("dataDate") String orderDate);
 
-    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate}")
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate}")
     double amountOfDay(@Param("dataDate") String orderDate);
 
-    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " +
             " and storeCode in (select code from store_index si where si.`type`='连网连锁店') ")
     double amountOfLwlsdDay(@Param("dataDate") String orderDate);
 
-    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " +
+    @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " +
             " and storeCode in (select code from store_index si where si.`type`='连锁内加盟') ")
     double amountOfLsnjmDay(@Param("dataDate") String orderDate);
 
-    @Select("SELECT * FROM gd_sales_yc where orderType='批发' and (customerName='客户' or customerName='客户1') and dataDate=#{dataDate} " )
+    @Select("SELECT * FROM gd_sales_gd where orderType='批发' and (customerName='客户' or customerName='客户1') and dataDate=#{dataDate} " )
     List<GdSalesYc> listFxOfDay(@Param("dataDate") String orderDate);
 }

From f8f197ee15de7967810ad108a95f4a72dd6a2b17 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 10 Apr 2023 18:21:27 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=A2=9E=E5=88=A0?=
 =?UTF-8?q?=E6=94=B9=E6=9F=A5=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateStaffConfig.java                  |  20 +++
 .../TemplateStaffConfigDetailsVo.java         |  20 +++
 .../TemplateStaffConfigDto.java               |  20 +++
 .../TemplateStaffConfigFeign.java             |  17 +++
 .../TemplateStaffConfigFeignFallback.java     |  11 ++
 .../TemplateStaffConfigQuery.java             |  20 +++
 .../TemplateStaffConfigVo.java                |  20 +++
 .../api/wechattemplate/WechatTemplate.java    |  31 +++++
 .../WechatTemplateDetailVo.java               |  27 ++++
 .../api/wechattemplate/WechatTemplateDto.java |  32 +++++
 .../wechattemplate/WechatTemplateFeign.java   |  18 +++
 .../WechatTemplateFeignFallback.java          |  11 ++
 .../wechattemplate/WechatTemplateQuery.java   |  27 ++++
 .../api/wechattemplate/WechatTemplateVo.java  |  27 ++++
 .../TemplateStaffConfigMapper.java            |  20 +++
 .../TemplateStaffConfigMapper.xml             |  13 ++
 .../TemplateStaffConfigRest.java              |  16 +++
 .../TemplateStaffConfigService.java           |  13 ++
 .../wechattemplate/WechatTemplateMapper.java  |  19 +++
 .../wechattemplate/WechatTemplateMapper.xml   |  13 ++
 .../wechattemplate/WechatTemplateRest.java    |  54 ++++++++
 .../wechattemplate/WechatTemplateService.java |  88 ++++++++++++
 .../sysstaffinfo/SysStaffinfoFeign.java       |   8 ++
 .../SysStaffinfoFeignFallback.java            |  11 ++
 .../supervise/system/sysuser/SysUserDto.java  |   8 +-
 .../sysstaffinfo/SysStaffinfoMapper.java      |   4 +
 .../sysstaffinfo/SysStaffinfoMapper.xml       | 131 ++++++++++--------
 .../system/sysstaffinfo/SysStaffinfoRest.java |  23 +++
 .../sysstaffinfo/SysStaffinfoService.java     |  61 ++++----
 .../system/sysuser/SysUserMapper.java         |   1 +
 .../system/sysuser/SysUserMapper.xml          | 128 ++++++++---------
 31 files changed, 760 insertions(+), 152 deletions(-)
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java

diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java
new file mode 100644
index 00000000..6c6cec75
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java
@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+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/4/10 14:34
+ */
+@Data
+@ApiModel(value = "模板 员工关联表", description = "模板 员工关联表")
+@TableName("template_staff_config")
+public class TemplateStaffConfig extends BaseEntity {
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java
new file mode 100644
index 00000000..c751038b
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java
@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 视图数据详情", description = "模板 员工关联表 视图数据详情")
+public class TemplateStaffConfigDetailsVo implements Vo {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java
new file mode 100644
index 00000000..66aa431d
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java
@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 数据传输对象", description = "模板 员工关联表 数据传输对象")
+public class TemplateStaffConfigDto implements Dto {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java
new file mode 100644
index 00000000..e241d577
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java
@@ -0,0 +1,17 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Api(tags = "模板 员工关联表")
+@FeignClient(
+        contextId = "yxt-supervise-TemplateStaffConfig",
+        name = "yxt-supervise",
+        path = "v1/templatestaffconfig",
+        fallback = TemplateStaffConfigFeignFallback.class)
+public interface TemplateStaffConfigFeign {
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java
new file mode 100644
index 00000000..47f8b391
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Component
+public class TemplateStaffConfigFeignFallback implements TemplateStaffConfigFeign{
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java
new file mode 100644
index 00000000..1b4d15d3
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java
@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 查询条件", description = "模板 员工关联表 查询条件")
+public class TemplateStaffConfigQuery implements Vo {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java
new file mode 100644
index 00000000..0e7722d1
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java
@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.api.templatestaffconfig;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:35
+ */
+@Data
+@ApiModel(value = "模板 员工关联表 视图数据对象", description = "模板 员工关联表 视图数据对象")
+public class TemplateStaffConfigVo implements Vo {
+    private String id;
+    //模板sid
+    private String templateSid;
+    //员工sid
+    private String staffSid;
+    private String sid;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java
new file mode 100644
index 00000000..d0160fa9
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java
@@ -0,0 +1,31 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+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/10 11:34
+ */
+@Data
+@ApiModel(value = "微信消息模版", description = "微信消息模版")
+@TableName("wechat_template")
+public class WechatTemplate extends BaseEntity {
+    //id
+    //private String id;
+    //模版id
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java
new file mode 100644
index 00000000..bbab87c0
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java
@@ -0,0 +1,27 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:34
+ */
+@Data
+@ApiModel(value = "微信消息模版 视图数据详情", description = "微信消息模版 视图数据详情")
+public class WechatTemplateDetailVo implements Vo {
+    private String id;
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java
new file mode 100644
index 00000000..15dfa53e
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java
@@ -0,0 +1,32 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Data
+@ApiModel(value = "微信消息模版 数据传输对象", description = "微信消息模版 数据传输对象")
+public class WechatTemplateDto implements Dto {
+    private String id;
+    private String sid; // sid
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+    private List<TemplateStaffConfig> templateStaffConfigs;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java
new file mode 100644
index 00000000..eb229177
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Api(tags = "微信模版消息")
+@FeignClient(
+        contextId = "com.supervise-WechatTemplate",
+        name = "com.supervise",
+        path = "v1/wechattemplate",
+        fallback = WechatTemplateFeignFallback.class)
+public interface WechatTemplateFeign {
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java
new file mode 100644
index 00000000..f1d35657
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Component
+public class WechatTemplateFeignFallback implements WechatTemplateFeign{
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java
new file mode 100644
index 00000000..d891b613
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java
@@ -0,0 +1,27 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Data
+@ApiModel(value = "微信消息模版 查询条件", description = "微信消息模版 查询条件")
+public class WechatTemplateQuery implements Query {
+    private String id;
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java
new file mode 100644
index 00000000..5643c9b8
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java
@@ -0,0 +1,27 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 11:35
+ */
+@Data
+@ApiModel(value = "微信消息模版 视图数据对象", description = "微信消息模版 视图数据对象")
+public class WechatTemplateVo implements Vo {
+    private String id;
+    @ApiModelProperty("模版id")
+    private String templateId;
+    //标题
+    @ApiModelProperty("标题")
+    private String title;
+    //格式
+    @ApiModelProperty("格式")
+    private String json;
+    //行业
+    @ApiModelProperty("行业")
+    private String trade;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java
new file mode 100644
index 00000000..2580a774
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java
@@ -0,0 +1,20 @@
+package com.yxt.supervise.portal.biz.templatestaffconfig;
+
+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.portal.api.templatestaffconfig.TemplateStaffConfig;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:45
+ */
+@Mapper
+public interface TemplateStaffConfigMapper extends BaseMapper<TemplateStaffConfig> {
+    IPage<WechatTemplateVo> selectPageVo(IPage<WechatTemplate> page, @Param(Constants.WRAPPER) Wrapper<WechatTemplate> qw);
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml
new file mode 100644
index 00000000..76598e64
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml
@@ -0,0 +1,13 @@
+<?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.templatestaffconfig.TemplateStaffConfigMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java
new file mode 100644
index 00000000..2626c855
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java
@@ -0,0 +1,16 @@
+package com.yxt.supervise.portal.biz.templatestaffconfig;
+
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigFeign;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:45
+ */
+@Api(tags = "消息 员工关联表")
+@RestController
+@RequestMapping("v1/templatestaffconfig")
+public class TemplateStaffConfigRest implements TemplateStaffConfigFeign {
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java
new file mode 100644
index 00000000..12b73b3a
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java
@@ -0,0 +1,13 @@
+package com.yxt.supervise.portal.biz.templatestaffconfig;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 14:45
+ */
+@Service
+public class TemplateStaffConfigService extends MybatisBaseService<TemplateStaffConfigMapper, TemplateStaffConfig> {
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java
new file mode 100644
index 00000000..0fdb43b9
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java
@@ -0,0 +1,19 @@
+package com.yxt.supervise.portal.biz.wechattemplate;
+
+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.portal.api.wechattemplate.WechatTemplate;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 10:34
+ */
+@Mapper
+public interface WechatTemplateMapper extends BaseMapper<WechatTemplate> {
+    IPage<WechatTemplateVo> selectPageVo(IPage<WechatTemplate> page, @Param(Constants.WRAPPER) Wrapper<WechatTemplate> qw);
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml
new file mode 100644
index 00000000..626fa3b3
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml
@@ -0,0 +1,13 @@
+<?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.wechattemplate.WechatTemplateMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo">
+        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java
new file mode 100644
index 00000000..b83c85c6
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java
@@ -0,0 +1,54 @@
+package com.yxt.supervise.portal.biz.wechattemplate;
+
+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.wechattemplate.WechatTemplateDto;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateFeign;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 10:35
+ */
+@Api(tags = "微信消息模版")
+@RestController
+@RequestMapping("v1/wechattemplate")
+public class WechatTemplateRest implements WechatTemplateFeign {
+    @Autowired
+    WechatTemplateService wechatTemplateService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<WechatTemplateVo>> listPage(@RequestBody PagerQuery<WechatTemplateQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WechatTemplateVo> pv = wechatTemplateService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody WechatTemplateDto dto){
+        ResultBean rb = ResultBean.fireFail();
+        wechatTemplateService.save(dto);
+        return  rb.success().setMsg(rb.getMsg());
+    }
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody WechatTemplateDto dto){
+        ResultBean rb = ResultBean.fireFail();
+        wechatTemplateService.update(dto);
+        return  rb.success().setMsg(rb.getMsg());
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    @ResponseBody
+    public ResultBean delete(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        wechatTemplateService.deleteById(sid);
+        return  rb.success().setMsg(rb.getMsg());
+    }
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java
new file mode 100644
index 00000000..222e857f
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java
@@ -0,0 +1,88 @@
+package com.yxt.supervise.portal.biz.wechattemplate;
+
+import cn.hutool.core.bean.BeanUtil;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateDto;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery;
+import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import com.yxt.supervise.portal.biz.templatestaffconfig.TemplateStaffConfigService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 10:36
+ */
+@Service
+public class WechatTemplateService extends MybatisBaseService<WechatTemplateMapper, WechatTemplate> {
+
+    @Autowired
+    private TemplateStaffConfigService templateStaffConfigService;
+
+
+    public PagerVo<WechatTemplateVo> listPageVo(PagerQuery<WechatTemplateQuery> pq) {
+        WechatTemplateQuery query = pq.getParams();
+        QueryWrapper<WechatTemplate> qw = new QueryWrapper<>();
+        IPage<WechatTemplate> page = PagerUtil.queryToPage(pq);
+        IPage<WechatTemplateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<WechatTemplateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean save(WechatTemplateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+
+        WechatTemplate entity=new WechatTemplate();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        List<TemplateStaffConfig> entitys=new ArrayList<>();
+        if(dto.getTemplateStaffConfigs().size()>0){
+            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
+                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
+                templateStaffConfig.setTemplateSid(entity.getSid());
+                entitys.add(templateStaffConfig);
+            }
+
+            templateStaffConfigService.saveBatch(entitys);
+        }
+        return rb.success().setMsg("添加模板信息成功");
+    }
+    public ResultBean update(WechatTemplateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return rb.success().setMsg("添加模板信息成功");
+        }
+        WechatTemplate entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        List<TemplateStaffConfig> entitys=new ArrayList<>();
+        if(dto.getTemplateStaffConfigs().size()>0){
+            templateStaffConfigService.deleteBySid(entity.getSid());
+            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
+                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
+                templateStaffConfig.setTemplateSid(entity.getSid());
+                entitys.add(templateStaffConfig);
+            }
+            templateStaffConfigService.saveBatch(entitys);
+        }
+        return rb.success().setMsg("添加模板信息成功");
+    }
+    public ResultBean deleteById(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        int i=baseMapper.deleteById(sid);
+        templateStaffConfigService.deleteBySid(sid);
+        return rb.success().setMsg("添加模板信息成功");
+    }
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
index 5e6714dd..c763452d 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
@@ -7,6 +7,7 @@ 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.apache.ibatis.annotations.Delete;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -44,6 +45,9 @@ public interface SysStaffinfoFeign {
     @ApiOperation("员工管理分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<SysStaffinfoVo>> listPage(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
+    @ApiOperation("查询所有的员工")
+    @PostMapping("/getAllStaffinfo")
+    public ResultBean<List<SysStaffinfoVo>> getAllStaffinfo();
     @ApiOperation("员工管理分页列表 新")
     @PostMapping("/listPageNew")
     public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
@@ -82,6 +86,10 @@ public interface SysStaffinfoFeign {
     @ApiOperation("设置离职")
     @PostMapping("/del")
     public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery);
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySid/{sid}")
+    @ResponseBody
+    public ResultBean delBySid(@PathVariable("sid")String sid);
 
     /**
      * 员工信息编辑初始化及详情
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
index ebc92b8c..9409fa2d 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
@@ -31,6 +31,12 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问");
     }
+
+    @Override
+    public ResultBean<List<SysStaffinfoVo>> getAllStaffinfo() {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(PagerQuery<SysStaffinfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -61,6 +67,11 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean delBySid(String sid) {
+        return null;
+    }
+
 
     @Override
     public ResultBean<SysStaffinfoDetailsVo> fetchBySid(String sid) {
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java
index a7ac5725..9e5de19d 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java
@@ -24,15 +24,15 @@ import javax.validation.constraints.NotBlank;
 @ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象")
 @Data
 public class SysUserDto implements Dto {
-	@ApiModelProperty("手机号")
+    @ApiModelProperty("手机号")
     private String mobile;
-	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
     private Integer userType;
     @ApiModelProperty(value = "姓名", required = true)
-    @NotBlank(message = "姓名不能为空")
+    //@NotBlank(message = "姓名不能为空")
     private String name;
     @ApiModelProperty(value = "验证码", required = true)
-    @NotBlank(message = "验证码不能为空")
+    //@NotBlank(message = "验证码不能为空")
     private String verificationCode;
     @ApiModelProperty(value = "部门sid")
     private String deptSid;
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
index 0292162f..5766ba04 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
@@ -114,6 +114,8 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
     int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey,
                     @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason);
 
+    int deleteBySid(@Param("sid") String sid);
+
     /**
      * 查询当前分公司下的员工信息
      *
@@ -122,6 +124,8 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
      */
     List<PcSysStaffVo> selectStaffList(String orgSid);
 
+    List<SysStaffinfoVo> selectAllStaffinfo();
+
     List<Map<String, String>> getStaffName(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
 
     List<Map<String, String>> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
index 123229ce..9f2b9c2c 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
@@ -9,21 +9,21 @@
         SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
         FROM sys_staffinfo staff
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
+        ON staff.sid = user.staffSid
         ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
     </select>
 
     <select id="searchAppContactsPageList"
             resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoAppContactsSearchVo">
         SELECT staff.sid,
-               staff.name,
-               staff.mobile,
-               staff.position,
-               user.headImage,
-               GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
+        staff.name,
+        staff.mobile,
+        staff.position,
+        user.headImage,
+        GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
         FROM sys_staffinfo staff
-                 LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
-                 LEFT JOIN sys_user user ON staff.sid = user.staffSid
+        LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
+        LEFT JOIN sys_user user ON staff.sid = user.staffSid
         WHERE 1 = 1
         <if test="mobileStr != null and mobileStr != ''">
             AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
@@ -49,8 +49,8 @@
                GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
         FROM sys_staffinfo staff
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
-                 LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
+        ON staff.sid = user.staffSid
+            LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
         WHERE staff.sid = #{staffSid}
         GROUP BY staff.sid
     </select>
@@ -68,7 +68,7 @@
         FROM sys_staff_org org
                  INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
+        ON staff.sid = user.staffSid
         WHERE org.orgSid = #{sid}
     </select>
     <!--根据员工类型key查询员工工号的最大号-->
@@ -76,7 +76,7 @@
         select *
         from sys_staffinfo
         order by jobNumber desc
-        limit 1
+            limit 1
     </select>
     <!--根据手机号查询员工是否重复-->
     <select id="selectByMobile" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfo">
@@ -105,24 +105,24 @@
         DATE_FORMAT(si.joinCompnyDate, '%Y-%m-%d') AS joinCompnyDate,
         <!--所在部门-->
         (select GROUP_CONCAT(orgName SEPARATOR ',') orgName from sys_staff_org so where so.staffSid = si.sid) as
-            orgName,
+        orgName,
         <!--所在部门sid-->
         (select GROUP_CONCAT(orgSid SEPARATOR ',') orgSid from sys_staff_org so where so.staffSid = si.sid) as
-            orgSid,
+        orgSid,
         <!--岗位-->
         (select GROUP_CONCAT(sp.name SEPARATOR ',') postName
-         from sys_staff_post ssp
-                  left join sys_post sp on
-                 sp.sid =
-                 ssp.postSid
-         where ssp.staffSid = si.sid
-         group by ssp.id) as postName
+        from sys_staff_post ssp
+        left join sys_post sp on
+        sp.sid =
+        ssp.postSid
+        where ssp.staffSid = si.sid
+        group by ssp.id) as postName
         from sys_staffinfo si
-                 LEFT JOIN sys_staff_org so
-                           ON so.staffSid = si.sid
-                 LEFT JOIN sys_staff_post ssp
-                           ON ssp.staffSid = si.sid
-            ${ew.customSqlSegment}
+        LEFT JOIN sys_staff_org so
+        ON so.staffSid = si.sid
+        LEFT JOIN sys_staff_post ssp
+        ON ssp.staffSid = si.sid
+        ${ew.customSqlSegment}
     </select>
     <select id="pagerListNew" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo">
         SELECT DISTINCT sta.Sid,
@@ -176,7 +176,9 @@
             LEFT JOIN sys_role role ON role.sid = user_role.roleSid
             LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
             LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
-        ${ew.customSqlSegment}
+            left JOIN sys_staff_org staorg on staorg.staffSid=sta.sid
+            left join sys_organization organ on staorg.orgSid=organ.sid
+            ${ew.customSqlSegment}
     </select>
     <!--根据员工手机号和sid查询员工信息是否已存在-->
     <select id="selectByMobileAndSid" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfo">
@@ -304,8 +306,8 @@
         isHaveInsurance,
         <!--意外险参保：1是，0否-->
         case isHaveInsurance
-            when 1 then '是'
-            when 0 then '否' end as isHaveInsuranceValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveInsuranceValue,
         <!--意外险参保时间-->
         DATE_FORMAT(insuranceStartDate, '%Y-%m-%d') as insuranceStartDate,
         <!--意外险参保终止日期-->
@@ -316,26 +318,26 @@
         isHaveAged,
         <!--养老:1是，0否-->
         case isHaveAged
-            when 1 then '是'
-            when 0 then '否' end as isHaveAgedValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveAgedValue,
         <!--医疗:1是，0否-->
         isHaveMedical,
         <!--医疗:1是，0否-->
         case isHaveMedical
-            when 1 then '是'
-            when 0 then '否' end as isHaveMedicalValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveMedicalValue,
         <!--工伤：1是，0否-->
         isHaveInjury,
         <!--工伤：1是，0否-->
         case isHaveInjury
-            when 1 then '是'
-            when 0 then '否' end as isHaveInjuryValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveInjuryValue,
         <!--失业：1是，0否-->
         isHaveUnemploy,
         <!--失业：1是，0否-->
         case isHaveUnemploy
-            when 1 then '是'
-            when 0 then '否' end as isHaveUnemployValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveUnemployValue,
         <!--社保参保地-->
         insuredPlace,
         <!--纸质档案保管地-->
@@ -360,6 +362,11 @@
             quitReason    = #{reason}
         where sid = #{sid}
     </update>
+
+    <delete id="deleteBySid">
+        delete from sys_staffinfo
+        where sid = #{sid}
+    </delete>
     <!--查询当前分公司下的员工信息-->
     <select id="selectStaffList" resultType="com.yxt.supervise.system.sysstaffinfo.PcSysStaffVo">
         select sso.staffSid, si.name staffName
@@ -368,6 +375,10 @@
         where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
     </select>
 
+    <select id="selectAllStaffinfo" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo">
+        select *
+        from sys_staffinfo
+    </select>
     <select id="getStaffName" resultType="java.util.Map">
         SELECT DISTINCT ss.sid, ss.name
         FROM sys_staffinfo ss
@@ -387,23 +398,23 @@
 
     <select id="getUserList" resultType="com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo">
         select su.sid         userSid,
-               si.name        userName,
-               su.headImage,
-               si.mobile      userMobile,
-               sso.orgName as department,
-               sp.name
+        si.name        userName,
+        su.headImage,
+        si.mobile      userMobile,
+        sso.orgName as department,
+        sp.name
         from sys_staff_org sso
-                 left join sys_staffinfo si on sso.staffSid = si.sid
-                 left join sys_user su on si.sid = su.staffSid
-                 left join sys_staff_post ssp on si.sid = ssp.staffSid
-                 left join sys_post sp on sp.sid = ssp.postSid
+        left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on si.sid = su.staffSid
+        left join sys_staff_post ssp on si.sid = ssp.staffSid
+        left join sys_post sp on sp.sid = ssp.postSid
         <where>
             ${ew.sqlSegment}
             <if test="orgSid != null and orgSid != ''">
                 and find_in_set(#{orgSid}
-                  , replace (sso.orgSidPath
-                  , '/'
-                  , ','))
+                , replace (sso.orgSidPath
+                , '/'
+                , ','))
             </if>
         </where>
         group by su.sid
@@ -411,22 +422,22 @@
 
     <select id="getGressionUserList" resultType="com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo">
         select su.sid      as userSid,
-               si.name     as userName,
-               su.headImage,
-               si.mobile   as userMobile,
-               sso.orgName as department,
-               sp.name
+        si.name     as userName,
+        su.headImage,
+        si.mobile   as userMobile,
+        sso.orgName as department,
+        sp.name
         from sys_staff_org sso
-                 left join sys_staffinfo si on sso.staffSid = si.sid
-                 left join sys_user su on si.sid = su.staffSid
-                 left join sys_staff_post ssp on si.sid = ssp.staffSid
-                 left join sys_post sp on sp.sid = ssp.postSid
+        left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on si.sid = su.staffSid
+        left join sys_staff_post ssp on si.sid = ssp.staffSid
+        left join sys_post sp on sp.sid = ssp.postSid
         <where>
             <if test="userOrgSid != null and userOrgSid != ''">
                 and find_in_set(#{userOrgSid}
-                        , replace(sso.orgSidPath
-                                    , '/'
-                                    , ','))
+                , replace(sso.orgSidPath
+                , '/'
+                , ','))
             </if>
         </where>
     </select>
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
index 2d446c9e..4953a174 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
@@ -1,8 +1,10 @@
 package com.yxt.supervise.system.sysstaffinfo;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery;
 import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo;
+import com.yxt.supervise.system.sysuser.SysUser;
 import com.yxt.supervise.system.sysuser.SysUserService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.PagerUtil;
@@ -64,6 +66,11 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         PagerVo<SysStaffinfoVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);
     }
+    public ResultBean<List<SysStaffinfoVo>> getAllStaffinfo() {
+        ResultBean<List<SysStaffinfoVo>> rb = ResultBean.fireFail();
+        List<SysStaffinfoVo> list = sysStaffinfoService.getAllStaffinfo();
+        return rb.success().setData(list);
+    }
     @Override
     public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq) {
         ResultBean<PagerVo<SysStaffinfoVo>> rb = ResultBean.fireFail();
@@ -145,6 +152,22 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return rb.success().setMsg("成功");
     }
 
+    @Override
+    public ResultBean delBySid(String sid) {
+        System.out.println(sid);
+        ResultBean rb = ResultBean.fireFail();
+        //删除员工
+        int i=sysStaffinfoService.delByIds(sid);
+        //删除用户
+        SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
+        sysUserService.delBySid(sysUser.getSid());
+        if(i>0){
+            return rb.success().setMsg("成功");
+        }else{
+            return rb.success().setMsg("失败");
+        }
+    }
+
     @Override
     public ResultBean<SysStaffinfoDetailsVo> fetchBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
index e0137724..8ab49de6 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
@@ -199,7 +199,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         return sysStaffinfoVoIPage;
     }
-
+    public List<SysStaffinfoVo> getAllStaffinfo() {
+        List<SysStaffinfoVo> sysStaffinfoVoList=baseMapper.selectAllStaffinfo();
+        return sysStaffinfoVoList;
+    }
     public IPage<SysStaffinfoVo> lpagerListNew(PagerQuery<SysStaffinfoQuery> pagerQuery) {
         // mybits所用的分页对对象
         IPage<SysStaffinfoQuery> page = PagerUtil.queryToPage(pagerQuery);
@@ -217,12 +220,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             qw.like("role.name", query.getRoleName());
         }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgName())) {
-            qw.like("org.name", query.getOrgName());
+            qw.like("organ.name", query.getOrgName());
         }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getMobile())) {
-            qw.eq("sta.mobile", query.getMobile());
+            qw.like("sta.mobile", query.getMobile());
         }
-        qw.ne("staff.personTypeKey","01");
+//        qw.ne("staff.personTypeKey","01");
         IPage<SysStaffinfoVo> sysStaffinfoVoIPage = baseMapper.pagerListNew(page, qw);
         List<SysStaffinfoVo> records = sysStaffinfoVoIPage.getRecords();
         for (SysStaffinfoVo record : records) {
@@ -459,10 +462,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
 //        }
         //判断身份证号出生日期和填写的出生日期是否相同
-        String idNo = dto.getIdNo();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
-        String birthday = simpleDateFormat.format(dto.getBirthday());
-        String substring = idNo.substring(6, 14);
+//        String idNo = dto.getIdNo();
+//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+//        String birthday = simpleDateFormat.format(dto.getBirthday());
+//        String substring = idNo.substring(6, 14);
 //        if (!birthday.equals(substring)) {
 //            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
 //        }
@@ -554,13 +557,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //        if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
 //            return rb.setMsg("所在部门不能为空");
 //        }
-        sysStaffOrgDto.fillEntity(sysStaffOrg);
+        //sysStaffOrgDto.fillEntity(sysStaffOrg);
+        sysStaffOrg.setOrgSid(sysStaffOrgDto.getOrgSid());
         sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
         sysStaffOrg.setManageType("3");
         sysStaffOrgService.save(sysStaffOrg);
         //增加员工的关联的岗位信息
         SysStaffPost sysStaffPost = new SysStaffPost();
-        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
+        //SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
 //        if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
 //            return rb.setMsg("岗位不能为空");
 //        }
@@ -576,10 +580,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         String md5 = Encodes.md5(password);
         sysUser.setPassword(md5);
         boolean isSave = sysUserService.save(sysUser);
-        sysStaffPostDto.fillEntity(sysStaffPost);
+        //sysStaffPostDto.fillEntity(sysStaffPost);
         sysStaffPost.setStaffSid(sysStaffinfo3.getSid());
         sysStaffPost.setStartDate(new Date());
-        sysStaffPostService.save(sysStaffPost);
+        //sysStaffPostService.save(sysStaffPost);
         if (!isSave) {
             return rb.setMsg("添加员工信息失败");
         }
@@ -817,7 +821,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //        if (sysStaffinfo3 != null) {
 //            return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
 //        }
-        //更新员工基础信息
+        //更新用户基础信息
         BeanUtil.copyProperties(dto, sysStaffinfo);
         sysStaffinfo.setJobNumber(dto.getJobNumber());
         sysStaffinfo.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
@@ -918,14 +922,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
 
         //更新员工的关联的岗位信息
-        SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
-        SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid());
-        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
-        sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid());
+//        SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
+//        SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid());
+//        SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
+//        sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid());
         boolean isUpdate = updateById(sysStaffinfo);
-        if (!isUpdate) {
-            return rb.setMsg("更新员工信息失败");
-        }
+//        if (!isUpdate) {
+//            return rb.setMsg("更新员工信息失败");
+//        }
         List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
         List<String> orgList1 = new ArrayList<>();
         if (sysStaffOrgVos1.size() > 0) {
@@ -940,12 +944,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             }
         }
         List<String> reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList());
-        if (reduce1.size() > 0) {
-            //根据staffSid查询token
-            String token = sysUserService.selectByStaffsid(sid).getToken();
-            //清空该token
-            redisUtil.remove(token);
-        }
+//        if (reduce1.size() > 0) {
+//            //根据staffSid查询token
+//            String token = sysUserService.selectByStaffsid(sid).getToken();
+//            //清空该token
+//            redisUtil.remove(token);
+//        }
         return rb.success().setMsg("更新员工信息成功");
     }
     /**
@@ -1025,7 +1029,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         return count;
     }
+    public int delByIds(String sid) {
+        //更新员工的员工状态以及员工工号
+        int j = baseMapper.deleteBySid(sid);
 
+        return j;
+    }
     public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
         ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
         //根据当前staffSid查询分公司sid
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java
index 54ed2755..1de41e18 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java
@@ -44,6 +44,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUserVo> selectListVo();
 
     public int updatePassword(String sid, String password);
+    public int deleteBySid(String sid);
 
     public int updatePasswordApp(String sid, String password);
 
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
index 99bfd770..d94f7935 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
@@ -5,59 +5,59 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         SELECT DISTINCT user.staffSid,
-                        user.isEnable,
-                        (
-                            SELECT GROUP_CONCAT(org.name)
-                            FROM sys_staff_org staffOrg
-                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                            WHERE staffOrg.staffSid = user.staffSid
-                        )              departmentName,
-                        (
-                            SELECT GROUP_CONCAT(org.sid)
-                            FROM sys_staff_org staffOrg
-                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                            WHERE staffOrg.staffSid = user.staffSid
-                        )              departmentSid,
-                        (
-                            SELECT GROUP_CONCAT(post.name)
-                            FROM sys_staff_post staffPost
-                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-                            WHERE staffPost.staffSid = user.staffSid
-                        )              postName,
-                        (
-                            SELECT GROUP_CONCAT(post.sid)
-                            FROM sys_staff_post staffPost
-                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-                            WHERE staffPost.staffSid = user.staffSid
-                        )              postSid,
-                        user.userName,
-                        user.sid       sid,
-                        staff.name,
-                        (
-                            SELECT GROUP_CONCAT(role.name)
-                            FROM sys_user_role user_role
-                                     LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-                            WHERE user_role.userSid = USER.sid
-                        )              roleName,
-                        dict.dictValue userType,
-                        user.userType  userTypeKey
+        user.isEnable,
+        (
+        SELECT GROUP_CONCAT(org.name)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid
+        )              departmentName,
+        (
+        SELECT GROUP_CONCAT(org.sid)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid
+        )              departmentSid,
+        (
+        SELECT GROUP_CONCAT(post.name)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        )              postName,
+        (
+        SELECT GROUP_CONCAT(post.sid)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        )              postSid,
+        user.userName,
+        user.sid       sid,
+        staff.name,
+        (
+        SELECT GROUP_CONCAT(role.name)
+        FROM sys_user_role user_role
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        WHERE user_role.userSid = USER.sid
+        )              roleName,
+        dict.dictValue userType,
+        user.userType  userTypeKey
         FROM sys_user USER
-                 LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
-                 LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-                 LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
-                 LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
+        LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
+        LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
         <where>
             ${ew.sqlSegment}
             <if test="orgName != null and orgName != ''">
                 AND (SELECT GROUP_CONCAT(org.name)
-                     FROM sys_staff_org staffOrg
-                              LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                     WHERE staffOrg.staffSid = user.staffSid)
-                    LIKE concat('%',
-                    #{orgName}
-                    ,
-                    '%'
-                    )
+                FROM sys_staff_org staffOrg
+                LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                WHERE staffOrg.staffSid = user.staffSid)
+                LIKE concat('%',
+                #{orgName}
+                ,
+                '%'
+                )
             </if>
             <if test="userName != null and userName != ''">
                 and
@@ -146,6 +146,10 @@
         set password=#{param2}
         where sid = #{param1}
     </update>
+    <delete id="deleteBySid">
+        delete from  sys_user
+        where sid = #{sid}
+    </delete>
     <update id="updatePasswordApp">
         update sys_user
         set password=#{param2}
@@ -203,7 +207,7 @@
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
         ORDER BY sso.id
-        LIMIT 1
+            LIMIT 1
     </select>
     <!--根据用户的sid查询用户的组织信息:多个时取第一个-->
     <select id="selectUserInfoByUserSid" resultType="com.yxt.supervise.system.sysuser.SysUserInfoVo">
@@ -214,7 +218,7 @@
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
         ORDER BY sso.id
-        LIMIT 1
+            LIMIT 1
     </select>
 
     <select id="selectUserInfoByUserSidOne" resultType="com.yxt.supervise.system.sysuser.SysUserInfoVo">
@@ -226,7 +230,7 @@
         WHERE su.sid = #{userSid}
           and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
         ORDER BY sso.id
-        LIMIT 1
+            LIMIT 1
     </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
@@ -271,12 +275,12 @@
     <select id="getUserByRole" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
         from sys_user_role sr
-                 left join sys_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
-                 left join sys_staff_org so on so.staffSid = si.sid
+        left join sys_user su on sr.userSid = su.sid
+        left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
-          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
-          and si.personTypeKey != '01'
+        and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+        and si.personTypeKey != '01'
     </select>
 
     <select id="getUserByOrgSid" resultType="java.util.Map">
@@ -302,7 +306,7 @@
     <select id="fetchBySids" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         select su.*, ss.name
         from sys_user su
-                 left join sys_staffinfo ss on su.staffSid = ss.sid
+        left join sys_staffinfo ss on su.staffSid = ss.sid
         where su.sid in
         <foreach collection="sids" index="index" item="item" open="(" separator="," close=")">
             #{item}
@@ -340,12 +344,12 @@
     <select id="getUserMessageByRole" resultType="com.yxt.supervise.system.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid,so.orgSidPath
         from sys_user_role sr
-                 left join sys_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
-                 left join sys_staff_org so on so.staffSid = si.sid
+        left join sys_user su on sr.userSid = su.sid
+        left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
-          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
-          and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in
+        and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+        and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>

From 0f6aaadd4dff485189ca29949e8b4d4666ea4ee4 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Mon, 10 Apr 2023 18:32:37 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E5=9C=A8=E9=80=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InTransitCheckVo.java                     | 49 +++++++++++++++
 .../PurchaseRequisitionCheckVo.java           |  2 +-
 .../supplierbankinfo/SupplierBankInfo.java    |  7 ++-
 .../PurchaseRequisitionMapper.java            |  3 +
 .../PurchaseRequisitionService.java           | 12 ++++
 .../SupplierBankInfoService.java              | 62 +++++++++++++++++--
 6 files changed, 127 insertions(+), 8 deletions(-)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java

diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java
new file mode 100644
index 00000000..38c52534
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java
@@ -0,0 +1,49 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+public class InTransitCheckVo {
+
+    public InTransitCheckVo() {
+    }
+
+    public InTransitCheckVo(String supplierOnlyCode ) {
+        this.supplierOnlyCode = supplierOnlyCode;
+//        this.supplierName = supplierName;
+    }
+
+    private String supplierOnlyCode;
+//    private String supplierName;
+    private double orderAmount = 0.0;
+    private double instorageAmount = 0.0;
+
+    public String getSupplierOnlyCode() {
+        return supplierOnlyCode;
+    }
+
+    public void setSupplierOnlyCode(String supplierOnlyCode) {
+        this.supplierOnlyCode = supplierOnlyCode;
+    }
+
+//    public String getSupplierName() {
+//        return supplierName;
+//    }
+//
+//    public void setSupplierName(String supplierName) {
+//        this.supplierName = supplierName;
+//    }
+
+    public double getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(double orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public double getInstorageAmount() {
+        return instorageAmount;
+    }
+
+    public void setInstorageAmount(double instorageAmount) {
+        this.instorageAmount = instorageAmount;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
index 091f563b..a646c4e7 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
@@ -16,7 +16,7 @@ public class PurchaseRequisitionCheckVo {
     private String supplierName;
     private String supplierCodeUnified;
 
-    private int resState = 0; // 0=正常；1=无供应商信息；2=供应商编码不符；3=有在途；4=供应商索引编码重复；5=没有对应订单
+    private int resState = 0; // 0=正常；1=无供应商信息；2=供应商编码不符；3=有在途；4=供应商索引编码重复；5=没有对应订单；6=供应商没审核
     private String msg;
 
     public String getPrSid() {
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java
index 0db7b0b0..5d54b937 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java
@@ -38,16 +38,17 @@ public class SupplierBankInfo extends BaseEntity {
     @ApiModelProperty("营业执照号")
     private String businessLicenseNo; // 营业执照号
     @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝")
-    private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝
+    private Integer purchaseRequisition = 0; // 监管审核状态0待审核1为通过2为拒绝
     @ApiModelProperty("监管审批意见")
     private String purchaseRemarks; // 监管审批意见
     @ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
-    private Integer bankState; // 银行0未审核，1审核通过，2审核不通过
+    private Integer bankState = 0; // 银行0未审核，1审核通过，2审核不通过
     @ApiModelProperty("银行审批意见")
     private String bankRemarks; // 银行审批意见
     @ApiModelProperty("锁定状态1.锁定2.未锁定 ")
-    private Integer lockingStatus;
+    private Integer lockingStatus = 1;
     @ApiModelProperty("锁定原因")
     private String lockingReason;
 
+
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java
index 10cf5175..3eaf5012 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java
@@ -14,6 +14,7 @@ import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand;
 import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -27,4 +28,6 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     IPage<PurchaseRequisitionVo> selectPageVo(IPage<PurchaseRequisition> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
     //查询导出的数据
     List<PurchaseRequisitionExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
+    @Select("")
+    double amountBySupplierOnlyCode(@Param("") String supplierOnlyCode);
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
index 057fa0f4..50298840 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
@@ -6,6 +6,7 @@ import com.alibaba.excel.read.builder.ExcelReaderBuilder;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -279,4 +280,15 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
             }
         };
     }
+
+    public void updateOnlyCodeBySid(String sid, String codeUnified) {
+        UpdateWrapper<PurchaseRequisition> uw = new UpdateWrapper<>();
+        uw.set("supplierOnlyCode", codeUnified);
+        uw.eq("sid", sid);
+        this.update(uw);
+    }
+
+    public double amountOfSupplier(String supplierOnlyCode) {
+        return baseMapper.amountBySupplierOnlyCode(supplierOnlyCode);
+    }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
index e328ee13..fb171eac 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
@@ -34,6 +34,7 @@ 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.purchaserequisition.PurchaseRequisition;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.InTransitCheckVo;
 import com.yxt.supervise.customer.api.supplierbankinfo.*;
 import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
 import com.yxt.supervise.customer.api.supplierindex.SupplierIndex;
@@ -250,6 +251,21 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
     }
 
     public List<PurchaseRequisitionCheckVo> checkPurchaseRequisition(String purchaseRequisitionSid) {
+        List<PurchaseRequisitionCheckVo> list = checkSupplierByPRSid(purchaseRequisitionSid);
+        if (list.isEmpty()) {
+            PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
+            if (pr == null) {
+                PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(purchaseRequisitionSid, "", 5);
+                vo.setMsg("没有对应采购订单");
+                list.add(vo);
+                return list;
+            }
+            list = checkInTransitByUniCode(pr.getSupplierOnlyCode());
+        }
+        return list;
+    }
+
+    public List<PurchaseRequisitionCheckVo> checkSupplierByPRSid(String purchaseRequisitionSid) {
         List<PurchaseRequisitionCheckVo> list = new ArrayList<>();
         PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
         if (pr == null) {
@@ -288,16 +304,52 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
             } else {
                 String sbiCodeUnified = sbi.getCodeUnified();
                 String sbiSid = sbi.getSid();
+                String name = sbi.getName();
+                SupplierIndex sui = new SupplierIndex();
+                sui.setPSid(sbiSid);
+                sui.setCode(supplierCode);
+                sui.setName(supplierName);
+                sui.setCodeUnified(sbiCodeUnified);
+                sui.setNameUnified(name);
+                supplierIndexService.save(sui);
+                if (StringUtils.isBlank(supplierOnlyCode)) {
+                    purchaseRequisitionService.updateOnlyCodeBySid(purchaseRequisitionSid, sbiCodeUnified);
+                }
+                Integer purchaseRequisition = sbi.getPurchaseRequisition();
+                Integer bankState = sbi.getBankState();
+                Integer lockingStatus = sbi.getLockingStatus();
+                if (purchaseRequisition != null && purchaseRequisition.equals(1) && bankState != null && bankState.equals(1) && lockingStatus != null && lockingStatus.equals(0))
+                    return list;
 
+                PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 6);
+                vo.setSupplierCode(supplierCode);
+                vo.setSupplierName(supplierName);
+                vo.setSupplierCodeUnified(supplierOnlyCode);
+                vo.setMsg("该供应商没有审核");
+                list.add(vo);
+                return list;
             }
         }
 
-        SupplierIndex si = null;
-        if (si == null) {
+        SupplierIndex si = silist.get(0);
+        SupplierBankInfo supplierBankInfo = this.fetchBySid(si.getPSid());
+        if (supplierBankInfo == null) {
 
         }
 
+        Integer purchaseRequisition = supplierBankInfo.getPurchaseRequisition();
+        Integer bankState = supplierBankInfo.getBankState();
+        Integer lockingStatus = supplierBankInfo.getLockingStatus();
 
+        if (purchaseRequisition != null && purchaseRequisition.equals(1) && bankState != null && bankState.equals(1) && lockingStatus != null && lockingStatus.equals(0))
+            return list;
+
+        PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 6);
+        vo.setSupplierCode(supplierCode);
+        vo.setSupplierName(supplierName);
+        vo.setSupplierCodeUnified(supplierOnlyCode);
+        vo.setMsg("该供应商没有审核");
+        list.add(vo);
         return list;
     }
 
@@ -310,7 +362,9 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
         return list.get(0);
     }
 
-    public void checkInTransitByUniCode(String supplierOnlyCode) {
-
+    public InTransitCheckVo checkInTransitByUniCode(String supplierOnlyCode) {
+        InTransitCheckVo vo = new InTransitCheckVo(supplierOnlyCode);
+        vo.setOrderAmount(purchaseRequisitionService.amountOfSupplier(supplierOnlyCode));
+        return vo;
     }
 }
\ No newline at end of file

From 5a660ffa4ba2db7d808a59037834e076969e4082 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Tue, 11 Apr 2023 10:45:49 +0800
Subject: [PATCH 17/23] sql

---
 docs/databases/table_modify.sql               |  1 +
 .../InTransitCheckVo.java                     | 12 ++-
 .../customer/biz/gdinstorage/GdInstorage.java | 75 ++++++++++++++++
 .../biz/gdinstorage/GdInstorageMapper.java    | 58 +++++++++++++
 .../biz/gdinstorage/GdInstorageRest.java      | 58 +++++++++++++
 .../biz/gdinstorage/GdInstorageService.java   | 85 +++++++++++++++++++
 .../customer/biz/gdinstorage/GdRukuQuery.java | 47 ++++++++++
 .../PurchaseRequisitionMapper.java            |  6 +-
 .../SupplierBankInfoService.java              | 14 ++-
 9 files changed, 351 insertions(+), 5 deletions(-)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java

diff --git a/docs/databases/table_modify.sql b/docs/databases/table_modify.sql
index 50a5f8d7..e8091fba 100644
--- a/docs/databases/table_modify.sql
+++ b/docs/databases/table_modify.sql
@@ -33,3 +33,4 @@ ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD distributionAmoun
 ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD preqCode varchar(100) DEFAULT NULL COMMENT '订单编号';
 
 
+ALTER TABLE supervise_supplychain.purchase_requisition_pro MODIFY COLUMN packageTotalPrice double(12,2) NULL COMMENT '包合计（元）（对应采购订单中的送货金额）';
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java
index 38c52534..3d9f61ca 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java
@@ -5,13 +5,13 @@ public class InTransitCheckVo {
     public InTransitCheckVo() {
     }
 
-    public InTransitCheckVo(String supplierOnlyCode ) {
+    public InTransitCheckVo(String supplierOnlyCode) {
         this.supplierOnlyCode = supplierOnlyCode;
 //        this.supplierName = supplierName;
     }
 
     private String supplierOnlyCode;
-//    private String supplierName;
+    //    private String supplierName;
     private double orderAmount = 0.0;
     private double instorageAmount = 0.0;
 
@@ -46,4 +46,12 @@ public class InTransitCheckVo {
     public void setInstorageAmount(double instorageAmount) {
         this.instorageAmount = instorageAmount;
     }
+
+    public boolean getHasInTransit() {
+        return this.getOrderAmount() > this.getInstorageAmount();
+    }
+
+    public double getAmountOfInTransit() {
+        return this.getOrderAmount() - this.getInstorageAmount();
+    }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java
new file mode 100644
index 00000000..216ae474
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorage.java
@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.biz.gdinstorage;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdInstorage.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorage <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 0:57 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_instorage")
+public class GdInstorage extends EntityWithId {
+
+    private String cola0; // 企业组织机构代码证
+    private String colb1; // 仓库/门店编号
+    private String colc2; // 仓库/门店名称
+    private String cold3; // 入库时间
+    private String colex; // 供应商编号
+    private String cole4; // 供应商名称
+    private String colf5; // 单据号
+    private String colg6; // 单据类型
+    private String colh7; // 货号
+    private String coli8; // 商品名称
+    private String colj9; // 商品生产日期
+    private String colk10; // 商品保质期
+    private String coll11; // 商品规格
+    private String colm12; // 类别编号
+    private String coln13; // 类别名称
+    private String colo14; // 一级类别名称
+    private String colp15; // 二级类别名称
+    private String colq16; // 入库金额
+    private String colr17; // 入库数量
+    private String cols18; // 成本金额
+    private String colt19; // 成本税额
+    private String colu20; // 不含税成本
+    private String colv21; // 进项税率
+    private String orderDate; // 单据日期
+    private String supplierCodeUnified; // 供货商编码统一
+    private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java
new file mode 100644
index 00000000..5a6823d1
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageMapper.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.biz.gdinstorage;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdInstorageMapper.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageMapper <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 1:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface GdInstorageMapper extends BaseMapper<GdInstorage> {
+
+    @Delete("delete from gd_instorage where orderDate=#{orderDate} ")
+    void clearByOrderDate(@Param("orderDate") String orderDate);
+
+    @Select("select CONVERT(IFNULL(sum(colq16),0),DECIMAL(12,2)) as amount from gd_instorage where orderDate=#{orderDate}")
+    double amountOfDay(@Param("orderDate") String orderDate);
+
+    @Select("select CONVERT(IFNULL(sum(colq16),0),DECIMAL(12,2)) as amount from gd_instorage where supplierCodeUnified=#{supplierCodeUnified}")
+    double amountOfSupplier(@Param("supplierCodeUnified") String supplierOnlyCode);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java
new file mode 100644
index 00000000..147f2f56
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0/  =  /0                       *
+ *                     ___/`---'/___                     *
+ *                   .' /|     |// '.                   *
+ *                  / /|||  :  |||// /                  *
+ *                 / _||||| -:- |||||- /                 *
+ *                |   | //  -  /// |   |                *
+ *                | /_|  ''/---/''  |_/ |                *
+ *                /  .-/__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--/  `. .'___              *
+ *           ."" '<  `.___/_<|>_/___.' >' "".            *
+ *          | | :  `- /`.;`/ _ /`;.`/ - ` : | |          *
+ *          /  / `_.   /_ __/ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ /_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.biz.gdinstorage;
+
+import cn.hutool.core.util.StrUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdInstorageRest.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageRest <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 1:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@RestController("com.yxt.supervise.portal.biz.gdinstorage.GdInstorageRest")
+@RequestMapping("/ruku")
+public class GdInstorageRest {
+
+    @Autowired
+    private GdInstorageService gdInstorageService;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java
new file mode 100644
index 00000000..ac878957
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageService.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.biz.gdinstorage;
+
+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.config.component.FileUploadComponent;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdInstorageService.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageService <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/3 1:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class GdInstorageService extends ServiceImpl<GdInstorageMapper, GdInstorage> {
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    public PagerVo<GdInstorage> listPageVo(PagerQuery<GdRukuQuery> pq) {
+
+        GdRukuQuery query = pq.getParams();
+        QueryWrapper<GdInstorage> qw = new QueryWrapper<>();
+        qw.orderByDesc("orderDate");
+        IPage<GdInstorage> page = PagerUtil.queryToPage(pq);
+        IPage<GdInstorage> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<GdInstorage> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void clearByOrderDate(String orderDate) {
+        baseMapper.clearByOrderDate(orderDate);
+    }
+
+    /**
+     * 112仓某一天的入库金额
+     *
+     * @param orderDate
+     * @return
+     */
+    public double amountOfDay(String orderDate) {
+        return baseMapper.amountOfDay(orderDate);
+    }
+
+    public double amountOfSupplier(String supplierOnlyCode) {
+        return baseMapper.amountOfSupplier(supplierOnlyCode);
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java
new file mode 100644
index 00000000..915e0cf3
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdRukuQuery.java
@@ -0,0 +1,47 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.biz.gdinstorage;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: GdRukuQuery.java <br/>
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdRukuQuery <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022/12/10 21:15 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class GdRukuQuery implements Query {
+    private String orderDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java
index 3eaf5012..a0400b5a 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java
@@ -28,6 +28,8 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     IPage<PurchaseRequisitionVo> selectPageVo(IPage<PurchaseRequisition> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
     //查询导出的数据
     List<PurchaseRequisitionExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
-    @Select("")
-    double amountBySupplierOnlyCode(@Param("") String supplierOnlyCode);
+    @Select("select  sum(packageTotalPrice) amount from purchase_requisition_pro prp " +
+            "left join purchase_requisition pr on pr.sid =prp.mainSid " +
+            "where pr.purchaseState=1 and pr.bankState=1 and pr.supplierOnlyCode=#{supplierOnlyCode}")
+    double amountBySupplierOnlyCode(@Param("supplierOnlyCode") String supplierOnlyCode);
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
index fb171eac..1712fb51 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java
@@ -38,6 +38,7 @@ import com.yxt.supervise.customer.api.purchaserequisitionpro.InTransitCheckVo;
 import com.yxt.supervise.customer.api.supplierbankinfo.*;
 import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
 import com.yxt.supervise.customer.api.supplierindex.SupplierIndex;
+import com.yxt.supervise.customer.biz.gdinstorage.GdInstorageService;
 import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService;
 import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService;
 import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService;
@@ -70,6 +71,8 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
 
     @Autowired
     private PurchaseRequisitionService purchaseRequisitionService;
+    @Autowired
+    private GdInstorageService gdInstorageService;
 
     private QueryWrapper<SupplierBankInfo> createQueryWrapper(SupplierBankInfoQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -260,7 +263,15 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
                 list.add(vo);
                 return list;
             }
-            list = checkInTransitByUniCode(pr.getSupplierOnlyCode());
+            InTransitCheckVo ivo = checkInTransitByUniCode(pr.getSupplierOnlyCode());
+            if (ivo.getHasInTransit()) {
+                PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(purchaseRequisitionSid, "", 3);
+                vo.setSupplierCode(pr.getSupplierCode());
+                vo.setSupplierName(pr.getSupplierName());
+                vo.setSupplierCodeUnified(pr.getSupplierOnlyCode());
+                vo.setMsg("供应商[" + pr.getSupplierName() + "]有在途货值");
+                list.add(vo);
+            }
         }
         return list;
     }
@@ -365,6 +376,7 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
     public InTransitCheckVo checkInTransitByUniCode(String supplierOnlyCode) {
         InTransitCheckVo vo = new InTransitCheckVo(supplierOnlyCode);
         vo.setOrderAmount(purchaseRequisitionService.amountOfSupplier(supplierOnlyCode));
+        vo.setInstorageAmount(gdInstorageService.amountOfSupplier(supplierOnlyCode));
         return vo;
     }
 }
\ No newline at end of file

From 50a22f1897fde071e63bb868b851f16dcea857b6 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 11 Apr 2023 11:08:25 +0800
Subject: [PATCH 18/23] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/databases/table_create.sql | 46 ++++++++++++++++++++++++++++++++-
 docs/databases/table_modify.sql |  2 +-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/docs/databases/table_create.sql b/docs/databases/table_create.sql
index fb42596f..2ce72046 100644
--- a/docs/databases/table_create.sql
+++ b/docs/databases/table_create.sql
@@ -20,4 +20,48 @@ CREATE TABLE `purchase_requisition_checked` (
 	`billType` VARCHAR(100) NULL DEFAULT NULL COMMENT '单据类型',
 	
 	PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB  COMMENT='采购订单检查结果';
\ No newline at end of file
+) ENGINE=InnoDB  COMMENT='采购订单检查结果';
+
+
+DROP TABLE IF EXISTS `wechat_template`;
+CREATE TABLE `wechat_template`  (
+                                    `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+                                    `sid` varchar(64) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL,
+                                    `templateId` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '模板ID',
+                                    `title` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '标题',
+                                    `json` json NULL COMMENT 'json',
+                                    `trade` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '行业',
+                                    `lockVersion` VARCHAR(2) NULL DEFAULT NULL COMMENT '记录版本，锁',
+                                    `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+                                    `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+                                    `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+                                    `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
+                                    `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
+                                    `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+                                    `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+                                    `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+                                    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '微信信息推送模版表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `template_staff_config`;
+CREATE TABLE `template_staff_config`  (
+                                          `id` int(0) NOT NULL AUTO_INCREMENT,
+                                          `sid` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL,
+                                          `templateSid` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '模板sid',
+                                          `staffSid` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '员工sid',
+                                          `lockVersion` int(0) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+                                          `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+                                          `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+                                          `isEnable` int(0) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+                                          `state` int(0) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+                                          `isDelete` int(0) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+                                          `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+                                          `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+                                          `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+                                          PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/docs/databases/table_modify.sql b/docs/databases/table_modify.sql
index e8091fba..20989fc1 100644
--- a/docs/databases/table_modify.sql
+++ b/docs/databases/table_modify.sql
@@ -31,6 +31,6 @@ ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD remarks varchar(2
 ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD taxInclusiveAmount DOUBLE(12,2) DEFAULT NULL COMMENT '含税金额';
 ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD distributionAmount DOUBLE(12,2) DEFAULT NULL COMMENT '配货金额';
 ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD preqCode varchar(100) DEFAULT NULL COMMENT '订单编号';
-
+ALTER TABLE yxt_portal.sys_staffinfo ADD openId varchar(100) DEFAULT NULL COMMENT '微信openId';
 
 ALTER TABLE supervise_supplychain.purchase_requisition_pro MODIFY COLUMN packageTotalPrice double(12,2) NULL COMMENT '包合计（元）（对应采购订单中的送货金额）';

From 17dddd5c4590b1639f9a30acfb59b3f0adc9244c Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 11 Apr 2023 11:24:30 +0800
Subject: [PATCH 19/23] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/databases/table_create.sql | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/databases/table_create.sql b/docs/databases/table_create.sql
index 2ce72046..a6a7c0d7 100644
--- a/docs/databases/table_create.sql
+++ b/docs/databases/table_create.sql
@@ -23,29 +23,6 @@ CREATE TABLE `purchase_requisition_checked` (
 ) ENGINE=InnoDB  COMMENT='采购订单检查结果';
 
 
-DROP TABLE IF EXISTS `wechat_template`;
-CREATE TABLE `wechat_template`  (
-                                    `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
-                                    `sid` varchar(64) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL,
-                                    `templateId` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '模板ID',
-                                    `title` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '标题',
-                                    `json` json NULL COMMENT 'json',
-                                    `trade` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '行业',
-                                    `lockVersion` VARCHAR(2) NULL DEFAULT NULL COMMENT '记录版本，锁',
-                                    `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
-                                    `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
-                                    `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
-                                    `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
-                                    `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
-                                    `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
-                                    `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
-                                    `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
-                                    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '微信信息推送模版表' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
-
 DROP TABLE IF EXISTS `template_staff_config`;
 CREATE TABLE `template_staff_config`  (
                                           `id` int(0) NOT NULL AUTO_INCREMENT,
@@ -62,6 +39,29 @@ CREATE TABLE `template_staff_config`  (
                                           `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
                                           `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
                                           PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `wechat_template`;
+CREATE TABLE `wechat_template`  (
+                                    `id` int(0) NOT NULL,
+                                    `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_croatian_ci NOT NULL,
+                                    `templateId` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NOT NULL COMMENT '模板ID',
+                                    `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '标题',
+                                    `json` json NULL COMMENT 'json',
+                                    `trade` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '行业',
+                                    `lockVersion` int(0) NOT NULL DEFAULT 0 COMMENT '记录版本，锁',
+                                    `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录创建时间',
+                                    `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '记录最后修改时间',
+                                    `isEnable` int(0) NOT NULL DEFAULT 1 COMMENT '记录是否可用，1:可用，0:不可用',
+                                    `state` int(0) NULL DEFAULT 1 COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+                                    `isDelete` int(0) NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+                                    `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
+                                    `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+                                    `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+                                    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '微信信息推送模版表' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file

From 5250e60ceccfd1e3396e8a1996c859dbef688089 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 11 Apr 2023 18:22:48 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3=E3=80=81=E8=B4=B7=E6=AC=BE?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/databases/table_create.sql               | 53 +++++++++++++-
 .../LoanBankInformation.java                  | 35 +++++++++
 .../LoanBankInformationDetailsVo.java         | 37 ++++++++++
 .../LoanBankInformationDto.java               | 37 ++++++++++
 .../LoanBankInformationFeign.java             | 29 ++++++++
 .../LoanBankInformationFeignFallback.java     | 20 ++++++
 .../LoanBankInformationQuery.java             | 37 ++++++++++
 .../LoanBankInformationVo.java                | 37 ++++++++++
 .../LoanBankInformationMapper.java            | 23 ++++++
 .../LoanBankInformationMapper.xml             | 20 ++++++
 .../LoanBankInformationRest.java              | 54 ++++++++++++++
 .../LoanBankInformationService.java           | 65 +++++++++++++++++
 .../api/wechattemplate/WechatTemplateDto.java |  9 ++-
 .../wechattemplate/WechatTemplateQuery.java   |  2 +-
 .../api/wechattemplate/WechatTemplateVo.java  |  5 ++
 .../portal/api/wechattemplate/content.java    | 13 ++++
 .../supervise-portal-biz/pom.xml              | 38 ++++++++++
 .../wechattemplate/WechatTemplateMapper.java  |  1 +
 .../wechattemplate/WechatTemplateMapper.xml   |  4 +-
 .../wechattemplate/WechatTemplateRest.java    |  9 ++-
 .../wechattemplate/WechatTemplateService.java | 71 ++++++++++++-------
 21 files changed, 564 insertions(+), 35 deletions(-)
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformation.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDetailsVo.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeign.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeignFallback.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationQuery.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java

diff --git a/docs/databases/table_create.sql b/docs/databases/table_create.sql
index a6a7c0d7..af20ae9b 100644
--- a/docs/databases/table_create.sql
+++ b/docs/databases/table_create.sql
@@ -64,4 +64,55 @@ CREATE TABLE `wechat_template`  (
                                     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '微信信息推送模版表' ROW_FORMAT = Dynamic;
 
-SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `loan_bank_information`;
+CREATE TABLE `loan_bank_information`  (
+                                          `id` int(0) NOT NULL AUTO_INCREMENT,
+                                          `sid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NOT NULL COMMENT 'ids',
+                                          `bankName` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行名称',
+                                          `bankAbbreviation` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行简称',
+                                          `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '地址',
+                                          `province` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '省',
+                                          `city` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '市',
+                                          `county` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '区',
+                                          `contacts` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '联系人',
+                                          `telephone` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
+                                          `pSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT '0' COMMENT '上级sid',
+                                          `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+                                          `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+                                          `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+                                          `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
+                                          `state` int(0) NULL DEFAULT 1 COMMENT '状态',
+                                          `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
+                                          `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                          `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
+                                          `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
+                                          PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '贷款银行信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+DROP TABLE IF EXISTS `bank_manager`;
+CREATE TABLE `bank_manager`  (
+                                 `id` int(0) NOT NULL AUTO_INCREMENT,
+                                 `sid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL,
+                                 `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '姓名',
+                                 `telephone` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
+                                 `post` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '职务',
+                                 `bankSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行sid',
+                                 `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+                                 `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+                                 `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+                                 `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
+                                 `state` int(0) NULL DEFAULT 1 COMMENT '状态',
+                                 `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
+                                 `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                 `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
+                                 `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
+                                 PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '银行负责人信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformation.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformation.java
new file mode 100644
index 00000000..52ca27f2
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformation.java
@@ -0,0 +1,35 @@
+package com.yxt.supervise.crm.api.loanbankinformation;
+
+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/11 16:04
+ */
+@Data
+@ApiModel(value = "贷款银行信息", description = "贷款银行信息")
+@TableName("loan_bank_information")
+public class LoanBankInformation extends BaseEntity {
+    @ApiModelProperty("银行名称")
+    private String bankName;
+    @ApiModelProperty("银行简称")
+    private String bankAbbreviation;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("上级sid")
+    private String pSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDetailsVo.java
new file mode 100644
index 00000000..c6c0607e
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDetailsVo.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.crm.api.loanbankinformation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:07
+ */
+@Data
+@ApiModel(value = "贷款银行信息 视图数据详情", description = "贷款银行信息 视图数据详情")
+public class LoanBankInformationDetailsVo implements Vo {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("银行名称")
+    private String bankName;
+    @ApiModelProperty("银行简称")
+    private String bankAbbreviation;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("上级sid")
+    private String pSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java
new file mode 100644
index 00000000..a2b2f6b8
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.crm.api.loanbankinformation;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:07
+ */
+@ApiModel(value = "贷款银行信息 数据传输对象", description = "贷款银行信息 数据传输对象")
+@Data
+public class LoanBankInformationDto implements Dto {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("银行名称")
+    private String bankName;
+    @ApiModelProperty("银行简称")
+    private String bankAbbreviation;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("上级sid")
+    private String pSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeign.java
new file mode 100644
index 00000000..c92ee1a2
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeign.java
@@ -0,0 +1,29 @@
+package com.yxt.supervise.crm.api.loanbankinformation;
+
+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.crm.api.loanbankinformation.LoanBankInformationFeignFallback;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationQuery;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo;
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:08
+ */
+@Api(tags = "贷款银行信息")
+@FeignClient(
+        contextId = "supervise-crm-LoanBankInformation",
+        name = "supervise-crm",
+        path = "v1/loanbankinformation",
+        fallback = LoanBankInformationFeignFallback.class)
+public interface LoanBankInformationFeign {
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanBankInformationVo>> listPage(@RequestBody PagerQuery<LoanBankInformationQuery> pq);
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeignFallback.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeignFallback.java
new file mode 100644
index 00000000..587fed1d
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationFeignFallback.java
@@ -0,0 +1,20 @@
+package com.yxt.supervise.crm.api.loanbankinformation;
+
+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.crm.api.loanbankinformation.LoanBankInformationQuery;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:08
+ */
+@Component
+public class LoanBankInformationFeignFallback implements LoanBankInformationFeign{
+    @Override
+    public ResultBean<PagerVo<LoanBankInformationVo>> listPage(PagerQuery<LoanBankInformationQuery> pq) {
+        return null;
+    }
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationQuery.java
new file mode 100644
index 00000000..bd3ac693
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationQuery.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.crm.api.loanbankinformation;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:08
+ */
+@ApiModel(value = "贷款银行信息 查询条件", description = "贷款银行信息 查询条件")
+@Data
+public class LoanBankInformationQuery implements Query {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("银行名称")
+    private String bankName;
+    @ApiModelProperty("银行简称")
+    private String bankAbbreviation;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("上级sid")
+    private String pSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java
new file mode 100644
index 00000000..184c62a1
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.crm.api.loanbankinformation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:08
+ */
+@ApiModel(value = "贷款银行信息 视图数据对象", description = "贷款银行信息 视图数据对象")
+@Data
+public class LoanBankInformationVo implements Vo {
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("银行名称")
+    private String bankName;
+    @ApiModelProperty("银行简称")
+    private String bankAbbreviation;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("上级sid")
+    private String pSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java
new file mode 100644
index 00000000..6b599887
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java
@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.biz.loanbankinformation;
+
+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.crm.api.crmcustomertemp.CrmCustomerTemp;
+import com.yxt.supervise.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformation;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:14
+ */
+@Mapper
+public interface LoanBankInformationMapper extends BaseMapper<LoanBankInformation> {
+    IPage<LoanBankInformationVo> selectPageVo(IPage<LoanBankInformation> page, @Param(Constants.WRAPPER) Wrapper<LoanBankInformation> qw);
+    LoanBankInformationVo getBankInformation( @Param("sid") String sid);
+
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml
new file mode 100644
index 00000000..f994f816
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml
@@ -0,0 +1,20 @@
+<?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.crm.biz.loanbankinformation.LoanBankInformationMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo">
+        SELECT *
+        FROM loan_bank_information
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <!--根据客户的微信号以及当前登录者所在部门的sid和登录者所关联的员工sid查询-->
+    <select id="getBankInformation" resultType="com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo">
+        SELECT *
+        FROM loan_bank_information
+        WHERE sid=#{sid}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java
new file mode 100644
index 00000000..a7efc668
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationRest.java
@@ -0,0 +1,54 @@
+package com.yxt.supervise.crm.biz.loanbankinformation;
+
+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.crm.api.loanbankinformation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/11 16:14
+ */
+@Api(tags = "贷款银行信息")
+@RestController
+@RequestMapping("v1/loanbankinformation")
+public class LoanBankInformationRest implements LoanBankInformationFeign {
+
+    @Autowired
+    LoanBankInformationService loanBankInformationService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanBankInformationVo>> listPage(@RequestBody PagerQuery<LoanBankInformationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanBankInformationVo> pv = loanBankInformationService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody LoanBankInformationDto dto) {
+        return loanBankInformationService.save(dto);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody LoanBankInformationDto dto) {
+        return loanBankInformationService.update(dto);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @GetMapping("/getBankInfBySid/{sid}")
+    public ResultBean getBankInformation(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+         LoanBankInformationVo loanBankInformationVo=loanBankInformationService.getBankInformation(sid);
+        return rb.success().setData(loanBankInformationVo);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid) {
+        return loanBankInformationService.delete(sid);
+    }
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java
new file mode 100644
index 00000000..ec1366e0
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java
@@ -0,0 +1,65 @@
+package com.yxt.supervise.crm.biz.loanbankinformation;
+
+import cn.hutool.core.bean.BeanUtil;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformation;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationDto;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationQuery;
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+    * @author wangpengfei
+    * @date 2023/4/11 16:14
+    */
+@Service
+public class LoanBankInformationService extends MybatisBaseService<LoanBankInformationMapper, LoanBankInformation> {
+    public PagerVo<LoanBankInformationVo> listPageVo(PagerQuery<LoanBankInformationQuery> pq) {
+        LoanBankInformationQuery query = pq.getParams();
+        QueryWrapper<LoanBankInformation> qw = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(query.getBankName())){
+            qw.like("bankName",query.getBankName());
+        }
+        if(StringUtils.isNotBlank(query.getTelephone())){
+            qw.like("telephone",query.getTelephone());
+        }
+
+        IPage<LoanBankInformation> page = PagerUtil.queryToPage(pq);
+        IPage<LoanBankInformationVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanBankInformationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean save(LoanBankInformationDto dto) {
+        ResultBean rb=new ResultBean();
+        if(dto.getPSid().equals("")){
+            dto.setSid("0");
+        }
+        LoanBankInformation entity=new LoanBankInformation();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("修改模板信息成功");
+    }
+    public ResultBean update(LoanBankInformationDto dto) {
+        ResultBean rb=new ResultBean();
+        LoanBankInformation entity=new LoanBankInformation();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改模板信息成功");
+    }
+    public LoanBankInformationVo getBankInformation(String sid){
+
+        return baseMapper.getBankInformation(sid);
+    }
+    public ResultBean delete(String sid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<LoanBankInformation>().eq("sid",sid));
+        return rb.success().setMsg("修改模板信息成功");
+    }
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java
index 15dfa53e..7508a091 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java
@@ -22,11 +22,14 @@ public class WechatTemplateDto implements Dto {
     //标题
     @ApiModelProperty("标题")
     private String title;
-    //格式
-    @ApiModelProperty("格式")
-    private String json;
+    //前端传的list格式
+    @ApiModelProperty("前端传的list格式,后台转json")
+    private List<content> text;
     //行业
     @ApiModelProperty("行业")
     private String trade;
+    //详细内容
+    @ApiModelProperty("json")
+    private String json;
     private List<TemplateStaffConfig> templateStaffConfigs;
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java
index d891b613..42954877 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java
@@ -17,7 +17,7 @@ public class WechatTemplateQuery implements Query {
     private String templateId;
     //标题
     @ApiModelProperty("标题")
-    private String title;
+    private String name;
     //格式
     @ApiModelProperty("格式")
     private String json;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java
index 5643c9b8..54c76901 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/4/10 11:35
@@ -13,6 +15,7 @@ import lombok.Data;
 @ApiModel(value = "微信消息模版 视图数据对象", description = "微信消息模版 视图数据对象")
 public class WechatTemplateVo implements Vo {
     private String id;
+    private String sid;
     @ApiModelProperty("模版id")
     private String templateId;
     //标题
@@ -24,4 +27,6 @@ public class WechatTemplateVo implements Vo {
     //行业
     @ApiModelProperty("行业")
     private String trade;
+
+    private List<content> text;
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java
new file mode 100644
index 00000000..41ae85c6
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/content.java
@@ -0,0 +1,13 @@
+package com.yxt.supervise.portal.api.wechattemplate;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/10 18:23
+ */
+@Data
+public class content {
+    private String key;
+    private String value;
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml
index 6073feb7..452ed59b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml
@@ -140,6 +140,44 @@
 <!--            <artifactId>xercesImpl</artifactId>-->
 <!--            <version>2.12.2</version>-->
 <!--        </dependency>-->
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ezmorph</groupId>
+            <artifactId>ezmorph</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <classifier>jdk15</classifier>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.10</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java
index 0fdb43b9..5fd1b9d4 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java
@@ -16,4 +16,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface WechatTemplateMapper extends BaseMapper<WechatTemplate> {
     IPage<WechatTemplateVo> selectPageVo(IPage<WechatTemplate> page, @Param(Constants.WRAPPER) Wrapper<WechatTemplate> qw);
+    WechatTemplateVo getTemplateBySid(@Param("sid") String sid);
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml
index 626fa3b3..e2a0f737 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml
@@ -7,7 +7,7 @@
         SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo">
-        SELECT * FROM wechat_template <where> ${ew.sqlSegment} </where>
+    <select id="getTemplateBySid" resultType="com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo">
+        SELECT * FROM wechat_template <where> sid=#{sid} </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java
index b83c85c6..2248bbd5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java
@@ -29,6 +29,13 @@ public class WechatTemplateRest implements WechatTemplateFeign {
         PagerVo<WechatTemplateVo> pv = wechatTemplateService.listPageVo(pq);
         return rb.success().setData(pv);
     }
+    @ApiOperation("初始化")
+    @GetMapping("/getTemplateBySid/{sid}")
+    public ResultBean<WechatTemplateVo> getTemplateBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WechatTemplateVo pv = wechatTemplateService.getTemplateBySid(sid);
+        return rb.success().setData(pv);
+    }
     @ApiOperation("新增")
     @PostMapping("/save")
     public ResultBean save(@RequestBody WechatTemplateDto dto){
@@ -48,7 +55,7 @@ public class WechatTemplateRest implements WechatTemplateFeign {
     @ResponseBody
     public ResultBean delete(@PathVariable String sid){
         ResultBean rb = ResultBean.fireFail();
-        wechatTemplateService.deleteById(sid);
+        wechatTemplateService.deleteBySid(sid);
         return  rb.success().setMsg(rb.getMsg());
     }
 }
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java
index 222e857f..b6e474cc 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java
@@ -1,6 +1,8 @@
 package com.yxt.supervise.portal.biz.wechattemplate;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -9,16 +11,15 @@ 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.templatestaffconfig.TemplateStaffConfig;
-import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate;
-import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateDto;
-import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery;
-import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo;
+import com.yxt.supervise.portal.api.wechattemplate.*;
 import com.yxt.supervise.portal.biz.templatestaffconfig.TemplateStaffConfigService;
+import net.sf.json.JSONArray;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,29 +36,43 @@ public class WechatTemplateService extends MybatisBaseService<WechatTemplateMapp
     public PagerVo<WechatTemplateVo> listPageVo(PagerQuery<WechatTemplateQuery> pq) {
         WechatTemplateQuery query = pq.getParams();
         QueryWrapper<WechatTemplate> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("title", query.getName());
+        }
         IPage<WechatTemplate> page = PagerUtil.queryToPage(pq);
         IPage<WechatTemplateVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<WechatTemplateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    public WechatTemplateVo getTemplateBySid(String sid) {
+        WechatTemplateVo wechatTemplateVo=baseMapper.getTemplateBySid(sid);
+        String json=wechatTemplateVo.getJson();
+        System.out.println(json);
+        wechatTemplateVo.setText(JSONObject.parseArray(json,content.class));
+        return wechatTemplateVo;
+    }
+
     public ResultBean save(WechatTemplateDto dto) {
         ResultBean rb = ResultBean.fireFail();
 
         WechatTemplate entity=new WechatTemplate();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        JSONArray json = JSONArray.fromObject(dto.getText());
+        entity.setJson(json.toString());
         baseMapper.insert(entity);
-        List<TemplateStaffConfig> entitys=new ArrayList<>();
-        if(dto.getTemplateStaffConfigs().size()>0){
-            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
-                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
-                templateStaffConfig.setTemplateSid(entity.getSid());
-                entitys.add(templateStaffConfig);
-            }
-
-            templateStaffConfigService.saveBatch(entitys);
-        }
+//        List<TemplateStaffConfig> entitys=new ArrayList<>();
+//        if(dto.getTemplateStaffConfigs().size()>0){
+//            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
+//                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
+//                templateStaffConfig.setTemplateSid(entity.getSid());
+//                entitys.add(templateStaffConfig);
+//            }
+//
+//            templateStaffConfigService.saveBatch(entitys);
+//        }
         return rb.success().setMsg("添加模板信息成功");
     }
+
     public ResultBean update(WechatTemplateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
@@ -66,23 +81,25 @@ public class WechatTemplateService extends MybatisBaseService<WechatTemplateMapp
         }
         WechatTemplate entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        JSONArray json = JSONArray.fromObject(dto.getText());
+        entity.setJson(json.toString());
         baseMapper.updateById(entity);
-        List<TemplateStaffConfig> entitys=new ArrayList<>();
-        if(dto.getTemplateStaffConfigs().size()>0){
-            templateStaffConfigService.deleteBySid(entity.getSid());
-            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
-                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
-                templateStaffConfig.setTemplateSid(entity.getSid());
-                entitys.add(templateStaffConfig);
-            }
-            templateStaffConfigService.saveBatch(entitys);
-        }
-        return rb.success().setMsg("添加模板信息成功");
+//        List<TemplateStaffConfig> entitys=new ArrayList<>();
+//        if(dto.getTemplateStaffConfigs().size()>0){
+//            templateStaffConfigService.deleteBySid(entity.getSid());
+//            for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){
+//                BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid");
+//                templateStaffConfig.setTemplateSid(entity.getSid());
+//                entitys.add(templateStaffConfig);
+//            }
+//            templateStaffConfigService.saveBatch(entitys);
+//        }
+        return rb.success().setMsg("修改模板信息成功");
     }
     public ResultBean deleteById(String sid) {
         ResultBean rb = ResultBean.fireFail();
         int i=baseMapper.deleteById(sid);
-        templateStaffConfigService.deleteBySid(sid);
-        return rb.success().setMsg("添加模板信息成功");
+        //templateStaffConfigService.deleteBySid(sid);
+        return rb.success().setMsg("删除模板信息成功");
     }
 }

From 2ebba4150cd76168f4ff1f78af40dad890f3deae Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Tue, 11 Apr 2023 21:05:22 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E4=B8=AD=E9=B8=BF=E8=AE=B0=E7=86=9F?=
 =?UTF-8?q?=E6=BA=A2=E9=A6=99=E6=95=B0=E6=8D=AE=E6=8A=93=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/test/ZhjRequestTester.java  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/test/ZhjRequestTester.java

diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/test/ZhjRequestTester.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/test/ZhjRequestTester.java
new file mode 100644
index 00000000..80f06701
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/test/ZhjRequestTester.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package test;
+
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Project: yxt_supervise <br/>
+ * File: ZhjRequestTester.java <br/>
+ * Class: test.ZhjRequestTester <br/>
+ * Description: <描述类的功能>. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023/4/11 20:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+public class ZhjRequestTester {
+
+    private static String url = "https://bi.aliyuncs.com/api/v2/biPlatform/query/byQueryParam";
+    public static void main(String[] args) {
+        Map<String,Object> paramMap = new HashMap<>();
+        paramMap.put("olapQueryParam","{\"componentId\":\"8d8a8363-89d8-4bec-9a58-c7c13ae63f15\",\"componentName\":\"菜品销量\",\"configs\":[{\"type\":\"field\",\"config\":{\"fields\":[{\"guid\":\"f8e0f500-ffc6-4821-9190-5cd3b3c906e9\",\"fid\":\"19a1d100cc\",\"areaType\":\"row\"},{\"guid\":\"07b482d2-b2e3-4a64-9d8d-3e30c03dfec6\",\"fid\":\"0e325d5eed\",\"areaType\":\"column\",\"granularity\":null,\"aggregate\":\"sum\"},{\"guid\":\"a4cfd195-dfd3-4947-a024-076ca806793f\",\"fid\":\"b9d5c6b646\",\"areaType\":\"column\",\"aggregate\":\"avg\"}]},\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\"},{\"type\":\"paging\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"limit\":20,\"offset\":0,\"pagedByAllDim\":true}},{\"type\":\"beforeAggregateCondition\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"1ca1ab13fe\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"熟溢香\"}]},{\"field\":{\"fid\":\"1ca1ab13fe\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"熟溢香\"}]},{\"field\":{\"fid\":\"e3aec87664\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"熟溢香振头店\"}]},{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"8e55928f76\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"greaterThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"20230410\"}]},{\"field\":{\"fid\":\"8e55928f76\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"lessThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"20230410\"}]}]}]}},{\"type\":\"sort\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"sortFields\":[{\"sortType\":\"desc\",\"guid\":\"07b482d2-b2e3-4a64-9d8d-3e30c03dfec6\",\"dimValues\":[],\"groupSort\":false},{\"sortType\":\"desc\",\"guid\":\"a4cfd195-dfd3-4947-a024-076ca806793f\",\"dimValues\":[],\"groupSort\":false}]}},{\"type\":\"queryConfig\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"needCount\":false,\"queryCount\":false,\"queryDetail\":false}},{\"type\":\"advancedParam\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"autoInsightParam\":{\"enable\":false},\"wordCloudParam\":{},\"summarizeParams\":[],\"trendLineParams\":[],\"forecastParams\":[],\"anomalyDetectionParams\":[],\"clusteringParams\":[],\"groupParam\":null}},{\"type\":\"annotationParam\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"measureThresholdParams\":[],\"inflectionPointParams\":[]}}],\"dataType\":\"general\",\"reportId\":\"85c4af04-1910-4005-8e47-742af1acb713\"}");
+        paramMap.put("componentId","8d8a8363-89d8-4bec-9a58-c7c13ae63f15");
+        paramMap.put("reportId","85c4af04-1910-4005-8e47-742af1acb713");
+        paramMap.put("componentType","54");
+
+        String jsonStr = JSONUtil.toJsonStr(paramMap);
+        String result2 = HttpRequest.post(url)
+                .header("x-csrf-token", "be369ac4-aa13-4065-8d7c-88117b8cf444")//头信息，多个头信息多次调用此方法即可
+                .header("x-gw-referer", "https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=d8c021cd40ad94b2d500d12229b57c3e&dd_orientation=auto&qbi_version_param=1")
+                // .body(jsonStr)
+                .form(paramMap)//表单内容
+                .execute().body();
+        System.out.println(result2);
+    }
+}

From f9d9939971622d808a5f25bea0d9baa4cc38298b Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Wed, 12 Apr 2023 18:01:59 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/databases/supervise_crm.sql              | 280 ++++++++++++++++++
 .../src/api/supervise/purchaserequisition.js  |   7 +
 .../purchaserequisition/uploadxlsx/index.vue  |  56 +++-
 .../PurchaseRequisitionRest.java              |   8 +
 .../PurchaseRequisitionService.java           |   7 +
 .../supervise/customer/test/ZhjTester.java    |  28 ++
 6 files changed, 382 insertions(+), 4 deletions(-)
 create mode 100644 docs/databases/supervise_crm.sql
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/test/ZhjTester.java

diff --git a/docs/databases/supervise_crm.sql b/docs/databases/supervise_crm.sql
new file mode 100644
index 00000000..7cb62146
--- /dev/null
+++ b/docs/databases/supervise_crm.sql
@@ -0,0 +1,280 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 8.130.39.13
+ Source Server Type    : MySQL
+ Source Server Version : 50720
+ Source Host           : 8.130.39.13:3306
+ Source Schema         : supervise_crm
+
+ Target Server Type    : MySQL
+ Target Server Version : 50720
+ File Encoding         : 65001
+
+ Date: 11/04/2023 14:48:46
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for crm_customer_temp
+-- ----------------------------
+DROP TABLE IF EXISTS `crm_customer_temp`;
+CREATE TABLE `crm_customer_temp`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `lockVersion` int(11) NULL DEFAULT 0 COMMENT '版本锁',
+  `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+  `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  `isEnable` int(11) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
+  `state` int(11) NULL DEFAULT 1 COMMENT '状态',
+  `isDelete` int(11) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
+  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建人sid',
+  `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
+  `customerNo` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '客户编号（部门编码+客户类型（1位，0个人，1企业）+部门内部流水号（6位））',
+  `customerType` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户类型（自然人/法人）',
+  `customerTypeKey` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户类型key',
+  `customerClass` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户分类（个人：司机/个体老板/其他。企业：企业型客户/一级经销商/二级经销商/终端物流客户）',
+  `customerClassKey` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户分类key',
+  `source` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户来源（公司资源/自主开发/交接客户/转介绍客户/集团内销）',
+  `sourceKey` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户来源key',
+  `level` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户级别（意向客户/准客户/成交客户/集团内销/黑名单客户）',
+  `levelKey` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户级别key',
+  `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户名称',
+  `certificateTypeKey` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '证件类型key',
+  `certificateType` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '证件类型（个人为身份证/企业为营业执照）',
+  `IDNumber` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '证件号码（个人为身份证号/企业为统一社会信用代码）',
+  `endDate` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '证件有效期',
+  `address_province` varchar(6) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '行政区划代码（省）',
+  `address_city` varchar(6) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '行政区划代码（市）',
+  `address_county` varchar(6) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '行政区划代码（县）',
+  `province` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省',
+  `city` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市',
+  `county` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县',
+  `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '详细地址',
+  `zipCode` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮编',
+  `e_mail` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '电子邮箱',
+  `contacts` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
+  `mobile` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
+  `emergencyContact` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '紧急联系人',
+  `emergencyMobile` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '紧急联系人电话  ',
+  `weixin` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '微信号码',
+  `staffSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '业务人员sid',
+  `createOrgSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建组织sid',
+  `sexKey` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '性别key',
+  `sex` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '性别',
+  `birthday` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生日',
+  `companyName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所在公司名称',
+  `follow_state_key` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '跟进状态key',
+  `follow_state` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '跟进状态',
+  `isOnRemindkey` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否开启提醒key（1开启，0不开启）',
+  `isOnRemind` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否开启提醒（1开启，0不开启）',
+  `remind_day` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提醒日期',
+  `remind_remark` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提醒备注',
+  `customerPhoto` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户头像',
+  `visitWayKey` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '见面方式key',
+  `visitWay` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '见面方式（到店/电话/拜访）',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `id`(`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 132 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '潜在客户信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of crm_customer_temp
+-- ----------------------------
+INSERT INTO `crm_customer_temp` VALUES (129, 'fe263bc8-993a-4638-a2b6-b5ff8f68ebe8', 0, '2023-01-30 15:51:41', '2023-01-30 15:51:41', 1, 1, 0, '', '427a2fb0-60c5-409f-bea4-4eb441041ae6', NULL, '0315231117568ZLZZZ', '企业', '2', '', '', '', '', '', '', '涨了张张张', '02', '营业执照', '', '', '', '', '', '', '', '', '', NULL, '', '', '15231117568', '', '', 'l1234678', 'e73f6e2c-1bda-4a4d-8390-ac7a2bf25854', NULL, '', '', '', '', '[]', '', '0', NULL, NULL, NULL, NULL, '003', '拜访');
+INSERT INTO `crm_customer_temp` VALUES (130, 'aa2284f6-b929-402b-9eff-e7144f16fc96', 0, '2023-01-30 16:53:37', '2023-01-30 16:53:37', 1, 1, 0, NULL, '427a2fb0-60c5-409f-bea4-4eb441041ae6', NULL, '0313733222222SWK', '个人', '1', NULL, NULL, NULL, NULL, '准客户', '002', '孙悟空', '01', '身份证', NULL, '2023-01-30', NULL, NULL, NULL, '河北省', '石家庄市', '桥西区', '育新路', NULL, NULL, NULL, '13733222222', NULL, NULL, NULL, 'e73f6e2c-1bda-4a4d-8390-ac7a2bf25854', NULL, '0002', '女', '2023-01-18', '宇信通', '[]', '', '0', NULL, NULL, NULL, NULL, '001', '电话');
+INSERT INTO `crm_customer_temp` VALUES (131, 'f1fdf188-b9f7-41d1-b6b6-97175bfde666', 0, '2023-01-30 16:53:45', '2023-01-30 16:53:45', 1, 1, 0, '', '427a2fb0-60c5-409f-bea4-4eb441041ae6', NULL, '0313733222222SWK11', '个人', '1', '', '', '', '', '准客户', '002', '孙悟空11', '01', '身份证', '', '2023-01-30', '', '', '', '河北省', '石家庄市', '桥西区', '育新路', NULL, '', '', '13733222222', '', '', '', 'e73f6e2c-1bda-4a4d-8390-ac7a2bf25854', NULL, '0002', '女', '2023-01-18', '宇信通', '[]', '', '0', NULL, NULL, NULL, NULL, '001', '电话');
+
+-- ----------------------------
+-- Table structure for customer
+-- ----------------------------
+DROP TABLE IF EXISTS `customer`;
+CREATE TABLE `customer`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `lockVersion` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '记录版本，锁',
+  `sid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `createSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `modifySid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `isEnable` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '记录是否可用，1:可用，0:不可用',
+  `createTime` datetime(0) NULL DEFAULT NULL COMMENT '记录创建时间',
+  `modifyTime` datetime(0) NULL DEFAULT NULL COMMENT '记录最后修改时间',
+  `state` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据状态',
+  `isDelete` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
+  `shortName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '简称',
+  `contacts` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
+  `telephone` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '电话',
+  `address` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址',
+  `bankAccount` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '银行帐户',
+  `bankAccountNumber` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '帐号',
+  `bankName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '开户行名称',
+  `legalRepresentative` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '法人',
+  `businessLicenseNo` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '营业执照号',
+  `lockingStatus` int(11) NULL DEFAULT 0 COMMENT '锁定状态1.锁定2.未锁定',
+  `lockingReason` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '锁定原因',
+  `lockingDate` datetime(0) NULL DEFAULT NULL COMMENT '锁定及解锁时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 38 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '供应商信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of customer
+-- ----------------------------
+INSERT INTO `customer` VALUES (37, NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '河北叁陆伍网络科技集团有限公司', '36524集团', '于波', '13331389283', '河北省石家庄市新华区友谊北大街345号中粮广场a座4层', NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL);
+
+-- ----------------------------
+-- Table structure for supplier
+-- ----------------------------
+DROP TABLE IF EXISTS `supplier`;
+CREATE TABLE `supplier`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `lockVersion` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '记录版本，锁',
+  `sid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+  `createSid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `modifySid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
+  `isEnable` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '记录是否可用，1:可用，0:不可用',
+  `createTime` datetime(0) NULL DEFAULT NULL COMMENT '记录创建时间',
+  `modifyTime` datetime(0) NULL DEFAULT NULL COMMENT '记录最后修改时间',
+  `state` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据状态',
+  `isDelete` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+  `remarks` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `customerSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户Sid',
+  `name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
+  `codeUnified` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统一编码',
+  `contacts` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
+  `telephone` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '电话',
+  `address` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址',
+  `bankAccount` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '银行帐户',
+  `bankAccountNumber` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '帐号',
+  `bankName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '开户行名称',
+  `legalRepresentative` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '法人',
+  `businessLicenseNo` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '营业执照号',
+  `purchaseRequisition` int(10) NULL DEFAULT 0 COMMENT '监管审核状态0待审核1为通过2为拒绝',
+  `purchaseRemarks` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '监管审批意见',
+  `bankState` int(10) NULL DEFAULT 0 COMMENT '银行0未审核，1审核通过，2审核不通过',
+  `bankRemarks` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '银行审批意见',
+  `lockingStatus` int(11) NULL DEFAULT 1 COMMENT '锁定状态1.锁定2.未锁定',
+  `lockingReason` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '锁定原因',
+  `lockingDate` datetime(0) NULL DEFAULT NULL COMMENT '锁定及解锁时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 37 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '供应商信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of supplier
+-- ----------------------------
+INSERT INTO `supplier` VALUES (1, '0', 'c6f003e2-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '河北奥丰牧业集团有限公司', '4148403', '张进钢', '13831237262', '河北省定州市息冢镇廉台村', '河北奥丰牧业集团有限公司', '50545101040011387', '中国农业银行股份有限公司定州市支行', '张进钢', '91130682665251605J', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (2, '0', 'c6f01637-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '河北晋蒙源食品销售有限公司', '4131802', '崔晓芳', '18903318212', '石家庄长安区丰收路32号6-2-202', '河北晋蒙源食品销售有限公司', '1012014170001131', '民生银行建设北大街支行', '薛俊珍', '911301026827685265', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (3, '0', 'c6f01748-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄市金百利商贸有限公司', '4101293', '牛会峰', '15931139177', '河北省石家庄市长安区百花街2号常山纺织集团供销公司仓库平房第六间', '石家庄市金百利商贸有限公司', '63212010500614', '河北银行裕兴支行', '苏辉', '9113010260101239XD', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (4, '0', 'c6f0184a-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '福建恒安集团厦门商贸有限公司石家庄经营部', '7139002', '刘洋', '15832170959', '河北省石家庄市裕华区翟营南大街41号财库国际商务港3001室', '福建恒安集团厦门商贸有限公司石家庄经营部', '0402021509300006962', '工行裕华支行', '许水深', '91130100760317780R', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (5, '0', 'c6f01940-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄宝丰源商贸有限公司', '5150611', '罗志芳', '15373893005', '石家庄市长安区体育大街华药一区23栋1102室', '石家庄宝丰源商贸有限公司', '0402020409300171952', '中国工商银行石家庄长安支行', '杜志强', '91130102682757202N', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (6, '0', 'c6f01a28-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄市晨曦商贸有限公司', '8120481', '吴玉堂', '13803116382', '石家庄市桥西区金裕花园-3-122', '石家庄市晨曦商贸有限公司', '01371000000686', '河北银行金桥支行', '吴曦', '9113010476205841X0', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (7, '0', 'c6f02825-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '中顺洁柔纸业股份有限公司', '7161704', '李亭汐', '18665037927', '唐山市玉田县杨家套乡东高桥村西', '中顺洁柔纸业股份有限公司唐山分公司', '13001627736050502713', '中国建设银行股份有限公司玉田支行', '杨裕钊', '91130200689262827L', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (8, '0', 'c6f02c0a-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '北京百事可乐饮料有限公司', '5150302', '郑康', '15383898445', '北京大兴区西红门镇团河路（金星段）55号', '北京百事可乐饮料有限公司', '319456007079', '中国银行北京宣武支行', '王安平', '911100001015173081', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (9, '0', 'c6f02fb1-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '北京统一饮品有限公司石家庄分公司', '5152001', '赵彩虹', '18332144479', '石家庄高新技术产业开发区兴安大街153号', '北京统一饮品有限公司石家庄分公司', '13001615208050513866', '建行石家庄裕华支行', '黄建修', '91130100730246045L', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (10, '0', 'c6f0329b-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '达能（中国）食品饮料有限公司', '5197904', '王璇', '13832331208', '中山市小榄镇南城大道37号', '达能（中国）食品饮料有限公司', '1731983816', '花旗银行（中国）有限公司深圳分行', '顾培基', '91442000721160557R', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (11, '0', 'c6f03465-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '杭州娃哈哈启力食品集团有限公司', '5163704', '郝伟娜', '13803115758', '萧山区经济技术开发区建设一路以北进一路以西', '杭州娃哈哈启力食品集团有限公司', '1202020709906695553', '杭州市工商银行解放路支行', '宗庆后', '91330101673957579W', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (12, '0', 'c6f03b68-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '今麦郎食品股份有限公司石家庄分公司', '5169693', '吕建鹏', '13582161816', '河北省石家庄市桥西区兴纺街6号蓝水晶小区5-102', '今麦郎食品股份有限公司石家庄分公司', '50370001040028334', '中国农业银行股份有限公司石家庄自强支行', '张振宁', '91130100054006133C', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (13, '0', 'c6f03c5a-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '康师傅（天津）饮品有限公司石家庄分公司', '5148904', '贺立山\r\n', '13739738663\r', '石家庄市中华北大街50号军创国际1102室\r\n', '康师傅（天津）饮品有限公司石家庄分公司', '0402020119300107445\r\n', '工行桥西支行\r\n', '武惠梅\r\n', '911301006760096030\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (14, '0', 'c6f03d98-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '农夫山泉股份有限公司', '5199404', '梁玉娟\r\n', '13784299258\r', '杭州市西湖区葛衙庄181号\r\n', '农夫山泉股份有限公司', '1202020119900072540\r\n', '工行羊坝头支行\r\n', '钟睒睒\r\n', '91330000143995391Q\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (15, '0', 'c6f03e65-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄恒盛兴商贸有限公司\r\n', '5101094', '谢玉琴\r\n', '15533910034\r', '石获北路8号东鑫酒业中心3区12号\r\n', '石家庄恒盛兴商贸有限公司\r\n', '50361001040023443', '农行石家庄北站支行\r\n', '温立景\r\n', '911301056892856310\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (16, '0', 'c6f0419e-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '天津顶益食品有限公司石家庄分公司', '5106003', '孙江坡\r\n', '18903391165\r', '石家庄市中山西路83号东方大厦1526室\r\n', '天津顶益食品有限公司石家庄分公司', '0402020109242004078\r\n', '工行桥西支行\r\n', '武惠梅\r\n', '9113010070096971XL\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (17, '0', 'c6f04271-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '中粮可口可乐饮料（河北）有限公司', '5105003', '王学亮\r\n', '13933140320\r', '河北省石家庄市经济技术开发区海南路169号\r\n', '中粮可口可乐饮料（河北）有限公司', '13001616208050504676\r\n', '建行藁城支行\r\n', '叶树峰\r\n', '911301005909792970\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (18, '0', 'c6f04343-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '河北省百大商贸有限责任公司', '6138992', '次江伟\r\n', '18103317788\r', '河北省石家庄市桥西区平安南大街42号君合商务中心A座二层201室-210室、212室\r\n', '河北省百大商贸有限责任公司', '50365001040007921\r\n', '农行平安支行\r\n', '王文杰\r\n', '91130100601213802C\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (19, '0', 'c6f04415-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄舶来品商贸有限公司', '6143301', '赵华\r\n', '18031179211\r', '河北省石家庄市桥西区和平路西二环交叉口华北食品城11区29号\r\n', '石家庄舶来品商贸有限公司', '692403220\r\n', '民生银行石家庄西二环北路支行\r\n', '赵华\r\n', '91130104319812887P\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (20, '0', 'c6f044ec-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄市富荣食品有限公司', '5100691', '张永超\r\n', '18931107952\r', '石家庄长安区建设北大街194号风尚宜都3-304室\r\n', '石家庄市富荣食品有限公司', '50367001040033651\r\n', '中国农业银行股份有限公司石家庄华兴支行\r\n', '韩红云\r\n', '91130102798410390Q\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (21, '0', 'c6f045bd-786b-11ed-9f31-c85b7675655e', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄市坤卓商贸有限公司', '6130491', '任晋\r\n', '13313310407\r', '石家庄市平安北大街19号礼域尚城23号楼1609室\r\n', '石家庄市坤卓商贸有限公司', '13050161040000000400\r\n', '中国建设银行股份有限公司石家庄平安北大街支行\r\n', '李旭旺\r\n', '91130102079994799M\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (22, '0', '3ed3245a-79d4-11ed-ad1d-525401028fe6', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '河北耕畅供应链管理有限公司', '6129692', '周颖\r\n', '13331388226\r', '河北省石家庄市长安区中山东路508号东胜广场A座10层1003室\r\n', '河北耕畅供应链管理有限公司', '101141430639\r\n', '中国银行股份有限公司石家庄市裕华支行\r\n', '张艳\r\n', '911301003198565U\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (23, '0', '4709b6a1-79d4-11ed-ad1d-525401028fe6', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '河北荣耀品牌营销策划有限公司\r\n', '6103901', '陆鸿杰\r\n', '13703398979\r', '河北省石家庄市长安区体育南大街1号裕彤体育场南区18号205室\r\n', '河北荣耀品牌营销策划有限公司\r\n', '01211100001986\r\n', '河北银行股份有限公司裕东科技支行\r\n', '陆鸿杰\r\n', '91130108MA0CWNM48D\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (24, '0', '495799f7-79d4-11ed-ad1d-525401028fe6', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄市金龙油脂有限公司\r\n', '5149013', '高硕星\r\n', '15631180371\r', '石家庄市桥西区蔬菜中心批发市场南区粮油3区43、45号\r\n', '石家庄市金龙油脂有限公司\r\n', '121032011907234\r\n', '石家庄汇融农村合作银行振头支行\r\n', '冯建\r\n', '911301047158184985\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (25, '0', 'b6444910-7ac0-11ed-ad1d-525401028fe6', NULL, NULL, '1', '2022-12-01 00:00:00', '2022-12-01 00:00:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄鹊山子岩商贸有限公司', '5141603', '张建磊\r\n', '15931183850\r', '石家庄市桥西区塔坛国际商贸城4号写字楼2016\r\n', '石家庄鹊山子岩商贸有限公司', '876310100100008112\r\n', '邯郸银行股份有限公司石家庄塔坛国际支行\r\n', '张建磊\r\n', '91130104MA0CR2KR99\r\n', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (26, '0', 'a8a30419-9d7b-423a-a1fe-eb0ab540840f', NULL, NULL, '1', '2022-12-29 20:01:39', '2022-12-29 20:01:39', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄金天祺商贸有限公司', '6136492', '马志强', '18131199991', '石家庄市长安区和平东路7号荣景园5-1-401', '石家庄金天祺商贸有限公司', '61712012000746', '河北银行股份有限公司建北支行', '刘淑芳', '911301027233732301', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (27, '0', '9b186911-bca6-443a-bb6e-7798dd882ae0', NULL, NULL, '1', '2022-12-29 20:09:31', '2022-12-29 20:09:31', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄市达惠昌商贸有限公司', '6135791', '邢海龙', '13932192587', '石家庄市桥西区新华路602号3502生活区9-3-301', '石家庄市达惠昌商贸有限公司', '628012012000000850', '河北银行新华路支行', '邢海龙', '91130105677372180C', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (28, '0', 'b413452c-f136-41d0-917f-2eb3354b02da', NULL, NULL, '1', '2022-12-29 20:10:21', '2022-12-29 20:10:21', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄友缘仁商贸有限公司', '6140191', '贺力', '13933106766', '石家庄市长安区长安花苑1-1-2401', '石家庄友缘仁商贸有限公司', '0402020109300214997', '中国工商银行石家庄桥西支行', '贺力', '91130104684347979J', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (29, '0', '9d788bae-7fb6-4b20-aca3-31031c9b473b', NULL, NULL, '1', '2022-12-29 20:11:04', '2022-12-29 20:11:04', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄市合利食品有限公司', '6103491', '王长浩', '15633588669', '石家庄市桥西区东平路8号一三五仓库一楼一层01号房间', '石家庄市合利食品有限公司', '0402300709245112620', '中国工商银行股份有限公司石家庄平安支行', '王长浩', '91130104718346625E', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (30, '0', '2d6235a5-90f2-4a86-9933-d23a3b7d4efd', NULL, NULL, '1', '2022-12-29 20:11:49', '2022-12-29 20:11:49', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '河北君帅商贸有限公司', '5152901', '王建奇', '13012169790', '河北省石家庄市鹿泉区和平西路739号10号库房', '河北君帅商贸有限公司', '13050161523600001875', '中国建设银行股份有限公司石家庄广安街支行', '程科青', '91130102MA0FK29M23', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (31, '0', 'a838d3dc-5930-4b06-ae30-3a6443888e96', NULL, NULL, '1', '2022-12-29 20:31:15', '2022-12-29 20:31:15', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '河北巧啡商贸有限公司', '6155001', '张占喜', '17733830707', '石家庄市桥西区四中路57号百汇大厦515室', '河北巧啡商贸有限公司', '', '中国民生银行石家庄中山东路支行', '高占广', '91130104MA07XAA04Q', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (32, '0', '9264262c-372f-46f8-bd5e-784ea022a048', NULL, NULL, '1', '2022-12-29 20:34:16', '2022-12-29 20:34:16', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄绮俪商贸有限公司', '5141104', '苏沛', '15373973503', '河北省石家庄市长安区胜利北街329号古运码头一期17号楼2单元702室', '石家庄绮俪商贸有限公司', '131707000013000979206', '中国交通银行股份有限公司河北省分行营业部', '王磊', '91130102MA0GG94RXC', 1, NULL, 1, NULL, 0, '', NULL);
+INSERT INTO `supplier` VALUES (33, '0', '1ff8af53-be58-4874-b234-d50840405d96', NULL, NULL, '1', '2023-01-07 18:32:00', '2023-01-07 18:32:00', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄荣贸建商贸有限公司', '5142704', '齐丽霞', '15130648392', '河北省石家庄市桥西区和平路与西二环交口华北食品城', '石家庄荣贸建商贸有限公司', '50354001040049306', '中国农业银行股份有限公司石家庄东城支行', '齐丽霞', '91130102MA0DKK2M5A', 1, NULL, 1, NULL, 0, NULL, NULL);
+INSERT INTO `supplier` VALUES (34, '0', 'ae0f2640-8ee7-484c-88e9-cb36dbcb4c51', NULL, NULL, '1', '2023-01-07 18:32:45', '2023-01-07 18:32:45', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄梁创商贸有限公司', '5142604', '崔云培', '13331381193', '河北省石家庄市栾城区人大路156号河北正广通物流基地109室', '石家庄梁创商贸有限公司', '2052587557000111', '渤海银行石家庄分行营业部', '石晓博', '91130105MA0DJPX27N', 1, NULL, 1, NULL, 0, NULL, NULL);
+INSERT INTO `supplier` VALUES (35, '0', 'eba70c39-3045-4321-bd43-5f6bd502c663', NULL, NULL, '1', '2023-01-13 17:01:54', '2023-01-13 17:01:54', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄同新发商贸有限公司', '5143004', '许建辉', '15032150081', '河北省石家庄市鹿泉区开发区福威街6号', '石家庄同新发商贸有限公司', '8111801013800512708', '中信银行石家庄裕华西路支行', '谷向飞', '91130185MA09CJ9XX4', 1, NULL, 1, NULL, 0, NULL, NULL);
+INSERT INTO `supplier` VALUES (36, '0', '560191ae-fb92-4ea2-810b-0749e938d172', NULL, NULL, '1', '2023-01-13 17:02:43', '2023-01-13 17:02:43', '1', '0', NULL, 'd19ae699-b25e-11ed-9f20-00163e035cda', '石家庄驼辉商贸有限公司', '5143104', '闫永红', '13472123182', '河北省石家庄市长安区胜利北大街289号财富天下2-1-1908', '石家庄驼辉商贸有限公司', '8111801012300572390', '中信银行石家庄中粮河北广场支行', '陈文志', '91130104563249926A', 1, NULL, 1, NULL, 0, NULL, NULL);
+
+-- ----------------------------
+-- Table structure for supplier_index
+-- ----------------------------
+DROP TABLE IF EXISTS `supplier_index`;
+CREATE TABLE `supplier_index`  (
+  `id` bigint(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+  `code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编码',
+  `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
+  `codeUnified` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统一的编码',
+  `nameUnified` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统一的名称',
+  `remarks` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注说明',
+  `PSid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父类Sid',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 66 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '供货商编码对应表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of supplier_index
+-- ----------------------------
+INSERT INTO `supplier_index` VALUES (1, '5150302', '北京百事可乐饮料有限公司', '5150302', NULL, NULL, 'c6f02c0a-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (2, '5152001', '北京统一饮品有限公司石家庄分公司', '5152001', NULL, NULL, 'c6f02fb1-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (3, '5181191', '北京统一饮品有限公司石家庄分公司', '5152001', NULL, NULL, 'c6f02fb1-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (4, '5197904', '达能（中国）食品饮料有限公司', '5197904', NULL, NULL, 'c6f0329b-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (5, '7139002', '福建恒安集团厦门商贸有限公司石家庄经营部', '7139002', NULL, NULL, 'c6f0184a-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (6, '5163704', '杭州娃哈哈启力食品集团有限公司', '5163704', NULL, NULL, 'c6f03465-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (7, '4148403', '河北奥丰牧业集团有限公司', '4148403', NULL, NULL, 'c6f003e2-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (8, '4131802', '河北晋蒙源食品销售有限公司', '4131802', NULL, NULL, 'c6f01637-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (9, '5195292', '河北晋蒙源食品销售有限公司', '4131802', NULL, NULL, 'c6f01637-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (12, '6138992', '河北省百大商贸有限责任公司', '6138992', NULL, NULL, 'c6f04343-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (13, '5169693', '今麦郎食品股份有限公司石家庄分公司', '5169693', NULL, NULL, 'c6f03b68-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (14, '5148904', '康师傅（天津）饮品有限公司石家庄分公司', '5148904', NULL, NULL, 'c6f03c5a-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (15, '5199404', '农夫山泉股份有限公司', '5199404', NULL, NULL, 'c6f03d98-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (16, '5150611', '石家庄宝丰源商贸有限公司', '5150611', NULL, NULL, 'c6f01940-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (17, '5183091', '石家庄宝丰源商贸有限公司', '5150611', NULL, NULL, 'c6f01940-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (18, '5183094', '石家庄宝丰源商贸有限公司', '5150611', NULL, NULL, 'c6f01940-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (19, '8130703', '石家庄宝丰源商贸有限公司', '5150611', NULL, NULL, 'c6f01940-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (20, '6143301', '石家庄舶来品商贸有限公司', '6143301', NULL, NULL, 'c6f04415-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (21, '5101094', '石家庄恒盛兴商贸有限公司', '5101094', NULL, NULL, 'c6f03e65-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (22, '8120481', '石家庄晨曦商贸有限公司', '8120481', NULL, NULL, 'c6f01a28-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (23, '5150102', '石家庄市晨曦商贸有限公司', '8120481', NULL, NULL, 'c6f01a28-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (24, '5100691', '石家庄市富荣食品有限公司', '5100691', NULL, NULL, 'c6f044ec-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (25, '6102192', '石家庄市富荣食品有限公司', '5100691', NULL, NULL, 'c6f044ec-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (26, '6102991', '石家庄市富荣食品有限公司', '5100691', NULL, NULL, 'c6f044ec-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (27, '4101293', '石家庄市金百利商贸有限公司', '4101293', NULL, NULL, 'c6f01748-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (28, '6130491', '石家庄市坤卓商贸有限公司', '6130491', NULL, NULL, 'c6f045bd-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (29, '5106003', '天津顶益食品有限公司石家庄分公司', '5106003', NULL, NULL, 'c6f0419e-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (30, '5105003', '中粮可口可乐饮料（河北）有限公司', '5105003', NULL, NULL, 'c6f04271-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (31, '7161704', '中顺洁柔纸业股份有限公司', '7161704', NULL, NULL, 'c6f02825-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (37, '6129692', '河北耕畅供应链管理有限公司', '6129692', NULL, NULL, '3ed3245a-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (38, '6103901', '河北荣耀品牌营销策划有限公司', '6103901', NULL, NULL, '4709b6a1-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (39, '6103992', '河北荣耀品牌营销策划有限公司', '6103901', NULL, NULL, '4709b6a1-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (40, '5149013', '石家庄市金龙油脂有限公司', '5149013', NULL, NULL, '495799f7-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (41, '5141603\r\n', '石家庄鹊山子岩商贸有限公司', '5141603\r\n', NULL, NULL, 'b6444910-7ac0-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (42, '6136492', '石家庄金天祺商贸有限公司', '6136492', NULL, NULL, 'a8a30419-9d7b-423a-a1fe-eb0ab540840f');
+INSERT INTO `supplier_index` VALUES (43, '6135791', '石家庄市达惠昌商贸有限公司', '6135791', NULL, NULL, '9b186911-bca6-443a-bb6e-7798dd882ae0');
+INSERT INTO `supplier_index` VALUES (44, '6140191', '石家庄友缘仁商贸有限公司', '6140191', NULL, NULL, 'b413452c-f136-41d0-917f-2eb3354b02da');
+INSERT INTO `supplier_index` VALUES (45, '6103491', '石家庄市合利食品有限公司', '6103491', NULL, NULL, '9d788bae-7fb6-4b20-aca3-31031c9b473b');
+INSERT INTO `supplier_index` VALUES (46, '5152901', '河北君帅商贸有限公司', '5152901', NULL, NULL, '2d6235a5-90f2-4a86-9933-d23a3b7d4efd');
+INSERT INTO `supplier_index` VALUES (47, '6155001', '河北巧啡商贸有限公司', '6155001', NULL, NULL, 'a838d3dc-5930-4b06-ae30-3a6443888e96');
+INSERT INTO `supplier_index` VALUES (48, '5141104', '石家庄绮俪商贸有限公司', '5141104', NULL, NULL, '9264262c-372f-46f8-bd5e-784ea022a048');
+INSERT INTO `supplier_index` VALUES (49, '6155002', '河北巧啡商贸有限公司', '6155001', NULL, NULL, 'a838d3dc-5930-4b06-ae30-3a6443888e96');
+INSERT INTO `supplier_index` VALUES (51, '3100904', '河北荣耀品牌营销策划有限公司', '6103901', NULL, NULL, '4709b6a1-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (52, '6103991', '河北荣耀品牌营销策划有限公司', '6103901', NULL, NULL, '4709b6a1-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (53, '5148792', '河北耕畅供应链管理有限公司', '6129692', NULL, NULL, '3ed3245a-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (54, '5142704', '石家庄荣贸建商贸有限公司', '5142704', NULL, NULL, '1ff8af53-be58-4874-b234-d50840405d96');
+INSERT INTO `supplier_index` VALUES (55, '5142604', '石家庄梁创商贸有限公司', '5142604', NULL, NULL, 'ae0f2640-8ee7-484c-88e9-cb36dbcb4c51');
+INSERT INTO `supplier_index` VALUES (56, '6136491', '石家庄金天祺商贸有限公司', '6136492', NULL, NULL, 'a8a30419-9d7b-423a-a1fe-eb0ab540840f');
+INSERT INTO `supplier_index` VALUES (57, '5154011', '河北荣耀品牌营销策划有限公司', '6103901', NULL, NULL, '4709b6a1-79d4-11ed-ad1d-525401028fe6');
+INSERT INTO `supplier_index` VALUES (58, '5101892', '石家庄市金佰利商贸有限公司', '4101293', NULL, NULL, 'c6f01748-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (59, '8120491', '石家庄晨曦商贸有限公司', '8120481', NULL, NULL, 'c6f01a28-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (60, '5199601', '石家庄舶来品商贸有限公司', '6143301', NULL, NULL, 'c6f04415-786b-11ed-9f31-c85b7675655e');
+INSERT INTO `supplier_index` VALUES (61, '5143004', '石家庄同新发商贸有限公司', '5143004', NULL, NULL, 'eba70c39-3045-4321-bd43-5f6bd502c663');
+INSERT INTO `supplier_index` VALUES (62, '5143104', '石家庄驼辉商贸有限公司', '5143104', NULL, NULL, '560191ae-fb92-4ea2-810b-0749e938d172');
+INSERT INTO `supplier_index` VALUES (63, '4155001', '河北君帅商贸有限公司', '5152901', NULL, NULL, '2d6235a5-90f2-4a86-9933-d23a3b7d4efd');
+INSERT INTO `supplier_index` VALUES (64, '6151501', '河北君帅商贸有限公司', '5152901', NULL, NULL, '2d6235a5-90f2-4a86-9933-d23a3b7d4efd');
+INSERT INTO `supplier_index` VALUES (65, '5154001', '河北荣耀品牌营销策划有限公司', '6103901', NULL, NULL, '4709b6a1-79d4-11ed-ad1d-525401028fe6');
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/supervise-customer-ui/src/api/supervise/purchaserequisition.js b/supervise-customer-ui/src/api/supervise/purchaserequisition.js
index 3c6769e8..4a16785a 100644
--- a/supervise-customer-ui/src/api/supervise/purchaserequisition.js
+++ b/supervise-customer-ui/src/api/supervise/purchaserequisition.js
@@ -62,5 +62,12 @@ export default {
       baseURL:'/api/customer',
       url: '/v1/purchaserequisition/checkSupplier/' + sid
     })
+  },
+  // 检测供应商信息状态
+  updatePurchaseStateSucess: function(sid) {
+    return request({
+      baseURL:'/api/customer',
+      url: '/v1/purchaserequisition/updatePurchaseStateSucess/' + sid
+    })
   }
 }
diff --git a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
index 76df9abd..223ecc31 100644
--- a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
+++ b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
@@ -146,16 +146,28 @@
           <el-button style="float: right; padding: 3px 0" type="text" @click="handleDownload">重新检测</el-button>
         </div>
         <div>
-          供应商信息检测
+          <div v-if="supplierCheckState==0">{{ supplierCheckMsg }}</div>
+          <div v-else-if="supplierCheckState==1">
+            <el-table :data="supplierChecklist" :index="index" border style="width: 100%">
+              <el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
+              <el-table-column label="供应商编码" align="center" width="150" prop="supplierCode" />
+              <el-table-column label="供应商名称" align="center" prop="supplierName" />
+              <el-table-column label="供应商统一编码" align="center" width="150" prop="supplierCodeUnified" />
+              <el-table-column label="状态" align="center" width="150" prop="resState" />
+              <el-table-column label="检测结果" align="center" width="300" prop="msg" />
+            </el-table>
+          </div>
+          <div v-else> <el-alert title="供应商信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
         </div>
       </el-card>
-      <el-card class="box-card">
+      <el-card class="box-card" style="margin-top: 5px;">
         <div slot="header" class="clearfix">
           <span>商品信息检测</span>
           <el-button style="float: right; padding: 3px 0" type="text" @click="handleDownload">重新检测</el-button>
         </div>
         <div>
-          <div v-if="proChecklist.length>0">
+          <div v-if="proCheckState==0">{{ proCheckMsg }}</div>
+          <div v-else-if="proCheckState==1">
             <el-table :data="proChecklist" :index="index" border style="width: 100%">
               <el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
               <el-table-column label="商品代码" align="center" width="100" prop="productCode" />
@@ -165,7 +177,7 @@
               <el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
               <el-table-column label="品牌名称" align="center" width="100" prop="brandName" />
               <el-table-column label="状态" align="center" width="150" prop="resState" />
-              <el-table-column label="检测结果" align="center" width="100" prop="msg" />
+              <el-table-column label="检测结果" align="center" width="300" prop="msg" />
             </el-table>
           </div>
           <div v-else> <el-alert title="所有商品信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
@@ -218,6 +230,11 @@
           pros: [] // 采购商品明细列表
         },
         prolist: [],
+        supplierCheckState: 0,
+        supplierCheckMsg: '等待检测',
+        supplierChecklist: [],
+        proCheckState: 0,
+        proCheckMsg: '等待检测',
         proChecklist: [],
         rules: {}
       }
@@ -358,6 +375,7 @@
           this.formobj = resp.data
           this.loadProList()
           this.checkPro()
+          this.checkSupplier()
         } else {
           this.$message({
             showClose: true,
@@ -383,12 +401,42 @@
       },
       checkPro() {
         if (this.formobj.sid) {
+          this.proCheckMsg = '正在对订单的商品信息进行检测...'
           reqPro.checkByMainSid(this.formobj.sid).then(resp => {
             this.proChecklist = resp.data
+            if (this.proChecklist.length > 0) {
+              this.proCheckState = 1
+            } else {
+              this.proCheckState = 2
+              if (this.formobj.purchaseState === '0' && this.supplierCheckState === 2) {
+                this.updatePurchaseStateSucess()
+              }
+            }
             this.loadProList()
           })
         }
       },
+      checkSupplier() {
+        if (this.formobj.sid) {
+          this.supplierCheckMsg = '正在检测供应商信息...'
+          req.checkSupplier(this.formobj.sid).then(resp => {
+            this.supplierChecklist = resp.data
+            if (this.supplierChecklist.length > 0) {
+              this.supplierCheckState = 1
+            } else {
+              this.supplierCheckState = 2
+              if (this.formobj.purchaseState === '0' && this.proCheckState === 2) {
+                this.updatePurchaseStateSucess()
+              }
+            }
+          })
+        }
+      },
+      updatePurchaseStateSucess() {
+        req.updatePurchaseStateSucess(this.formobj.sid).then(resp => {
+          this.formobj.purchaseState = '1'
+        })
+      },
       dataDelete(index) {
         const tip = '请确认是否删除所选记录?'
         this.$confirm(tip, '提示', {
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
index d22b068b..84092e6a 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java
@@ -88,4 +88,12 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
         List<PurchaseRequisitionCheckVo> list = supplierBankInfoService.checkPurchaseRequisition(sid);
         return rb.success().setData(list);
     }
+
+    @ApiOperation("请求审核状态改为通过")
+    @GetMapping("/updatePurchaseStateSucess/{sid}")
+    public ResultBean updatePurchaseStateSucess(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        purchaseRequisitionService.updatePurchaseStateSucess(sid);
+        return rb.success();
+    }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
index 50298840..d34b40b4 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java
@@ -291,4 +291,11 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
     public double amountOfSupplier(String supplierOnlyCode) {
         return baseMapper.amountBySupplierOnlyCode(supplierOnlyCode);
     }
+
+    public void updatePurchaseStateSucess(String sid) {
+        UpdateWrapper<PurchaseRequisition> uw = new UpdateWrapper<>();
+        uw.set("purchaseState", "1");
+        uw.eq("sid", sid);
+        this.update(uw);
+    }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/test/ZhjTester.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/test/ZhjTester.java
new file mode 100644
index 00000000..9d67822c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/test/ZhjTester.java
@@ -0,0 +1,28 @@
+package com.yxt.supervise.customer.test;
+
+import cn.hutool.http.HttpUtil;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+public class ZhjTester {
+
+    public static void main(String[] args) {
+//        HttpUtil.post("https://bi.aliyuncs.com/api/v2/biPlatform/query/byQueryParam?" + param, "")
+       // String param = "pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=d8c021cd40ad94b2d500d12229b57c3e&dd_orientation=auto&olapQueryParam=%7B%22componentId%22%3A%228d8a8363-89d8-4bec-9a58-c7c13ae63f15%22%2C%22componentName%22%3A%22%E8%8F%9C%E5%93%81%E9%94%80%E9%87%8F%22%2C%22configs%22%3A%5B%7B%22type%22%3A%22field%22%2C%22config%22%3A%7B%22fields%22%3A%5B%7B%22guid%22%3A%22f8e0f500-ffc6-4821-9190-5cd3b3c906e9%22%2C%22fid%22%3A%2219a1d100cc%22%2C%22areaType%22%3A%22row%22%7D%2C%7B%22guid%22%3A%2207b482d2-b2e3-4a64-9d8d-3e30c03dfec6%22%2C%22fid%22%3A%220e325d5eed%22%2C%22areaType%22%3A%22column%22%2C%22granularity%22%3Anull%2C%22aggregate%22%3A%22sum%22%7D%2C%7B%22guid%22%3A%22a4cfd195-dfd3-4947-a024-076ca806793f%22%2C%22fid%22%3A%22b9d5c6b646%22%2C%22areaType%22%3A%22column%22%2C%22aggregate%22%3A%22avg%22%7D%5D%7D%2C%22cubeId%22%3A%22a16139f4-8f21-4172-afb9-5de69719590e%22%7D%2C%7B%22type%22%3A%22paging%22%2C%22cubeId%22%3A%22a16139f4-8f21-4172-afb9-5de69719590e%22%2C%22config%22%3A%7B%22limit%22%3A20%2C%22offset%22%3A0%2C%22pagedByAllDim%22%3Atrue%7D%7D%2C%7B%22type%22%3A%22beforeAggregateCondition%22%2C%22cubeId%22%3A%22a16139f4-8f21-4172-afb9-5de69719590e%22%2C%22config%22%3A%7B%22logicalOperator%22%3A%22AND%22%2C%22conditions%22%3A%5B%7B%22field%22%3A%7B%22fid%22%3A%221ca1ab13fe%22%7D%2C%22functionalOperator%22%3A%22in%22%2C%22args%22%3A%5B%7B%22valueType%22%3A%22string%22%2C%22value%22%3A%22%E7%86%9F%E6%BA%A2%E9%A6%99%22%7D%5D%7D%2C%7B%22field%22%3A%7B%22fid%22%3A%221ca1ab13fe%22%7D%2C%22functionalOperator%22%3A%22in%22%2C%22args%22%3A%5B%7B%22valueType%22%3A%22string%22%2C%22value%22%3A%22%E7%86%9F%E6%BA%A2%E9%A6%99%22%7D%5D%7D%2C%7B%22field%22%3A%7B%22fid%22%3A%22e3aec87664%22%7D%2C%22functionalOperator%22%3A%22in%22%2C%22args%22%3A%5B%7B%22valueType%22%3A%22string%22%2C%22value%22%3A%22%E7%86%9F%E6%BA%A2%E9%A6%99%E6%8C%AF%E5%A4%B4%E5%BA%97%22%7D%2C%7B%22valueType%22%3A%22string%22%2C%22value%22%3A%22%E9%A6%8D%E9%A6%8D%E5%8D%A4%E6%8C%AF%E5%B2%97%E5%BA%97%22%7D%2C%7B%22valueType%22%3A%22string%22%2C%22value%22%3A%22%E9%A6%8D%E9%A6%8D%E5%8D%A4%E9%9B%85%E6%B8%85%E8%A1%97%E5%BA%97%22%7D%5D%7D%2C%7B%22logicalOperator%22%3A%22AND%22%2C%22conditions%22%3A%5B%7B%22field%22%3A%7B%22fid%22%3A%228e55928f76%22%2C%22dateTrunc%22%3A%22day%22%7D%2C%22functionalOperator%22%3A%22greaterThanOrEqual%22%2C%22args%22%3A%5B%7B%22valueType%22%3A%22string%22%2C%22value%22%3A%2220230410%22%7D%5D%7D%2C%7B%22field%22%3A%7B%22fid%22%3A%228e55928f76%22%2C%22dateTrunc%22%3A%22day%22%7D%2C%22functionalOperator%22%3A%22lessThanOrEqual%22%2C%22args%22%3A%5B%7B%22valueType%22%3A%22string%22%2C%22value%22%3A%2220230410%22%7D%5D%7D%5D%7D%5D%7D%7D%2C%7B%22type%22%3A%22sort%22%2C%22cubeId%22%3A%22a16139f4-8f21-4172-afb9-5de69719590e%22%2C%22config%22%3A%7B%22sortFields%22%3A%5B%7B%22sortType%22%3A%22desc%22%2C%22guid%22%3A%2207b482d2-b2e3-4a64-9d8d-3e30c03dfec6%22%2C%22dimValues%22%3A%5B%5D%2C%22groupSort%22%3Afalse%7D%2C%7B%22sortType%22%3A%22desc%22%2C%22guid%22%3A%22a4cfd195-dfd3-4947-a024-076ca806793f%22%2C%22dimValues%22%3A%5B%5D%2C%22groupSort%22%3Afalse%7D%5D%7D%7D%2C%7B%22type%22%3A%22queryConfig%22%2C%22cubeId%22%3A%22a16139f4-8f21-4172-afb9-5de69719590e%22%2C%22config%22%3A%7B%22needCount%22%3Afalse%2C%22queryCount%22%3Afalse%2C%22queryDetail%22%3Afalse%7D%7D%2C%7B%22type%22%3A%22advancedParam%22%2C%22cubeId%22%3A%22a16139f4-8f21-4172-afb9-5de69719590e%22%2C%22config%22%3A%7B%22autoInsightParam%22%3A%7B%22enable%22%3Afalse%7D%2C%22wordCloudParam%22%3A%7B%7D%2C%22summarizeParams%22%3A%5B%5D%2C%22trendLineParams%22%3A%5B%5D%2C%22forecastParams%22%3A%5B%5D%2C%22anomalyDetectionParams%22%3A%5B%5D%2C%22clusteringParams%22%3A%5B%5D%2C%22groupParam%22%3Anull%7D%7D%2C%7B%22type%22%3A%22annotationParam%22%2C%22cubeId%22%3A%22a16139f4-8f21-4172-afb9-5de69719590e%22%2C%22config%22%3A%7B%22measureThresholdParams%22%3A%5B%5D%2C%22inflectionPointParams%22%3A%5B%5D%7D%7D%5D%2C%22dataType%22%3A%22general%22%2C%22reportId%22%3A%2285c4af04-1910-4005-8e47-742af1acb713%22%7D&componentId=8d8a8363-89d8-4bec-9a58-c7c13ae63f15&reportId=85c4af04-1910-4005-8e47-742af1acb713&componentType=54";
+
+        //String post = HttpUtil.post("https://bi.aliyuncs.com/api/v2/biPlatform/query/byQueryParam?" + param, "");
+        String url = "https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=d8c021cd40ad94b2d500d12229b57c3e&dd_orientation=auto";
+//        String post = HttpUtil.get(url);
+//        System.out.println(post);
+//        HttpUtil.post("https://bi.aliyuncs.com/api/v2/biPlatform/query/byQueryParam?"+param,"");
+
+        RestTemplate restTemplate = new RestTemplate();
+//        ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
+
+//        System.out.println(forEntity);
+
+        String forObject = restTemplate.getForObject(url, String.class);
+        System.out.println(forObject);
+
+    }
+}

From 2226693d758c36d08f1b8263056e1d72a8c2aa33 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 12 Apr 2023 18:05:02 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=81=E8=B4=B7?=
 =?UTF-8?q?=E6=AC=BE=E9=93=B6=E8=A1=8C=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/api/bankmanager/BankManager.java      | 25 +++++++
 .../api/bankmanager/BankManagerDetailsVo.java | 14 ++++
 .../crm/api/bankmanager/BankManagerDto.java   | 14 ++++
 .../crm/api/bankmanager/BankManagerFeign.java | 18 +++++
 .../bankmanager/BankManagerFeignFallback.java | 11 +++
 .../crm/api/bankmanager/BankManagerQuery.java | 14 ++++
 .../crm/api/bankmanager/BankManagerVo.java    | 25 +++++++
 .../EnterpriseInformation.java                | 44 ++++++++++++
 .../EnterpriseInformationDetailsVo.java       | 43 ++++++++++++
 .../EnterpriseInformationDto.java             | 43 ++++++++++++
 .../EnterpriseInformationFeign.java           | 18 +++++
 .../EnterpriseInformationFeignFallback.java   | 11 +++
 .../EnterpriseInformationQuery.java           | 43 ++++++++++++
 .../EnterpriseInformationVo.java              | 43 ++++++++++++
 .../LoanBankInformationDto.java               |  2 +-
 .../LoanBankInformationVo.java                |  7 ++
 .../EnterpriseInformationMapper.java          | 28 ++++++++
 .../EnterpriseInformationMapper.xml           | 29 ++++++++
 .../EnterpriseInformationRest.java            | 56 +++++++++++++++
 .../EnterpriseInformationService.java         | 68 +++++++++++++++++++
 .../LoanBankInformationMapper.java            |  8 +++
 .../LoanBankInformationMapper.xml             | 11 ++-
 .../LoanBankInformationService.java           | 30 ++++++--
 23 files changed, 596 insertions(+), 9 deletions(-)
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManager.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDetailsVo.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDto.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeign.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeignFallback.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerQuery.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerVo.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformation.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDetailsVo.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDto.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeign.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeignFallback.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationQuery.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationVo.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java
 create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java

diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManager.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManager.java
new file mode 100644
index 00000000..428bd360
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManager.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.crm.api.bankmanager;
+
+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/12 9:40
+ */
+@Data
+@ApiModel(value = "银行联系人信息", description = "银行联系人信息")
+@TableName("bank_manager")
+public class BankManager extends BaseEntity {
+    @ApiModelProperty("联系人")
+    private String name;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("职务")
+    private String post;
+    @ApiModelProperty("银行sid")
+    private String bankSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDetailsVo.java
new file mode 100644
index 00000000..653799f5
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDetailsVo.java
@@ -0,0 +1,14 @@
+package com.yxt.supervise.crm.api.bankmanager;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 9:40
+ */
+@Data
+@ApiModel(value = "银行联系人信息 视图数据详情", description = "银行联系人信息 视图数据详情")
+public class BankManagerDetailsVo implements Vo {
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDto.java
new file mode 100644
index 00000000..d594f70d
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerDto.java
@@ -0,0 +1,14 @@
+package com.yxt.supervise.crm.api.bankmanager;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 9:41
+ */
+@ApiModel(value = "银行联系人信息 数据传输对象", description = "银行联系人信息 数据传输对象")
+@Data
+public class BankManagerDto implements Dto {
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeign.java
new file mode 100644
index 00000000..ccc5afaf
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.bankmanager;
+
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 9:41
+ */
+@Api(tags = "银行联系人信息")
+@FeignClient(
+        contextId = "supervise-crm-BankManager",
+        name = "supervise-crm",
+        path = "v1/bankmanager",
+        fallback = LoanBankInformationFeignFallback.class)
+public interface BankManagerFeign {
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeignFallback.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeignFallback.java
new file mode 100644
index 00000000..6db2c3ec
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.crm.api.bankmanager;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 9:41
+ */
+@Component
+public class BankManagerFeignFallback implements BankManagerFeign{
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerQuery.java
new file mode 100644
index 00000000..f75d7ca9
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerQuery.java
@@ -0,0 +1,14 @@
+package com.yxt.supervise.crm.api.bankmanager;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 9:41
+ */
+@ApiModel(value = "银行联系人信息 查询条件", description = "银行联系人信息 查询条件")
+@Data
+public class BankManagerQuery implements Query {
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerVo.java
new file mode 100644
index 00000000..0d411dc0
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/bankmanager/BankManagerVo.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.crm.api.bankmanager;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 9:41
+ */
+@ApiModel(value = "银行联系人信息 视图数据对象", description = "银行联系人信息 视图数据对象")
+@Data
+public class BankManagerVo implements Vo {
+    private String id;
+    private String sid;
+    @ApiModelProperty("联系人")
+    private String name;
+    @ApiModelProperty("电话")
+    private String telephone;
+    @ApiModelProperty("职务")
+    private String post;
+    @ApiModelProperty("银行sid")
+    private String bankSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformation.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformation.java
new file mode 100644
index 00000000..2f671aac
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformation.java
@@ -0,0 +1,44 @@
+package com.yxt.supervise.crm.api.enterpriseinformation;
+
+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/12 11:43
+ */
+@Data
+@ApiModel(value = "企业信息", description = "企业信息")
+@TableName("enterprise_information")
+public class EnterpriseInformation extends BaseEntity {
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+    @ApiModelProperty("企业简称")
+    private String enterpriseAbbreviation;
+    @ApiModelProperty("银行账户")
+    private String bankAccount;
+    @ApiModelProperty("账号")
+    private String accountNumber;
+    @ApiModelProperty("开户行")
+    private String openingBankName;
+    @ApiModelProperty("法人")
+    private String juridicalPerson;
+    @ApiModelProperty("营业执照号")
+    private String businessLicenseNumber;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDetailsVo.java
new file mode 100644
index 00000000..01a327a0
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDetailsVo.java
@@ -0,0 +1,43 @@
+package com.yxt.supervise.crm.api.enterpriseinformation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:43
+ */
+@Data
+@ApiModel(value = "企业信息 视图数据详情", description = "企业信息 视图数据详情")
+public class EnterpriseInformationDetailsVo implements Vo {
+    private String id;
+    private String sid;
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+    @ApiModelProperty("企业简称")
+    private String enterpriseAbbreviation;
+    @ApiModelProperty("银行账户")
+    private String bankAccount;
+    @ApiModelProperty("账号")
+    private String accountNumber;
+    @ApiModelProperty("开户行")
+    private String openingBankName;
+    @ApiModelProperty("法人")
+    private String juridicalPerson;
+    @ApiModelProperty("营业执照号")
+    private String businessLicenseNumber;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDto.java
new file mode 100644
index 00000000..48b4e98a
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationDto.java
@@ -0,0 +1,43 @@
+package com.yxt.supervise.crm.api.enterpriseinformation;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:43
+ */
+@ApiModel(value = "企业信息 数据传输对象", description = "企业信息 数据传输对象")
+@Data
+public class EnterpriseInformationDto implements Dto {
+    private String id;
+    private String sid;
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+    @ApiModelProperty("企业简称")
+    private String enterpriseAbbreviation;
+    @ApiModelProperty("银行账户")
+    private String bankAccount;
+    @ApiModelProperty("账号")
+    private String accountNumber;
+    @ApiModelProperty("开户行")
+    private String openingBankName;
+    @ApiModelProperty("法人")
+    private String juridicalPerson;
+    @ApiModelProperty("营业执照号")
+    private String businessLicenseNumber;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeign.java
new file mode 100644
index 00000000..68f79c0f
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.enterpriseinformation;
+
+import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:44
+ */
+@Api(tags = "企业信息")
+@FeignClient(
+        contextId = "supervise-crm-EnterpriseInformation",
+        name = "supervise-crm",
+        path = "v1/enterpriseinformation",
+        fallback = EnterpriseInformationFeignFallback.class)
+public interface EnterpriseInformationFeign {
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeignFallback.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeignFallback.java
new file mode 100644
index 00000000..c711d354
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.crm.api.enterpriseinformation;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:44
+ */
+@Component
+public class EnterpriseInformationFeignFallback implements EnterpriseInformationFeign{
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationQuery.java
new file mode 100644
index 00000000..e786ecb1
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationQuery.java
@@ -0,0 +1,43 @@
+package com.yxt.supervise.crm.api.enterpriseinformation;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:44
+ */
+@ApiModel(value = "企业信息 查询条件", description = "企业信息 查询条件")
+@Data
+public class EnterpriseInformationQuery implements Query {
+    private String id;
+    private String sid;
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+    @ApiModelProperty("企业简称")
+    private String enterpriseAbbreviation;
+    @ApiModelProperty("银行账户")
+    private String bankAccount;
+    @ApiModelProperty("账号")
+    private String accountNumber;
+    @ApiModelProperty("开户行")
+    private String openingBankName;
+    @ApiModelProperty("法人")
+    private String juridicalPerson;
+    @ApiModelProperty("营业执照号")
+    private String businessLicenseNumber;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationVo.java
new file mode 100644
index 00000000..35988e5e
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseinformation/EnterpriseInformationVo.java
@@ -0,0 +1,43 @@
+package com.yxt.supervise.crm.api.enterpriseinformation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:44
+ */
+@ApiModel(value = "企业信息 视图数据对象", description = "企业信息 视图数据对象")
+@Data
+public class EnterpriseInformationVo implements Vo {
+    private String id;
+    private String sid;
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+    @ApiModelProperty("企业简称")
+    private String enterpriseAbbreviation;
+    @ApiModelProperty("银行账户")
+    private String bankAccount;
+    @ApiModelProperty("账号")
+    private String accountNumber;
+    @ApiModelProperty("开户行")
+    private String openingBankName;
+    @ApiModelProperty("法人")
+    private String juridicalPerson;
+    @ApiModelProperty("营业执照号")
+    private String businessLicenseNumber;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("联系人")
+    private String contacts;
+    @ApiModelProperty("电话")
+    private String telephone;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java
index a2b2f6b8..4ba998d7 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationDto.java
@@ -13,7 +13,7 @@ import lombok.Data;
 @Data
 public class LoanBankInformationDto implements Dto {
     @ApiModelProperty("id")
-    private Integer id;
+    private String id;
     @ApiModelProperty("sid")
     private String sid;
     @ApiModelProperty("银行名称")
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java
index 184c62a1..8680aac5 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/loanbankinformation/LoanBankInformationVo.java
@@ -1,10 +1,14 @@
 package com.yxt.supervise.crm.api.loanbankinformation;
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.crm.api.bankmanager.BankManager;
+import com.yxt.supervise.crm.api.bankmanager.BankManagerVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/4/11 16:08
@@ -34,4 +38,7 @@ public class LoanBankInformationVo implements Vo {
     private String telephone;
     @ApiModelProperty("上级sid")
     private String pSid;
+    //下级银行
+    private List<LoanBankInformationVo> pBank;
+    private List<BankManagerVo> managerList;
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java
new file mode 100644
index 00000000..0ff4498e
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.java
@@ -0,0 +1,28 @@
+package com.yxt.supervise.crm.biz.enterpriseinformation;
+
+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.crm.api.bankmanager.BankManagerVo;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformation;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformation;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:49
+ */
+@Mapper
+public interface EnterpriseInformationMapper extends BaseMapper<EnterpriseInformation> {
+    IPage<EnterpriseInformationVo> selectPageVo(IPage<EnterpriseInformation> page, @Param(Constants.WRAPPER) Wrapper<EnterpriseInformation> qw);
+    EnterpriseInformationVo getEnterpriseBySid( @Param("sid") String sid);
+    //查询联系人
+    List<BankManagerVo> getBankManager(@Param("sid") String sid);
+    //根据sid下级
+    List<EnterpriseInformationVo> bankList(@Param("sid") String sid);
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml
new file mode 100644
index 00000000..81e85440
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationMapper.xml
@@ -0,0 +1,29 @@
+<?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.crm.biz.enterpriseinformation.EnterpriseInformationMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationVo">
+        SELECT *
+        FROM enterprise_information
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <!--根据客户的微信号以及当前登录者所在部门的sid和登录者所关联的员工sid查询-->
+    <select id="getEnterpriseBySid" resultType="com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationVo">
+        SELECT *
+        FROM enterprise_information
+        WHERE sid=#{sid}
+    </select>
+    <select id="getBankManager" resultType="com.yxt.supervise.crm.api.bankmanager.BankManagerVo">
+        SELECT *
+        FROM bank_manager
+        WHERE bankSid=#{sid}
+    </select>
+    <select id="bankList" resultType="com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo">
+        SELECT *
+        FROM loan_bank_information
+        WHERE psid=#{sid}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java
new file mode 100644
index 00000000..8f24c97f
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationRest.java
@@ -0,0 +1,56 @@
+package com.yxt.supervise.crm.biz.enterpriseinformation;
+
+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.crm.api.enterpriseinformation.EnterpriseInformationDto;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationQuery;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationVo;
+import com.yxt.supervise.crm.biz.enterpriseinformation.EnterpriseInformationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:49
+ */
+@Api(tags = "企业信息")
+@RestController
+@RequestMapping("v1/enterpriseinformation")
+public class EnterpriseInformationRest {
+    @Autowired
+    EnterpriseInformationService EnterpriseInformationService;
+
+    //@Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<EnterpriseInformationVo>> listPage(@RequestBody PagerQuery<EnterpriseInformationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<EnterpriseInformationVo> pv = EnterpriseInformationService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody EnterpriseInformationDto dto) {
+        return EnterpriseInformationService.save(dto);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody EnterpriseInformationDto dto) {
+        return EnterpriseInformationService.update(dto);
+    }
+    @ApiOperation("根据sid查询数据的")
+    @GetMapping("/getEnterpriseBySid/{sid}")
+    public ResultBean getEnterpriseBySid(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        EnterpriseInformationVo EnterpriseInformationVo=EnterpriseInformationService.getEnterpriseBySid(sid);
+        return rb.success().setData(EnterpriseInformationVo);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid) {
+        return EnterpriseInformationService.delete(sid);
+    }
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java
new file mode 100644
index 00000000..0782c104
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseinformation/EnterpriseInformationService.java
@@ -0,0 +1,68 @@
+package com.yxt.supervise.crm.biz.enterpriseinformation;
+
+import cn.hutool.core.bean.BeanUtil;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.bankmanager.BankManagerVo;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformation;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformation;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationDto;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationQuery;
+import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/12 11:50
+ */
+@Service
+public class EnterpriseInformationService extends MybatisBaseService<EnterpriseInformationMapper, EnterpriseInformation> {
+    public PagerVo<EnterpriseInformationVo> listPageVo(PagerQuery<EnterpriseInformationQuery> pq) {
+        EnterpriseInformationQuery query = pq.getParams();
+        QueryWrapper<EnterpriseInformation> qw = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+            qw.like("enterpriseName",query.getEnterpriseName());
+        }
+        if(StringUtils.isNotBlank(query.getTelephone())){
+            qw.like("telephone",query.getTelephone());
+        }
+
+        IPage<EnterpriseInformation> page = PagerUtil.queryToPage(pq);
+        IPage<EnterpriseInformationVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<EnterpriseInformationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean save(EnterpriseInformationDto dto) {
+        ResultBean rb=new ResultBean();
+        EnterpriseInformation entity=new EnterpriseInformation();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("保存企业信息成功");
+    }
+    public ResultBean update(EnterpriseInformationDto dto) {
+        ResultBean rb=new ResultBean();
+        String dtoSid = dto.getSid();
+        EnterpriseInformation entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改企业信息成功");
+    }
+    public EnterpriseInformationVo getEnterpriseBySid(String sid){
+        //根据sid查询的企业
+        EnterpriseInformationVo bank=baseMapper.getEnterpriseBySid(sid);
+        return bank;
+    }
+    public ResultBean delete(String sid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<EnterpriseInformation>().eq("sid",sid));
+        return rb.success().setMsg("删除企业信息成功");
+    }
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java
index 6b599887..5d10bc1d 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java
@@ -4,6 +4,8 @@ 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.crm.api.bankmanager.BankManager;
+import com.yxt.supervise.crm.api.bankmanager.BankManagerVo;
 import com.yxt.supervise.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.supervise.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformation;
@@ -11,6 +13,8 @@ import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/4/11 16:14
@@ -19,5 +23,9 @@ import org.apache.ibatis.annotations.Param;
 public interface LoanBankInformationMapper extends BaseMapper<LoanBankInformation> {
     IPage<LoanBankInformationVo> selectPageVo(IPage<LoanBankInformation> page, @Param(Constants.WRAPPER) Wrapper<LoanBankInformation> qw);
     LoanBankInformationVo getBankInformation( @Param("sid") String sid);
+    //查询联系人
+    List<BankManagerVo> getBankManager(@Param("sid") String sid);
+    //根据sid下级
+    List<LoanBankInformationVo> bankList(@Param("sid") String sid);
 
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml
index f994f816..e8415821 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.xml
@@ -16,5 +16,14 @@
         FROM loan_bank_information
         WHERE sid=#{sid}
     </select>
-
+    <select id="getBankManager" resultType="com.yxt.supervise.crm.api.bankmanager.BankManagerVo">
+        SELECT *
+        FROM bank_manager
+        WHERE bankSid=#{sid}
+    </select>
+    <select id="bankList" resultType="com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo">
+        SELECT *
+        FROM loan_bank_information
+        WHERE psid=#{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java
index ec1366e0..7a13a21a 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java
@@ -8,6 +8,8 @@ import com.yxt.common.base.utils.PagerUtil;
 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.crm.api.bankmanager.BankManager;
+import com.yxt.supervise.crm.api.bankmanager.BankManagerVo;
 import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformation;
 import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationDto;
 import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationQuery;
@@ -15,6 +17,9 @@ import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
     * @author wangpengfei
     * @date 2023/4/11 16:14
@@ -39,27 +44,38 @@ public class LoanBankInformationService extends MybatisBaseService<LoanBankInfor
     public ResultBean save(LoanBankInformationDto dto) {
         ResultBean rb=new ResultBean();
         if(dto.getPSid().equals("")){
-            dto.setSid("0");
+            dto.setPSid("0");
         }
         LoanBankInformation entity=new LoanBankInformation();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
-        return rb.success().setMsg("修改模板信息成功");
+        return rb.success().setMsg("保存贷款银行信息成功");
     }
     public ResultBean update(LoanBankInformationDto dto) {
         ResultBean rb=new ResultBean();
-        LoanBankInformation entity=new LoanBankInformation();
+        String dtoSid = dto.getSid();
+        LoanBankInformation entity=fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.updateById(entity);
-        return rb.success().setMsg("修改模板信息成功");
+        return rb.success().setMsg("修改贷款银行信息成功");
     }
     public LoanBankInformationVo getBankInformation(String sid){
-
-        return baseMapper.getBankInformation(sid);
+        //根据sid查询的银行信息
+        LoanBankInformationVo bank=baseMapper.getBankInformation(sid);
+        //根据sid查询银行联系人
+        List<BankManagerVo> managerList=baseMapper.getBankManager(sid);
+        bank.setManagerList(managerList);
+        //获取下级支行
+        List<LoanBankInformationVo> list=baseMapper.bankList(bank.getSid());
+//        for(LoanBankInformationVo loan:list){
+//            loan.setManagerList(baseMapper.getBankManager(loan.getSid()));
+//        }
+        bank.setPBank(list);
+        return bank;
     }
     public ResultBean delete(String sid) {
         ResultBean rb=new ResultBean();
         baseMapper.delete(new QueryWrapper<LoanBankInformation>().eq("sid",sid));
-        return rb.success().setMsg("修改模板信息成功");
+        return rb.success().setMsg("删除贷款银行信息成功");
     }
 }