aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 计算时间范围内每一天账单总金额修改' (#19) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/19
This commit is contained in:
smshen 2025-05-08 13:25:53 +08:00
commit 897b265198
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -296,7 +296,7 @@ public class EmisSettleBillController extends BaseController
*/
@GetMapping("/calculateRecedMoney")
public AjaxResult calculateRecedMoney(String beginTime, String endTime) {
List<Map<String, String>> result = emisSettleBillService.calculateRecedMoney(beginTime, endTime);
List<Map<String, Object>> result = emisSettleBillService.calculateRecedMoney(beginTime, endTime);
return AjaxResult.success(result);
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java
View File

@ -151,5 +151,5 @@ public interface IEmisSettleBillService extends IDataAuditService
* @param endTime 结束时间
* @return 每一天的收款总金额
*/
List<Map<String, String>> calculateRecedMoney(String beginTime, String endTime);
List<Map<String, Object>> calculateRecedMoney(String beginTime, String endTime);
}

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -1215,18 +1215,9 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
}
@Override
public List<Map<String, String>> calculateRecedMoney(String beginTime, String endTime) {
public List<Map<String, Object>> calculateRecedMoney(String beginTime, String endTime) {
// 查询获取按天统计的已收款金额
List<Map<String, Object>> resultList = emisSettlePayRecordMapper.calculateRecedMoney(beginTime, endTime);
List<Map<String, String>> dailyAmounts = new ArrayList<>();
for (Map<String, Object> result : resultList) {
Map<String, String> item = new HashMap<>();
item.put("tradeDay", (String) result.get("tradeDay"));
item.put("payMoney", result.get("payMoney").toString());
dailyAmounts.add(item);
}
return dailyAmounts;
return emisSettlePayRecordMapper.calculateRecedMoney(beginTime, endTime);
}
/**