核销添加费率信息；

src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java

@@ -101,7 +101,8 @@ public class BirCenterRateServiceImpl implements BirCenterRateService {
     }
 
 
-    public TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType,String centerId,String centerName){
+    @Override
+    public TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType, String centerId, String centerName){
 
         int year = LocalDate.now().getYear();
         int month = LocalDate.now().getMonthValue();

src/main/java/com/qs/serve/modules/tbs/common/dto/TbsBudgetChangeVo.java

@@ -124,4 +124,6 @@ public class TbsBudgetChangeVo {
 
     /** 是否批量提交 */
     private Integer batchApplyFlag;
+
+    private Long batchApplyId;
 }

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

@@ -124,6 +124,8 @@ public class TbsBudget implements Serializable {
     /** 是否批量提交 */
     private Integer batchApplyFlag;
 
+    private Long batchApplyId;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

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

@@ -115,6 +115,8 @@ public class TbsBudgetChange implements Serializable {
     /** 是否批量提交 */
     private Integer batchApplyFlag;
 
+    private Long batchApplyId;
+
     /** 申请人 */
     @NotBlank(message = "申请人不能为空")
     @Length(max = 32,message = "申请人长度不能超过32字")

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

@@ -194,6 +194,9 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
             return null;
         }
 
+        this.save(budgetBatch);
+        //保存后赋值
+        Long batchId = budgetBatch.getId();
         //修改的生成为更变记录
         List<TbsBudgetBatchBo.BudgetMain> updBudgetList = paramBudgetList.stream()
                 .filter(a->StringUtils.hasText(a.getBudgetNumber())).collect(Collectors.toList());
@@ -227,6 +230,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
                     budgetChange.setUserCode(sysUser.getCode());
                     budgetChange.setUserName(sysUser.getName());
                     budgetChange.setBatchApplyFlag(1);
+                    budgetChange.setBatchApplyId(batchId);
                     budgetChange.setBudgetCheckState(TbsBudgetCheckState.State_1_apply);
                     boolean notChangeTitle = paramItem.getBudgetName()!=null&& paramItem.getBudgetName().equals(budget.getBudgetCode());
                     if(!notChangeTitle){
@@ -252,7 +256,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
 
                 }else {
                     //修改后为新增类型提交
-                    this.toUpdateBudgetInfo(sysUser, scheduleMap, subjectMap, centerDtoMap, categoryMap, paramItem, budgetId);
+                    this.toUpdateBudgetInfo(batchId,sysUser, scheduleMap, subjectMap, centerDtoMap, categoryMap, paramItem, budgetId);
                     TbsBudgetBatchItem batchItem = new TbsBudgetBatchItem();
                     batchItem.setBudgetId(budgetId);
                     batchItem.setBatchState(TbsBudgetCheckState.State_1_apply);
@@ -268,7 +272,9 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
                 .filter(a->!StringUtils.hasText(a.getBudgetNumber())).collect(Collectors.toList());
         for (TbsBudgetBatchBo.BudgetMain budgetMain : addBudgetList) {
             TbsBudget newBudget = new TbsBudget();
+            newBudget.setBudgetNumber("BM"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Budget));
             newBudget.setBatchApplyFlag(1);
+            newBudget.setBatchApplyId(batchId);
             TbsSchedule schedule = scheduleMap.get(budgetMain.getScheduleName());
             this.initBudget4Update(sysUser,schedule, subjectMap, centerDtoMap, budgetMain, newBudget);
             tbsBudgetService.save(newBudget);
@@ -291,15 +297,12 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
             batchItem.setUserName(sysUser.getName());
             batchItems.add(batchItem);
         }
-        this.save(budgetBatch);
-        //保存后赋值
-        Long batchId = budgetBatch.getId();
         batchItems.forEach(batchItem->batchItem.setBatchId(batchId));
         tbsBudgetBatchItemService.saveBatch(batchItems);
         return budgetBatch;
     }
 
-    private void toUpdateBudgetInfo(SysUser sysUser, Map<String, TbsSchedule> scheduleMap, Map<String, BmsSubject> subjectMap, Map<String, TbsCenterDto> centerDtoMap, Map<String, GoodsCategory> categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) {
+    private void toUpdateBudgetInfo(Long batchId,SysUser sysUser, Map<String, TbsSchedule> scheduleMap, Map<String, BmsSubject> subjectMap, Map<String, TbsCenterDto> centerDtoMap, Map<String, GoodsCategory> categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) {
         tbsBudgetService.removeById(budgetId);
         tbsBudgetConditionService.remove(
                 new LambdaQueryWrapper<TbsBudgetCondition>()
@@ -313,6 +316,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
         TbsBudget newBudget = new TbsBudget();
         newBudget.setId(budgetId);
         newBudget.setBatchApplyFlag(1);
+        newBudget.setBatchApplyId(batchId);
         newBudget.setUserId(sysUser.getId());
         newBudget.setUserCode(sysUser.getCode());
         newBudget.setUserName(sysUser.getName());

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

@@ -121,15 +121,15 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl<TbsBudgetChangeMappe
         query.setPageSize(PageUtil.getPageSize());
         query.setStartRow(PageUtil.getStartRow());
         List<TbsBudgetChangeVo> result = baseMapper.selectChangeVoList(query);
-        for (TbsBudgetChangeVo changeVo : result) {
-            if(changeVo.getBatchApplyFlag().equals(1)){
-                if(changeVo.getType().equals(ChangeTypeEnum.change.name())){
-                    changeVo.setType(ChangeTypeEnum.batchChange.name());
-                }else {
-                    changeVo.setType(ChangeTypeEnum.batchApply.name());
-                }
-            }
-        }
+//        for (TbsBudgetChangeVo changeVo : result) {
+//            if(changeVo.getBatchApplyFlag().equals(1)){
+//                if(changeVo.getType().equals(ChangeTypeEnum.change.name())){
+//                    changeVo.setType(ChangeTypeEnum.batchChange.name());
+//                }else {
+//                    changeVo.setType(ChangeTypeEnum.batchApply.name());
+//                }
+//            }
+//        }
         return result;
     }
 

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

@@ -138,6 +138,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         tbsBudget.setUserCode(sysUser.getCode());
         tbsBudget.setUserName(sysUser.getName());
         tbsBudget.setBatchApplyFlag(0);
+        tbsBudget.setBatchApplyId(0L);
         this.updateById(tbsBudget);
 
         //创建流程后回调

src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java

@@ -31,6 +31,8 @@ public class VtbVerificationSo implements Serializable {
     /** 活动id */
     private Long activityId;
 
+    private String activityCode;
+
     /** 核销编码 */
     private String verificationCode;
 

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

@@ -10,6 +10,7 @@ import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
 import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.modules.bir.service.BirCenterRateService;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
@@ -31,6 +32,7 @@ import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo;
+import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
 import com.qs.serve.modules.tbs.mapper.TbsCostPercentMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.vtb.common.VtbFundFlowType;
@@ -81,6 +83,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private final BmsChannelService channelService;
     private final BmsChannelPointService channelPointService;
     private final BmsSupplierService bmsSupplierService;
+    private final BirCenterRateService centerRateService;
 
     private final VtbVerificationChannelService verificationChannelService;
     private final VtbVerificationChannelPointService verificationChannelPointService;
@@ -768,6 +771,18 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         data.put("exsp5",urlKey);
         data.put("cmsLink",baseJumpUrl);
 
+        List<Object> subList = new ArrayList<>();
+        try {
+            List<TbsActivityCenter> activityCenter = activityCenterService.listByActivity(verification.getActivityId());
+            for(TbsActivityCenter center : activityCenter){
+                TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName());
+                subList.add(costCenter);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        data.put("sub",subList);
+
         BaseCreateProcessBo createProcess = new BaseCreateProcessBo();
         createProcess.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code());
         createProcess.setMemberLoginName(sysUser.getSyAccount());

src/main/resources/mapper/tbs/TbsBudgetChangeMapper.xml

@@ -54,7 +54,8 @@
             tbs_budget.`user_code`,
             tbs_budget.`user_name`,
             tbs_budget.`remark`,
-            tbs_budget.`batch_apply_flag`
+            tbs_budget.`batch_apply_flag`,
+            tbs_budget.`batch_apply_id`
         from tbs_budget
         where tbs_budget.del_flag = 0 and `tbs_budget`.`budget_check_state` != 0
         <if test="query.budgetId != null"> and `tbs_budget`.`id` = #{query.budgetId}</if>
@@ -94,7 +95,8 @@
             tbs_budget_change.`user_id`,
             tbs_budget_change.`user_code`,
             tbs_budget_change.`user_name`,
-            tbs_budget_change.`batch_apply_flag`
+            tbs_budget_change.`batch_apply_flag`,
+            tbs_budget_change.`batch_apply_id`
         from tbs_budget_change
         where tbs_budget_change.del_flag = 0
         <if test="query.code != null and query.code != ''">