Merge remote-tracking branch 'origin/v1.0' into v1.0

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<SysAttach> attachList = attachService.listByIds(attachIds);
             activity.setAttachList(attachList);
         }
+
+        LambdaQueryWrapper<VtbVerification> vtbLqw = new LambdaQueryWrapper<>();
+        vtbLqw.eq(VtbVerification::getActivityId,activity.getId());
+        activity.setVerificationNum(verificationService.count(vtbLqw));
     }
 
     /**

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

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -672,7 +672,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         List<TbsScheduleItemBudget> tbsScheduleItemBudgetList = tbsScheduleItemBudgetService.list(lqw);
         tbsScheduleItemBudgetList.forEach(a->{
             LambdaQueryWrapper<TbsBudgetLog> lqwLog = new LambdaQueryWrapper<>();
-            lqwLog.eq(TbsBudgetLog::getScheduleItemId,a.getScheduleItemId());
+            lqwLog.eq(TbsBudgetLog::getScheduleItemBudgetId,a.getId());
             lqwLog.eq(TbsBudgetLog::getBudgetId,budget.getId());
             List<TbsBudgetLog> tbsBudgetLogList = budgetLogService.list(lqwLog);
             a.setBudgetLogList(tbsBudgetLogList);