From f22c9b8eb0eedba40d74875d3dac4927ea681ec5 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Sun, 16 Jul 2023 15:21:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E8=BF=99=E4=B8=AAID=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E6=94=B9=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index ced354ef..19b6f8ce 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -672,7 +672,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl List tbsScheduleItemBudgetList = tbsScheduleItemBudgetService.list(lqw); tbsScheduleItemBudgetList.forEach(a->{ LambdaQueryWrapper lqwLog = new LambdaQueryWrapper<>(); - lqwLog.eq(TbsBudgetLog::getScheduleItemId,a.getScheduleItemId()); + lqwLog.eq(TbsBudgetLog::getScheduleItemBudgetId,a.getId()); lqwLog.eq(TbsBudgetLog::getBudgetId,budget.getId()); List tbsBudgetLogList = budgetLogService.list(lqwLog); a.setBudgetLogList(tbsBudgetLogList); From 95d07c5bd74d467a83d1ce6b04d503c7019d1fe1 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 17 Jul 2023 11:13:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E6=8F=90=E4=BA=A4=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/tbs/controller/TbsActivityController.java | 5 +++++ .../java/com/qs/serve/modules/tbs/entity/TbsActivity.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index 9e7429cc..20dae1f7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -34,6 +34,7 @@ import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo; import com.qs.serve.modules.tbs.entity.vo.TbsActivityCenterGoodsVo; import com.qs.serve.modules.tbs.entity.vo.TbsActivityDefaultCenterVo; import com.qs.serve.modules.tbs.service.*; +import com.qs.serve.modules.vtb.entity.VtbVerification; import com.qs.serve.modules.vtb.service.VtbVerificationService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -294,6 +295,10 @@ public class TbsActivityController { List attachList = attachService.listByIds(attachIds); activity.setAttachList(attachList); } + + LambdaQueryWrapper vtbLqw = new LambdaQueryWrapper<>(); + vtbLqw.eq(VtbVerification::getActivityId,activity.getId()); + activity.setVerificationNum(verificationService.count(vtbLqw)); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index 0c48ef42..2bd2a4fd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -242,6 +242,12 @@ public class TbsActivity implements Serializable { @TableField(exist = false) private Long overdueWarningDays; + /** + * 提交核销次数 + */ + @TableField(exist = false) + private Long verificationNum; + /** * 系统参数 */