收款方账号参数业务

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamKnowledgeServiceImpl.java

@@ -10,6 +10,7 @@ import com.zhongzheng.modules.exam.bo.*;
 import com.zhongzheng.modules.exam.domain.ExamKnowledgeBusiness;
 import com.zhongzheng.modules.exam.domain.ExamPaper;
 import com.zhongzheng.modules.exam.service.IExamKnowledgeBusinessService;
+import org.apache.commons.codec.digest.Md5Crypt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.pay.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -37,7 +38,7 @@ public class PayPayeeAisleAddBo {
     @ApiModelProperty("收款方账号")
     private String payeeAccount;
 
-    /** 账号类型 */
-    @ApiModelProperty("账号类型")
-    private Long dictId;
+    /** 支付方式 */
+    @ApiModelProperty("1 扫码支付  2刷卡支付 3现金支付 4转账")
+    private Integer typeStatus;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.pay.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -42,8 +43,9 @@ public class PayPayeeAisleEditBo {
     @ApiModelProperty("收款方账号")
     private String payeeAccount;
 
-    /** 账号类型 */
-    @ApiModelProperty("账号类型")
-    private Long dictId;
+    /** 支付方式 */
+    @Excel(name = "1 扫码支付  2刷卡支付 3现金支付 4转账")
+    @ApiModelProperty("1 扫码支付  2刷卡支付 3现金支付 4转账")
+    private Integer typeStatus;
 
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.pay.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -52,7 +53,8 @@ public class PayPayeeAisleQueryBo extends BaseEntity {
 	@ApiModelProperty("收款方账号")
 	private String payeeAccount;
 
-	/** 账号类型 */
-	@ApiModelProperty("账号类型")
-	private Long dictId;
+	/** 支付方式 */
+	@Excel(name = "1 扫码支付  2刷卡支付 3现金支付 4转账")
+	@ApiModelProperty("1 扫码支付  2刷卡支付 3现金支付 4转账")
+	private Integer typeStatus;
 }

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

@@ -42,7 +42,6 @@ private static final long serialVersionUID=1L;
     /** 收款方账号 */
     private String payeeAccount;
 
-
     /** 支付方式 */
-    private Long dictId;
+    private Integer typeStatus;
 }

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

@@ -51,13 +51,9 @@ public class PayPayeeAisleVo {
 	@ApiModelProperty("支付方式")
 	private String payWay;
 
-	/** 支付方式 */
-	@Excel(name = "账户类型")
-	@ApiModelProperty("账户类型")
-	private String dictLabel;
 
 	/** 支付方式 */
-	@Excel(name = "账户类型ID")
-	@ApiModelProperty("账户类型ID")
-		private Long dictId;
+	@Excel(name = "1 扫码支付  2刷卡支付 3现金支付 4转账")
+	@ApiModelProperty("1 扫码支付  2刷卡支付 3现金支付 4转账")
+	private Integer typeStatus;
 }

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

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payeeAccount" column="payee_account"/>
         <result property="payeeName" column="payee_name"/>
         <result property="payWay" column="pay_way"/>
-        <result property="dictLabel" column="dict_label"/>
+        <result property="typeStatus" column="type_status"/>
     </resultMap>
 
 
@@ -32,13 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             p.*,
             y.payee_name,
-            a.pay_way,
-            d.dict_label
+            a.pay_way
         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