purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决开启强审核之后账户流水计算的bug

Browse Source
This commit is contained in:
jishenghua
2024-06-12 00:22:15 +08:00
parent acd8429c81
commit 8ba07e02d1
4 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java
View File

@@ -115,15 +115,15 @@ public class AccountController {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
Boolean forceFlag = systemConfigService.getForceApprovalFlag();
List<AccountVo4InOutList> dataList = accountService.findAccountInOutList(accountId, StringUtil.toNull(number),
beginTime, endTime, (currentPage-1)*pageSize, pageSize);
beginTime, endTime, forceFlag, (currentPage-1)*pageSize, pageSize);
int total = accountService.findAccountInOutListCount(accountId, StringUtil.toNull(number),
beginTime, endTime);
beginTime, endTime, forceFlag);
map.put("total", total);
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
Boolean forceFlag = systemConfigService.getForceApprovalFlag();
for (AccountVo4InOutList aEx : dataList) {
String type = aEx.getType().replace("其它", "");
aEx.setType(type);