bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化费用信息查询逻辑，合并数据处理

This commit is contained in:
syruan 2025-09-24 21:33:55 +08:00
parent e8d5685ac9
commit 5388327dbb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
View File

@ -154,7 +154,6 @@ public class SltAgreementInfoController extends BaseController {
list.forEach(info -> info.setSettlementType(list.get(0).getSettlementType())); list.forEach(info -> info.setSettlementType(list.get(0).getSettlementType()));
} }
List<String> unitNames = new ArrayList<>(); List<String> unitNames = new ArrayList<>();
List<String> projectNames = new ArrayList<>(); List<String> projectNames = new ArrayList<>();
List<SltInfoVo> dataList = new ArrayList<>(); List<SltInfoVo> dataList = new ArrayList<>();
@ -163,6 +162,8 @@ public class SltAgreementInfoController extends BaseController {
for (SltAgreementInfo info : list) { for (SltAgreementInfo info : list) {
unitNames.add(info.getUnitName()); unitNames.add(info.getUnitName());
projectNames.add(info.getProjectName()); projectNames.add(info.getProjectName());
// 查询费用信息
SltInfoVo vo = sltAgreementInfoService.getSltInfo(info); SltInfoVo vo = sltAgreementInfoService.getSltInfo(info);
if (vo == null) { if (vo == null) {
vo = new SltInfoVo(); vo = new SltInfoVo();
@ -183,12 +184,16 @@ public class SltAgreementInfoController extends BaseController {
agreementId = info.getAgreementId(); agreementId = info.getAgreementId();
} }
} }
// 合并数据📊
bean = mergerData(bean, dataList,unitNames,projectNames); bean = mergerData(bean, dataList,unitNames,projectNames);
// 根据协议id获取申请时间 // 根据协议id获取申请时间
TmTask tmTask = taskMapper.selectTaskById(agreementId, list.get(0).getSettlementType()); TmTask tmTask = taskMapper.selectTaskById(agreementId, list.get(0).getSettlementType());
if (tmTask != null) { if (tmTask != null) {
bean.setApplyTime(tmTask.getCreateTime()); bean.setApplyTime(tmTask.getCreateTime());
} }
return AjaxResult.success(bean); return AjaxResult.success(bean);
} }