diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 48c311db..d34d50cf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -385,6 +385,7 @@ public class TbsCostApplyController { //更新活动通过时间 TbsActivity tbsActivity = new TbsActivity(); tbsActivity.setCostPassTime(LocalDateTime.now()); + tbsActivity.setCostPassFlag(1); LambdaQueryWrapper actLqw = new LambdaQueryWrapper<>(); actLqw.eq(TbsActivity::getCostApplyId,costApply.getId()); tbsActivityService.update(tbsActivity,actLqw); 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 86c00961..c392e577 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 @@ -47,6 +47,9 @@ public class TbsActivity implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime costPassTime; + /** 费用通过标识,用于已申请费用活动列表 */ + private Integer costPassFlag; + /** 活动简述及目的 */ @NotBlank(message = "活动简述及目的不能为空") @Length(max = 255,message = "活动简述及目的长度不能超过255字") diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 148a72fd..29e1071c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -483,18 +483,18 @@ public class TbsBudgetApplicationService { } } } -// else { -// if(throwEx){ -// Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]无可用预算"); -// } -// //添加到预算超支表 -// activityCostItem.setBudgetId(0L); -// activityCostItem.setScheduleId(0L); -// activityCostItem.setScheduleItemId(0L); -// activityCostItem.setScheduleItemBudgetId(0L); -// activityCostItem.setScheduleItemName("无"); -// actUnMatchList.add(activityCostItem); -// } + else { + if(throwEx){ + Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]无可用预算"); + } + //添加到预算超支表 + activityCostItem.setBudgetId(0L); + activityCostItem.setScheduleId(0L); + activityCostItem.setScheduleItemId(0L); + activityCostItem.setScheduleItemBudgetId(0L); + activityCostItem.setScheduleItemName("无"); + actUnMatchList.add(activityCostItem); + } } /** @@ -583,9 +583,10 @@ public class TbsBudgetApplicationService { * 1.通过活动加载所有满足条件的考核期(用于加载历史核销费用), * 2.设置没有可用预算的活动id * 3.设置匹配的考核期列表到活动中 - * @param activityList + * @param activityList -> item设置满足条件的考核期列表 * @param budgetIds * @param noBudgetActivityIds + * @return scheduleItemList 命中的考核期列表 */ public List loadScheduleBudgetAndSetting(List activityList, List budgetIds, List noBudgetActivityIds) { diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index ea882e72..9aebeddf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -101,7 +101,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl