调整

src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java

@@ -212,6 +212,10 @@ public class TbsBudgetCostItem implements Serializable {
 
     private String scheduleItemName;
 
+    /** 录入时考核期可用预算 */
+    @NotNull(message = "费用占比不能为空")
+    private BigDecimal scheduleItemAmount;
+
     /** 费用考核期项id */
     @NotNull(message = "费用考核期项id不能为空")
     private Long scheduleItemBudgetId;

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -96,6 +96,7 @@ public class TbsBudgetApplicationService {
             TbsBudgetTableVo.TopTheadHeader theadHeader = new TbsBudgetTableVo.TopTheadHeader();
             theadHeader.setId(scheduleItemBudgetId+"");
             theadHeader.setLabel(budgetCode+"("+scheduleItemName+")");
+            //todo 调整
             BigDecimal totalUsed = BigDecimal.ZERO;
             for (TbsBudgetCostItem costItem : tmpMap.get(scheduleItemBudgetId)) {
                 totalUsed = totalUsed.add(costItem.getCenterGoodsAmount());
@@ -221,6 +222,11 @@ public class TbsBudgetApplicationService {
                 .map(TbsActivityCenterGoods::toBudgetCostItem).collect(Collectors.toList());
         List<TbsBudgetCostItem> budgetUnMatchList = actUnMatchList.stream()
                 .map(TbsActivityCenterGoods::toBudgetCostItem).collect(Collectors.toList());
+        //绑定录入时可用预算
+        for (TbsBudgetCostItem budgetCostItem : budgetMatchList) {
+            BigDecimal currentItemAmount = counterMap.get(budgetCostItem.getScheduleItemBudgetId());
+            budgetCostItem.setScheduleItemAmount(currentItemAmount);
+        }
         TbsBudgetTableVo tableVo = null;
         if(buildTableFlag){
             //构建tableDTO

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

@@ -85,6 +85,17 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                 &&!costApply.getChargeState().equals(TbsCostApplyState.State_4_refused.getCode())){
             Assert.throwEx("因费用状态不支持编辑!!");
         }
+        for (TbsActivitySubjectBo subjectBo : activityBo.getActivitySubjectList()) {
+            if(subjectBo.getAmount().compareTo(BigDecimal.ZERO)<0){
+                Assert.throwEx("支出金额不可为负数");
+            }
+            for (TbsActivitySubjectBo.ActivityCenterBo centerBo : subjectBo.getCenterList()) {
+                if(centerBo.getCenterRate().compareTo(BigDecimal.ZERO)<0){
+                    Assert.throwEx("成本中心占比不可为负数");
+                }
+            }
+        }
+
         BmsSupplier supplier = supplierService.getById(costApply.getSupplierId());
         TbsActivity activity;
         //活动总金额

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -347,6 +347,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         LocalDate nowDate = LocalDate.now();
         if(activity.getReopenFlag().equals(0)
                 && filterActTime
+
                 //&& nowDate.isAfter(activity.getActEndDate())
                 && nowDate.isAfter(activity.getPreCheckDate())){
             Assert.throwEx("活动已结束");