From 3f20dd673155a61dc44639db60fdaf5e01a3851d Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期五, 18 六月 2021 09:47:12 +0800
Subject: [PATCH] 优化更新状态

---
 service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java b/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java
index 35955bc..62bbf5c 100644
--- a/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java
+++ b/service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java
@@ -42,7 +42,7 @@
         Assert.hasKeyAndValue(reqJson, "amount", "璇锋眰鎶ユ枃涓湭鍖呭惈amount");
 
         AccountWithdrawalApplyPo accountWithdrawalApplyPo = BeanConvertUtil.covertBean(reqJson, AccountWithdrawalApplyPo.class);
-        return saveAccountWithdrawalApplyBMOImpl.save(accountWithdrawalApplyPo,userId);
+        return saveAccountWithdrawalApplyBMOImpl.save(accountWithdrawalApplyPo,userId,reqJson);
     }
 
     /**
@@ -55,8 +55,6 @@
     @RequestMapping(value = "/upAccountWithdrawalApply", method = RequestMethod.POST)
     public ResponseEntity<String> updateAccountWithdrawalApply(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "acctId", "璇锋眰鎶ユ枃涓湭鍖呭惈acctId");
-        Assert.hasKeyAndValue(reqJson, "amount", "璇锋眰鎶ユ枃涓湭鍖呭惈amount");
         Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
         Assert.hasKeyAndValue(reqJson, "applyId", "applyId涓嶈兘涓虹┖");
 
@@ -103,7 +101,19 @@
         accountWithdrawalApplyDto.setRow(row);
         accountWithdrawalApplyDto.setApplyUserName(applyUserName);
         accountWithdrawalApplyDto.setApplyUserTel(applyUserTel);
+        if(null == state || "".equals( state )){
+            state = "";
+        }
         accountWithdrawalApplyDto.setState(state);
         return getAccountWithdrawalApplyBMOImpl.get(accountWithdrawalApplyDto);
     }
+
+
+    @RequestMapping(value = "/listStateWithdrawalApplys", method = RequestMethod.GET)
+    public ResponseEntity<String> listStateWithdrawalApplys(@RequestParam(value = "page") int page,
+                                                              @RequestParam(value = "row") int row,
+                                                              @RequestParam(value = "state") String state) {
+        String [] states = state.split( "," );
+        return getAccountWithdrawalApplyBMOImpl.listStateWithdrawalApplys( states, page,row);
+    }
 }

--
Gitblit v1.8.0