From 5388327dbb7dad737e28af97235c295e3dcaa269 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 24 Sep 2025 21:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B9=E7=94=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settlement/controller/SltAgreementInfoController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index d4d50b41..9a417c0f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -154,7 +154,6 @@ public class SltAgreementInfoController extends BaseController { list.forEach(info -> info.setSettlementType(list.get(0).getSettlementType())); } - List unitNames = new ArrayList<>(); List projectNames = new ArrayList<>(); List dataList = new ArrayList<>(); @@ -163,6 +162,8 @@ public class SltAgreementInfoController extends BaseController { for (SltAgreementInfo info : list) { unitNames.add(info.getUnitName()); projectNames.add(info.getProjectName()); + + // 查询费用信息 SltInfoVo vo = sltAgreementInfoService.getSltInfo(info); if (vo == null) { vo = new SltInfoVo(); @@ -183,12 +184,16 @@ public class SltAgreementInfoController extends BaseController { agreementId = info.getAgreementId(); } } + + // 合并数据📊 bean = mergerData(bean, dataList,unitNames,projectNames); + // 根据协议id获取申请时间 TmTask tmTask = taskMapper.selectTaskById(agreementId, list.get(0).getSettlementType()); if (tmTask != null) { bean.setApplyTime(tmTask.getCreateTime()); } + return AjaxResult.success(bean); }