Преглед изворни кода

查询条件加入账号,列表也显示账号

shane пре 5 година
родитељ
комит
0304e3470a

+ 3 - 1
java110-bean/src/main/java/com/java110/dto/accountWithdrawalApply/AccountWithdrawalApplyDto.java

@@ -1,6 +1,8 @@
 package com.java110.dto.accountWithdrawalApply;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.accountBank.AccountBankDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +14,7 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class AccountWithdrawalApplyDto extends PageDto implements Serializable {
+public class AccountWithdrawalApplyDto extends AccountBankDto implements Serializable {
 
     private String applyId;
 private String applyUserName;

+ 6 - 6
java110-db/src/main/resources/mapper/acct/AccountWithdrawalApplyServiceDaoImplMapper.xml

@@ -11,10 +11,10 @@
     <!-- 保存账户提现信息 add by wuxw 2018-07-03 -->
     <insert id="saveAccountWithdrawalApplyInfo" parameterType="Map">
         insert into account_withdrawal_apply(
-apply_id,apply_user_name,amount,context,acct_id,state,apply_user_tel,apply_user_id,bank_id
-) values (
-#{applyId},#{applyUserName},#{amount},#{context},#{acctId},#{state},#{applyUserTel},#{applyUserId},#{bankId}
-)
+    apply_id,apply_user_name,amount,context,acct_id,state,apply_user_tel,apply_user_id,bank_id
+    ) values (
+    #{applyId},#{applyUserName},#{amount},#{context},#{acctId},#{state},#{applyUserTel},#{applyUserId},#{bankId}
+    )
     </insert>
 
 
@@ -24,8 +24,8 @@ apply_id,apply_user_name,amount,context,acct_id,state,apply_user_tel,apply_user_
     select  t.apply_id,t.apply_id applyId,t.apply_user_name,t.apply_user_name applyUserName,
     t.amount,t.create_time,t.create_time createTime,t.context,t.acct_id,t.acct_id acctId,
     t.status_cd,t.status_cd statusCd,t.state,t.apply_user_tel,t.apply_user_tel applyUserTel,
-    t.apply_user_id,t.apply_user_id applyUserId,t1.`name` stateName,t.bank_id bankId
-    from account_withdrawal_apply t left join t_dict t1 on t.state = t1.status_cd
+    t.apply_user_id,t.apply_user_id applyUserId,t1.`name` stateName,t.bank_id bankId,ab.bank_code bankCode,ab.bank_name bankName
+    from account_withdrawal_apply t LEFT JOIN  account_bank ab on t.bank_id = ab.bank_id  left join t_dict t1 on t.state = t1.status_cd
     where t1.table_name='account_withdrawal_apply'
       and t1.table_columns='state'
 <if test="applyId !=null and applyId != ''">

+ 3 - 0
service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java

@@ -95,6 +95,7 @@ public class AccountWithdrawalApplyApi {
     public ResponseEntity<String> queryAccountWithdrawalApply(@RequestParam(value = "page") int page,
                                                               @RequestParam(value = "row") int row,
                                                               @RequestParam(value = "applyUserName",required = false) String applyUserName,
+                                                              @RequestParam(value = "bankCode",required = false) String bankCode,
                                                               @RequestParam(value = "applyUserTel",required = false) String applyUserTel,
                                                               @RequestParam(value = "state",required = false) String state) {
         AccountWithdrawalApplyDto accountWithdrawalApplyDto = new AccountWithdrawalApplyDto();
@@ -102,6 +103,8 @@ public class AccountWithdrawalApplyApi {
         accountWithdrawalApplyDto.setRow(row);
         accountWithdrawalApplyDto.setApplyUserName(applyUserName);
         accountWithdrawalApplyDto.setApplyUserTel(applyUserTel);
+        accountWithdrawalApplyDto.setBankCode(bankCode);
+
         if(null == state || "".equals( state )){
             state = "";
         }