营销基础参数业务

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayAisleQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -41,5 +42,5 @@ public class PayAisleQueryBo extends BaseEntity {
 	private String payWay;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayCostQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -41,5 +42,5 @@ public class PayCostQueryBo extends BaseEntity {
 	private String costName;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayNatureQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -41,5 +42,5 @@ public class PayNatureQueryBo extends BaseEntity {
 	private String natureName;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayPayeeAisleAddBo.java

@@ -36,4 +36,8 @@ public class PayPayeeAisleAddBo {
     /** 收款方账号 */
     @ApiModelProperty("收款方账号")
     private String payeeAccount;
+
+    /** 账号类型 */
+    @ApiModelProperty("账号类型")
+    private Long dictId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayPayeeAisleEditBo.java

@@ -42,4 +42,8 @@ public class PayPayeeAisleEditBo {
     @ApiModelProperty("收款方账号")
     private String payeeAccount;
 
+    /** 账号类型 */
+    @ApiModelProperty("账号类型")
+    private Long dictId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayPayeeAisleQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -36,6 +37,8 @@ public class PayPayeeAisleQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	@ApiModelProperty("$column.columnComment")
+	private Long accountId;
 	/** 收款方ID */
 	@ApiModelProperty("收款方ID")
 	private Long payeeId;
@@ -44,8 +47,12 @@ public class PayPayeeAisleQueryBo extends BaseEntity {
 	private Long aisleId;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 	/** 收款方账号 */
 	@ApiModelProperty("收款方账号")
 	private String payeeAccount;
+
+	/** 账号类型 */
+	@ApiModelProperty("账号类型")
+	private Long dictId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayPayeeQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -41,5 +42,5 @@ public class PayPayeeQueryBo extends BaseEntity {
 	private String payeeName;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayServeQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -41,5 +42,5 @@ public class PayServeQueryBo extends BaseEntity {
 	private String serveName;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PaySourceQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -38,7 +39,7 @@ public class PaySourceQueryBo extends BaseEntity {
 
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 	/** 渠道名称 */
 	@ApiModelProperty("渠道名称")
 	private String sourceName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PaySupplyQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -36,9 +37,14 @@ public class PaySupplyQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long supplyId;
+
+
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 	/** 供应方名称 */
 	@ApiModelProperty("供应方名称")
 	private String supplyName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/bo/PayVisitQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -41,5 +42,5 @@ public class PayVisitQueryBo extends BaseEntity {
 	private String visitName;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/domain/PayPayeeAisle.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.pay.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -40,4 +41,8 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 收款方账号 */
     private String payeeAccount;
+
+
+    /** 支付方式 */
+    private Long dictId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/mapper/PayPayeeAisleMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.pay.mapper;
 
+import com.zhongzheng.modules.pay.bo.PayPayeeAisleQueryBo;
 import com.zhongzheng.modules.pay.domain.PayPayeeAisle;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.pay.vo.PayPayeeAisleVo;
+
+import java.util.Collection;
 
 /**
  * 收款方账户Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PayPayeeAisleMapper extends BaseMapper<PayPayeeAisle> {
 
+    Collection<PayPayeeAisleVo> queryList(PayPayeeAisleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/mapper/PaySupplyMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.pay.mapper;
 
+import com.zhongzheng.modules.pay.bo.PaySupplyQueryBo;
 import com.zhongzheng.modules.pay.domain.PaySupply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.pay.vo.PaySupplyVo;
+
+import java.util.Collection;
 
 /**
  * 供应方Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PaySupplyMapper extends BaseMapper<PaySupply> {
 
+    Collection<PaySupplyVo> queryList(PaySupplyQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayAisleServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +41,7 @@ public class PayAisleServiceImpl extends ServiceImpl<PayAisleMapper, PayAisle> i
     public List<PayAisleVo> queryList(PayAisleQueryBo bo) {
         LambdaQueryWrapper<PayAisle> lqw = Wrappers.lambdaQuery();
         lqw.eq(StrUtil.isNotBlank(bo.getPayWay()), PayAisle::getPayWay, bo.getPayWay());
-        lqw.eq(bo.getStatus() != null, PayAisle::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, PayAisle::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayCostServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayAisle;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +41,7 @@ public class PayCostServiceImpl extends ServiceImpl<PayCostMapper, PayCost> impl
     public List<PayCostVo> queryList(PayCostQueryBo bo) {
         LambdaQueryWrapper<PayCost> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getCostName()), PayCost::getCostName, bo.getCostName());
-        lqw.eq(bo.getStatus() != null, PayCost::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, PayCost::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayNatureServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayCost;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +41,7 @@ public class PayNatureServiceImpl extends ServiceImpl<PayNatureMapper, PayNature
     public List<PayNatureVo> queryList(PayNatureQueryBo bo) {
         LambdaQueryWrapper<PayNature> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getNatureName()), PayNature::getNatureName, bo.getNatureName());
-        lqw.eq(bo.getStatus() != null, PayNature::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, PayNature::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayPayeeAisleServiceImpl.java

@@ -32,18 +32,15 @@ public class PayPayeeAisleServiceImpl extends ServiceImpl<PayPayeeAisleMapper, P
 
     @Override
     public PayPayeeAisleVo queryById(Long accountId){
-        PayPayeeAisle db = this.baseMapper.selectById(accountId);
-        return BeanUtil.toBean(db, PayPayeeAisleVo.class);
+        PayPayeeAisleQueryBo payPayeeAisleQueryBo = new PayPayeeAisleQueryBo();
+        payPayeeAisleQueryBo.setAccountId(accountId);
+        Collection<PayPayeeAisleVo> payPayeeAisleVos = baseMapper.queryList(payPayeeAisleQueryBo);
+        return BeanUtil.toBean(entity2Vo(payPayeeAisleVos).get(0), PayPayeeAisleVo.class);
     }
 
     @Override
     public List<PayPayeeAisleVo> queryList(PayPayeeAisleQueryBo bo) {
-        LambdaQueryWrapper<PayPayeeAisle> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getPayeeId() != null, PayPayeeAisle::getPayeeId, bo.getPayeeId());
-        lqw.eq(bo.getAisleId() != null, PayPayeeAisle::getAisleId, bo.getAisleId());
-        lqw.eq(bo.getStatus() != null, PayPayeeAisle::getStatus, bo.getStatus());
-        lqw.eq(StrUtil.isNotBlank(bo.getPayeeAccount()), PayPayeeAisle::getPayeeAccount, bo.getPayeeAccount());
-        return entity2Vo(this.list(lqw));
+        return entity2Vo(baseMapper.queryList(bo));
     }
 
     /**
@@ -52,12 +49,12 @@ public class PayPayeeAisleServiceImpl extends ServiceImpl<PayPayeeAisleMapper, P
     * @param collection 实体类集合
     * @return
     */
-    private List<PayPayeeAisleVo> entity2Vo(Collection<PayPayeeAisle> collection) {
+    private List<PayPayeeAisleVo> entity2Vo(Collection<PayPayeeAisleVo> collection) {
         List<PayPayeeAisleVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, PayPayeeAisleVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<PayPayeeAisle> page = (Page<PayPayeeAisle>)collection;
+            Page<PayPayeeAisleVo> page = (Page<PayPayeeAisleVo>)collection;
             Page<PayPayeeAisleVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayPayeeServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayAisle;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +41,7 @@ public class PayPayeeServiceImpl extends ServiceImpl<PayPayeeMapper, PayPayee> i
     public List<PayPayeeVo> queryList(PayPayeeQueryBo bo) {
         LambdaQueryWrapper<PayPayee> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getPayeeName()), PayPayee::getPayeeName, bo.getPayeeName());
-        lqw.eq(bo.getStatus() != null, PayPayee::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, PayPayee::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayServeServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayPayee;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +41,7 @@ public class PayServeServiceImpl extends ServiceImpl<PayServeMapper, PayServe> i
     public List<PayServeVo> queryList(PayServeQueryBo bo) {
         LambdaQueryWrapper<PayServe> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getServeName()), PayServe::getServeName, bo.getServeName());
-        lqw.eq(bo.getStatus() != null, PayServe::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, PayServe::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PaySourceServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayServe;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -39,7 +40,7 @@ public class PaySourceServiceImpl extends ServiceImpl<PaySourceMapper, PaySource
     @Override
     public List<PaySourceVo> queryList(PaySourceQueryBo bo) {
         LambdaQueryWrapper<PaySource> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getStatus() != null, PaySource::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, PaySource::getStatus, bo.getStatus());
         lqw.like(StrUtil.isNotBlank(bo.getSourceName()), PaySource::getSourceName, bo.getSourceName());
         return entity2Vo(this.list(lqw));
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PaySupplyServiceImpl.java

@@ -32,17 +32,14 @@ public class PaySupplyServiceImpl extends ServiceImpl<PaySupplyMapper, PaySupply
 
     @Override
     public PaySupplyVo queryById(Long supplyId){
-        PaySupply db = this.baseMapper.selectById(supplyId);
-        return BeanUtil.toBean(db, PaySupplyVo.class);
+        PaySupplyQueryBo paySupplyQueryBo = new PaySupplyQueryBo();
+        paySupplyQueryBo.setSupplyId(supplyId);
+        return entity2Vo(baseMapper.queryList(paySupplyQueryBo)).get(0);
     }
 
     @Override
     public List<PaySupplyVo> queryList(PaySupplyQueryBo bo) {
-        LambdaQueryWrapper<PaySupply> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getStatus() != null, PaySupply::getStatus, bo.getStatus());
-        lqw.like(StrUtil.isNotBlank(bo.getSupplyName()), PaySupply::getSupplyName, bo.getSupplyName());
-        lqw.eq(bo.getServerId() != null, PaySupply::getServerId, bo.getServerId());
-        return entity2Vo(this.list(lqw));
+        return entity2Vo(baseMapper.queryList(bo));
     }
 
     /**
@@ -51,12 +48,12 @@ public class PaySupplyServiceImpl extends ServiceImpl<PaySupplyMapper, PaySupply
     * @param collection 实体类集合
     * @return
     */
-    private List<PaySupplyVo> entity2Vo(Collection<PaySupply> collection) {
+    private List<PaySupplyVo> entity2Vo(Collection<PaySupplyVo> collection) {
         List<PaySupplyVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, PaySupplyVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<PaySupply> page = (Page<PaySupply>)collection;
+            Page<PaySupplyVo> page = (Page<PaySupplyVo>)collection;
             Page<PaySupplyVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayVisitServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.pay.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.pay.domain.PayAisle;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +41,7 @@ public class PayVisitServiceImpl extends ServiceImpl<PayVisitMapper, PayVisit> i
     public List<PayVisitVo> queryList(PayVisitQueryBo bo) {
         LambdaQueryWrapper<PayVisit> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getVisitName()), PayVisit::getVisitName, bo.getVisitName());
-        lqw.eq(bo.getStatus() != null, PayVisit::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, PayVisit::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/vo/PayAisleVo.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -31,7 +31,7 @@ public class PayAisleVo {
 	/** 0 禁用 1启用 */
 	@Excel(name = "0 禁用 1启用")
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 	/** 备注 */
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/vo/PayPayeeAisleVo.java

@@ -40,4 +40,24 @@ public class PayPayeeAisleVo {
 	@Excel(name = "收款方账号")
 	@ApiModelProperty("收款方账号")
 	private String payeeAccount;
+
+	/** 收款方 */
+	@Excel(name = "收款方")
+	@ApiModelProperty("收款方")
+	private String payeeName;
+
+	/** 支付方式 */
+	@Excel(name = "支付方式")
+	@ApiModelProperty("支付方式")
+	private String payWay;
+
+	/** 支付方式 */
+	@Excel(name = "账户类型")
+	@ApiModelProperty("账户类型")
+	private String dictLabel;
+
+	/** 支付方式 */
+	@Excel(name = "账户类型ID")
+	@ApiModelProperty("账户类型ID")
+		private Long dictId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/vo/PaySupplyVo.java

@@ -40,4 +40,9 @@ public class PaySupplyVo {
 	@Excel(name = "服务类型ID")
 	@ApiModelProperty("服务类型ID")
 	private Long serverId;
+
+	/** 服务类型ID */
+	@Excel(name = "服务类型")
+	@ApiModelProperty("服务类型")
+	private String serverName;
 }

zhongzheng-system/src/main/resources/mapper/modules/pay/PayPayeeAisleMapper.xml

@@ -14,5 +14,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payeeAccount" column="payee_account"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.pay.vo.PayPayeeAisleVo" id="PayPayeeAisleVoResult">
+        <result property="accountId" column="account_id"/>
+        <result property="payeeId" column="payee_id"/>
+        <result property="aisleId" column="aisle_id"/>
+        <result property="status" column="status"/>
+        <result property="payeeAccount" column="payee_account"/>
+        <result property="payeeName" column="payee_name"/>
+        <result property="payWay" column="pay_way"/>
+        <result property="dictLabel" column="dict_label"/>
+    </resultMap>
+
+
+
+
+    <select id="queryList" parameterType="com.zhongzheng.modules.pay.bo.PayPayeeAisleQueryBo"  resultMap="PayPayeeAisleVoResult">
+        SELECT
+            p.*,
+            y.payee_name,
+            a.pay_way,
+            d.dict_label
+        FROM
+            pay_payee_aisle p
+                LEFT JOIN pay_payee y on p.payee_id =y.payee_id
+                LEFT JOIN pay_aisle a on a.aisle_id = p.aisle_id
+                LEFT JOIN sys_dict_data d on d.dict_code = p.dict_id
+        where 1=1
+        <if test="status != null and status.size()!=0 ">
+            AND p.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="accountId != null and accountId != ''">
+            AND p.account_id = #{accountId}
+        </if>
+    </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/pay/PaySupplyMapper.xml

@@ -14,5 +14,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="serverId" column="server_id"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.pay.vo.PaySupplyVo" id="PaySupplyVoResult">
+        <result property="supplyId" column="supply_id"/>
+        <result property="status" column="status"/>
+        <result property="remark" column="remark"/>
+        <result property="supplyName" column="supply_name"/>
+        <result property="serverId" column="server_id"/>
+        <result property="serverName" column="server_name"/>
+    </resultMap>
 
+    <select id="queryList" parameterType="com.zhongzheng.modules.pay.bo.PayPayeeAisleQueryBo"  resultMap="PaySupplyVoResult">
+        SELECT
+        s.*,
+        e.serve_name
+        FROM
+        pay_supply s
+        LEFT JOIN pay_serve e ON s.server_id = e.serve_id
+        where 1=1
+        <if test="status != null and status.size()!=0 ">
+            AND s.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="supplyId != null and supplyId != ''">
+            AND p.supply_id = #{supplyId}
+        </if>
+    </select>
 </mapper>