From ab680f9ff9bfbc0a5b38493ed76e8852ea8ff9c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 7 Jan 2021 23:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B4=A6=E6=88=B7=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=9F=E8=AE=A1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/reports/account_report.html         |  4 ++++
 .../com/jsh/erp/controller/AccountController.java |  6 ++++--
 .../erp/datasource/mappers/AccountMapperEx.java   |  5 +++++
 .../jsh/erp/service/account/AccountService.java   | 13 +++++++++++--
 src/main/resources/mapper_xml/AccountMapperEx.xml | 15 +++++++++++++++
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html
index 27978fd5..0ee62e8f 100644
--- a/erp_web/pages/reports/account_report.html
+++ b/erp_web/pages/reports/account_report.html
@@ -196,6 +196,10 @@
             type: "get",
             url: "/account/getStatistics",
             dataType: "json",
+            data: ({
+                name: name,
+                serialNo: serialNo
+            }),
             success: function (res) {
                 if (res && res.code === 200) {
                     if(res.data) {
diff --git a/src/main/java/com/jsh/erp/controller/AccountController.java b/src/main/java/com/jsh/erp/controller/AccountController.java
index 951fbfba..02d00847 100644
--- a/src/main/java/com/jsh/erp/controller/AccountController.java
+++ b/src/main/java/com/jsh/erp/controller/AccountController.java
@@ -179,10 +179,12 @@ public class AccountController {
      * @return
      */
     @GetMapping(value = "/getStatistics")
-    public BaseResponseInfo getStatistics(HttpServletRequest request) throws Exception {
+    public BaseResponseInfo getStatistics(@RequestParam("name") String name,
+                                          @RequestParam("serialNo") String serialNo,
+                                          HttpServletRequest request) throws Exception {
         BaseResponseInfo res = new BaseResponseInfo();
         try {
-            Map<String, Object> map = accountService.getStatistics();
+            Map<String, Object> map = accountService.getStatistics(name, serialNo);
             res.code = 200;
             res.data = map;
         } catch(Exception e){
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java
index 01dae501..d6e12f34 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java
@@ -11,6 +11,10 @@ import java.util.List;
 
 public interface AccountMapperEx {
 
+    List<Account> getAccountByParam(
+            @Param("name") String name,
+            @Param("serialNo") String serialNo);
+
     List<AccountVo4List> selectByConditionAccount(
             @Param("name") String name,
             @Param("serialNo") String serialNo,
@@ -32,4 +36,5 @@ public interface AccountMapperEx {
             @Param("accountId") Long accountId);
 
     int batchDeleteAccountByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java
index e574cac6..63ae395f 100644
--- a/src/main/java/com/jsh/erp/service/account/AccountService.java
+++ b/src/main/java/com/jsh/erp/service/account/AccountService.java
@@ -84,7 +84,16 @@ public class AccountService {
             JshException.readFail(logger, e);
         }
         return list;
+    }
 
+    public List<Account> getAccountByParam(String name, String serialNo) throws Exception{
+        List<Account> list=null;
+        try{
+            list=accountMapperEx.getAccountByParam(name, serialNo);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
     }
 
     public List<AccountVo4List> select(String name, String serialNo, String remark, int offset, int rows) throws Exception{
@@ -547,10 +556,10 @@ public class AccountService {
 
     }
 
-    public Map<String, Object> getStatistics() {
+    public Map<String, Object> getStatistics(String name, String serialNo) {
         Map<String, Object> map = new HashMap<>();
         try {
-            List<Account> list = getAccount();
+            List<Account> list = getAccountByParam(name, serialNo);
             String timeStr = Tools.getCurrentMonth();
             BigDecimal allMonthAmount = BigDecimal.ZERO;
             BigDecimal allCurrentAmount = BigDecimal.ZERO;
diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml
index e37bb9a2..3cabcaf2 100644
--- a/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -15,6 +15,20 @@
         <result column="AMList" jdbcType="VARCHAR" property="amList" />
     </resultMap>
 
+    <select id="getAccountByParam" resultType="com.jsh.erp.datasource.entities.Account">
+        select *
+        FROM jsh_account
+        where 1=1
+        <if test="name != null and name !=''">
+            <bind name="bindName" value="'%'+name+'%'"/>
+            and name like #{bindName}
+        </if>
+        <if test="serialNo != null and serialNo !=''">
+            <bind name="bindSerialNo" value="'%'+serialNo+'%'"/>
+            and serial_no like #{bindSerialNo}
+        </if>
+    </select>
+
     <select id="selectByConditionAccount" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultListMap">
         select *
         FROM jsh_account
@@ -173,6 +187,7 @@
             and ifnull(dh.delete_flag,'0') !='1'
         ) cc
     </select>
+
     <update id="batchDeleteAccountByIds">
         update jsh_account
         set delete_flag='1'