diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java index 5b92b3a1..dc5c1340 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java +++ b/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(); diff --git a/src/main/java/com/qs/serve/modules/tbs/common/dto/TbsBudgetChangeVo.java b/src/main/java/com/qs/serve/modules/tbs/common/dto/TbsBudgetChangeVo.java index b30f5343..7fa30cbf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/dto/TbsBudgetChangeVo.java +++ b/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; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java index 06b67974..56547150 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java +++ b/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") diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java index 4f7f51d5..6982c726 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java +++ b/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字") diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java index 6b03d2db..614148ec 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java @@ -194,6 +194,9 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl updBudgetList = paramBudgetList.stream() .filter(a->StringUtils.hasText(a.getBudgetNumber())).collect(Collectors.toList()); @@ -227,6 +230,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl!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 ServiceImplbatchItem.setBatchId(batchId)); tbsBudgetBatchItemService.saveBatch(batchItems); return budgetBatch; } - private void toUpdateBudgetInfo(SysUser sysUser, Map scheduleMap, Map subjectMap, Map centerDtoMap, Map categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) { + private void toUpdateBudgetInfo(Long batchId,SysUser sysUser, Map scheduleMap, Map subjectMap, Map centerDtoMap, Map categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) { tbsBudgetService.removeById(budgetId); tbsBudgetConditionService.remove( new LambdaQueryWrapper() @@ -313,6 +316,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl 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; } 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 194c523a..0c0bf1c9 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 @@ -138,6 +138,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl tbsBudget.setUserCode(sysUser.getCode()); tbsBudget.setUserName(sysUser.getName()); tbsBudget.setBatchApplyFlag(0); + tbsBudget.setBatchApplyId(0L); this.updateById(tbsBudget); //创建流程后回调 diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java index e45fa590..31dc8240 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 2af22b89..56284ef3 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/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 subList = new ArrayList<>(); + try { + List 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()); diff --git a/src/main/resources/mapper/tbs/TbsBudgetChangeMapper.xml b/src/main/resources/mapper/tbs/TbsBudgetChangeMapper.xml index a9a6d357..bdd7dba9 100644 --- a/src/main/resources/mapper/tbs/TbsBudgetChangeMapper.xml +++ b/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 and `tbs_budget`.`id` = #{query.budgetId} @@ -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