Browse Source

新增私有报销帐号列表

anderx 2 years ago
parent
commit
e206b4cb65

+ 4 - 1
src/main/java/com/goafanti/common/dao/ExpenseAccountPrivateMapper.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.ExpenseAccountPrivate;
+import com.goafanti.expenseAccount.bo.InputExpenseAccountPrivate;
 
 public interface ExpenseAccountPrivateMapper {
     int deleteByPrimaryKey(Integer id);
@@ -15,5 +16,7 @@ public interface ExpenseAccountPrivateMapper {
 
     int updateByPrimaryKey(ExpenseAccountPrivate record);
 
-    Integer checkAid(String aid);
+    Integer checkParam(InputExpenseAccountPrivate in);
+
+
 }

+ 27 - 2
src/main/java/com/goafanti/common/mapper/ExpenseAccountPrivateMapper.xml

@@ -121,8 +121,33 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="checkAid" resultType="java.lang.Integer">
+  <select id="checkParam" resultType="java.lang.Integer">
     select count(*) from expense_account_private
-    where status=1 and aid =#{aid}
+    where 1=1
+    <if test="status !=null">
+      and status= #{status}
+    </if>
+     <if test="aid !=null">
+       and aid =#{aid}
+     </if>
+    <if test="accounts !=null">
+      and accounts =#{accounts}
+    </if>
   </select>
+  <select id="selectExpenseAccountPrivateList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountPrivate">
+    select id ,aid,name ,bank ,accounts ,open_bank openBank ,status ,
+    date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimeStr
+    from expense_account_private
+    where aid = #{aid}
+    order by create_time desc
+    <if test="page_sql !=null">
+      ${page_sql}
+    </if>
+  </select>
+  <select id="selectExpenseAccountPrivateCount" resultType="java.lang.Integer">
+    select count(*)
+    from expense_account_private
+    where aid = #{aid}
+  </select>
+
 </mapper>

+ 49 - 3
src/main/java/com/goafanti/expenseAccount/bo/InputExpenseAccountPrivate.java

@@ -8,8 +8,6 @@ import javax.validation.constraints.NotNull;
 
 public class InputExpenseAccountPrivate extends ExpenseAccountPrivate {
 
-    @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
-    @Param(name = "报销帐号")
     private String aid;
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
     @Param(name = "帐号名称")
@@ -22,8 +20,56 @@ public class InputExpenseAccountPrivate extends ExpenseAccountPrivate {
     private String accounts;
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
     @Param(name = "开户行名称")
-    private String open_bank;
+    private String openBank;
+
+
+    @Override
+    public String getAid() {
+        return aid;
+    }
+
+    @Override
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getBank() {
+        return bank;
+    }
+
+    @Override
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    @Override
+    public String getAccounts() {
+        return accounts;
+    }
 
+    @Override
+    public void setAccounts(String accounts) {
+        this.accounts = accounts;
+    }
 
+    @Override
+    public String getOpenBank() {
+        return openBank;
+    }
 
+    @Override
+    public void setOpenBank(String openBank) {
+        this.openBank = openBank;
+    }
 }

+ 6 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountPrivate.java

@@ -0,0 +1,6 @@
+package com.goafanti.expenseAccount.bo;
+
+import com.goafanti.common.model.ExpenseAccountPrivate;
+
+public class OutExpenseAccountPrivate extends ExpenseAccountPrivate {
+}

+ 23 - 3
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -1,10 +1,12 @@
 package com.goafanti.expenseAccount.controller;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.utils.ParamUtils;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.expenseAccount.bo.InputExpenseAccountPrivate;
-import com.goafanti.expenseAccount.service.ExpenseAccountService;
+import com.goafanti.expenseAccount.service.ExpenseAccountPrivateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
@@ -17,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class ExpenseAccountController extends CertifyApiController {
 
     @Autowired
-    private ExpenseAccountService expenseAccountService;
+    private ExpenseAccountPrivateService expenseAccountPrivateService;
 
     /**
      * 新增私有报销帐号
@@ -32,7 +34,25 @@ public class ExpenseAccountController extends CertifyApiController {
                     ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
             return res;
         }
-        res.setData(expenseAccountService.add(in));
+        in.setAid(TokenManager.getAdminId());
+        if (expenseAccountPrivateService.checkAccounts(in)){
+            res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_BEING_ERROR,"帐号"));
+            return res;
+        }
+        res.setData(expenseAccountPrivateService.add(in));
         return res;
     }
+
+    /**
+     * 私有报销帐号列表
+     * @return
+     */
+    @RequestMapping(value = "/selectList",method = RequestMethod.POST)
+    public Result selectList(Integer pageSize,Integer pageNo){
+        Result res =new Result();
+        res.setData(expenseAccountPrivateService.selectList(pageSize,pageNo));
+        return res;
+    }
+
+
 }

+ 11 - 0
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountPrivateService.java

@@ -0,0 +1,11 @@
+package com.goafanti.expenseAccount.service;
+
+import com.goafanti.expenseAccount.bo.InputExpenseAccountPrivate;
+
+public interface ExpenseAccountPrivateService {
+    int add(InputExpenseAccountPrivate in);
+
+    Object selectList(Integer pageSize, Integer pageNo);
+
+    boolean checkAccounts(InputExpenseAccountPrivate in);
+}

+ 0 - 7
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java

@@ -1,7 +0,0 @@
-package com.goafanti.expenseAccount.service;
-
-import com.goafanti.expenseAccount.bo.InputExpenseAccountPrivate;
-
-public interface ExpenseAccountService {
-    int add(InputExpenseAccountPrivate in);
-}

+ 58 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountPrivateServiceImpl.java

@@ -0,0 +1,58 @@
+package com.goafanti.expenseAccount.service.impl;
+
+import com.goafanti.common.dao.ExpenseAccountPrivateMapper;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.expenseAccount.bo.InputExpenseAccountPrivate;
+import com.goafanti.expenseAccount.service.ExpenseAccountPrivateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class ExpenseAccountPrivateServiceImpl extends BaseMybatisDao<ExpenseAccountPrivateMapper> implements ExpenseAccountPrivateService {
+
+    @Autowired
+    private ExpenseAccountPrivateMapper expenseAccountPrivateMapper;
+
+    @Override
+    public int add(InputExpenseAccountPrivate in) {
+        Integer defaultCount=0;
+        InputExpenseAccountPrivate check=new InputExpenseAccountPrivate();
+        check.setAid(in.getAid());
+        check.setStatus(1);
+         defaultCount= expenseAccountPrivateMapper.checkParam(check);
+         if (defaultCount>0){
+             in.setStatus(0);
+         }else {
+             in.setStatus(1);
+         }
+        return expenseAccountPrivateMapper.insertSelective(in);
+    }
+
+    @Override
+    public Object selectList(Integer pageSize, Integer pageNo) {
+        String aid=TokenManager.getAdminId();
+        Map<String,Object> params=new HashMap<>();
+        params.put("aid",aid);
+        Pagination<?> page = findPage("selectExpenseAccountPrivateList", "selectExpenseAccountPrivateCount", params, pageNo, pageSize);
+        return page;
+    }
+
+    @Override
+    public boolean checkAccounts(InputExpenseAccountPrivate in) {
+        InputExpenseAccountPrivate check=new InputExpenseAccountPrivate();
+        check.setAid(in.getAid());
+        check.setAccounts(in.getAccounts());
+        Integer checkCount = expenseAccountPrivateMapper.checkParam(check);
+        if (checkCount>0){
+            return true;
+        }else {
+            return false;
+        }
+
+    }
+}

+ 0 - 28
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1,28 +0,0 @@
-package com.goafanti.expenseAccount.service.impl;
-
-import com.goafanti.common.dao.ExpenseAccountPrivateMapper;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.expenseAccount.bo.InputExpenseAccountPrivate;
-import com.goafanti.expenseAccount.service.ExpenseAccountService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ExpenseAccountServiceImpl implements ExpenseAccountService {
-
-    @Autowired
-    private ExpenseAccountPrivateMapper expenseAccountPrivateMapper;
-
-    @Override
-    public int add(InputExpenseAccountPrivate in) {
-        String aid= TokenManager.getAdminId();
-        Integer defaultCount=0;
-         defaultCount= expenseAccountPrivateMapper.checkAid(aid);
-         if (defaultCount>0){
-             in.setStatus(0);
-         }else {
-             in.setStatus(1);
-         }
-        return expenseAccountPrivateMapper.insertSelective(in);
-    }
-}