diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index 50daa246..ad4bebbd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -382,6 +382,8 @@ public class TbsActivityController { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsBudget::getBudgetState,1); lqw.eq(TbsBudget::getSubjectId,subjectId); + //排除随货编码 + lqw.ne(TbsBudget::getSubjectCode,"FYMC05"); List budgetList = tbsBudgetService.list(lqw); List idPaths = new ArrayList<>(); if(budgetList.size()>0){ @@ -433,6 +435,17 @@ public class TbsActivityController { } } } + //匹配有预算并且成本中心为客户的 + for (TbsBudget budget : centerBudgetList) { + if (budget.getCenterType().equals(TbsCenterType.customer.name())){ + if(budget.getCenterId().equals(supplier.getId())){ + TbsActivityDefaultCenterVo defaultCenterVo = new TbsActivityDefaultCenterVo(); + defaultCenterVo.setSupplier(supplier); + return R.ok(defaultCenterVo); + } + } + } + //匹配有预算并且成本中心为销售区域的 for (TbsBudget budget : centerBudgetList) { if (budget.getCenterType().equals(TbsCenterType.saleRegion.name())){ if(budget.getCenterId().equals(supplier.getRegionThird()) 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 b6233738..bd47d2d4 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 @@ -34,6 +34,7 @@ public class TbsActivity implements Serializable { private Long id; /** 编码 */ + @TableField(condition = SqlCondition.LIKE) private String activityCode; /** 活动状态:0-待核销;1-审批中;2-完成;3-冻结;4-已释放;5-已关闭(费用申请拒绝后关闭) */ @@ -63,11 +64,13 @@ public class TbsActivity implements Serializable { /** 客户编码 */ @NotBlank(message = "客户编码不能为空") @Length(max = 30,message = "客户编码长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String supplierCode; /** 客户名称 */ @NotBlank(message = "客户名称不能为空") @Length(max = 30,message = "客户名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String supplierName; /** 活动开始时间 */ 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 475bc344..029b05da 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 @@ -179,7 +179,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId()); - if(userIds.size()==0){ - return R.byEmptyList(); - } + userIds.add(AuthContextUtils.getSysUserId()); if(userIds.size()==1){ lqw.eq(VtbVerification::getUserId,userIds.get(0)); }else { @@ -180,6 +178,7 @@ public class VtbVerificationController { } } } + vtbVerification.setActivityInfo(tbsActivityService.getById(vtbVerification.getActivityId())); vtbVerification.setSubjectList(subjectList); return R.ok(vtbVerification); }