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; + /** * 系统参数 */ 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);