Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

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

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

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

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; // 金额
+
+}

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

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

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

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

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

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

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

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; // 供应商编码
+
+}

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

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

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

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

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

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

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

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

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

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>

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

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

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

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>

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

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

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")
+    @PostMapping("/sendMessage")
-    @Test
+    public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
-    public void sendMessage() throws Exception {
-        //String openId="otnrM57kui-WCUmRtChhb1HguOgw";
-        //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
 
-        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 accessToken=getAccessToken(APP_ID,APPSECRET);
-        String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken;
+        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("first", "f123");
-//        sendMag.put("keyword1", new WeChatTemplateMsg("111"));
+        sendMag.put("keyword1", "111");
-//        sendMag.put("keyword2", new WeChatTemplateMsg("222"));
+        sendMag.put("keyword2", "222");
-//        sendMag.put("keyword3", new WeChatTemplateMsg("333"));
+        sendMag.put("keyword3", "333");
-//        sendMag.put("keyword4", new WeChatTemplateMsg("444"));
+        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);
+
+        //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<>());
+        String url = WX_URL_ACCESS_TOKEN.replace("APPID", appId).replace("APPSECRET", appsecret);
-//        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;
     }
-
+    /**
+     * * 发送模板消息
+     * 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();
+//        }
+//
+//    }
 
 }

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

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