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 map = accountService.getStatistics(); + Map 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 getAccountByParam( + @Param("name") String name, + @Param("serialNo") String serialNo); + List 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 getAccountByParam(String name, String serialNo) throws Exception{ + List list=null; + try{ + list=accountMapperEx.getAccountByParam(name, serialNo); + }catch(Exception e){ + JshException.readFail(logger, e); + } + return list; } public List select(String name, String serialNo, String remark, int offset, int rows) throws Exception{ @@ -547,10 +556,10 @@ public class AccountService { } - public Map getStatistics() { + public Map getStatistics(String name, String serialNo) { Map map = new HashMap<>(); try { - List list = getAccount(); + List 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 @@ + + + update jsh_account set delete_flag='1'