diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java index 46e82300..ef70c8cb 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java @@ -140,10 +140,8 @@ public class BmsSupplierMyController { List userIds = sysUserService.list().stream().map(a->a.getId()).collect(Collectors.toList()); param.setSelectUserIds(userIds); param.setSelectUserIdsFlag(true); -// List list = hisUserSupplierService.selectSupplier(param,true); - PageVo pageVo = hisUserSupplierService.selectPageSupplier(param); - initSupplierList(pageVo.getList()); - return R.ok(pageVo); + hisUserSupplierService.selectListSupplier(param); + return R.ok(); } } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java index 350dfdff..4d590959 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java @@ -39,7 +39,7 @@ public class BmsRegionServiceImpl extends ServiceImpl private SysUserService sysUserService; private BmsChannelPointMapper bmsChannelPointMapper; private BmsFactoryService bmsFactoryService; -// private BmsSupplierApplicationService bmsSupplierApplicationService; + private BmsSupplierApplicationService bmsSupplierApplicationService; @Override public boolean saveBmsRegion(BmsRegion param){ @@ -64,7 +64,9 @@ public class BmsRegionServiceImpl extends ServiceImpl hisUserChannelPointService.removeRegion(2,ori.getPathIds()); hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/ //todo 更新客户 - //bmsSupplierApplicationService.listByRegionIds() + if(!ori.getPid().equals("0")){ + bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getPid()),ori.getLevel()); + } } } return b; diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java index 3c7c80d7..b8e5bc2b 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java @@ -8,6 +8,7 @@ import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.mapper.BmsRegionMapper; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.BmsRegion2Service; import com.qs.serve.modules.bms.service.BmsRegionService; @@ -41,7 +42,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public class BmsSupplierApplicationService { - private BmsRegionService regionService; + private BmsRegionMapper regionMapper; private BmsRegion2Service region2Service; private TbsBudgetLogService budgetLogService; private TbsCostUnItemService costUnItemService; @@ -74,7 +75,7 @@ public class BmsSupplierApplicationService { String newRegionCode; String newRegionName; if(regionType.equals(TbsCenterType.saleRegion.name())){ - BmsRegion bmsRegion = regionService.getById(newRegionId); + BmsRegion bmsRegion = regionMapper.selectById(newRegionId); newRegionCode = bmsRegion.getCode(); newRegionName = bmsRegion.getName(); }else { diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java index c121d7e5..a07b0ca6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java @@ -171,6 +171,7 @@ public class TbsBudgetLog implements Serializable { /** 活动编码 */ @Length(max = 30,message = "活动编码长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String activityCode; private String activityTheme; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java index 0563b580..93f0c279 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java @@ -24,5 +24,19 @@ public interface TbsCostApplyService extends IService { */ void releaseCost(Long costApplyId,Integer invalidFlag); + /** + * 属性费用申请的审批的状态 + * @param costApplyId + */ + void flushCostApply(Long costApplyId); + + /** + * 刷新费用申请状态 + * 1.前提先刷新活动状态 + * 2.在释放费用和审批完成后调用 + * @param costApplyId + */ + void flushCostStatus(Long costApplyId); + } 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 43fe20be..fdbdbd97 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 @@ -14,6 +14,7 @@ import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.service.SeeYonService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysUserService; +import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; import com.qs.serve.modules.tbs.entity.*; @@ -73,7 +74,6 @@ public class TbsCostApplyServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsActivityPayCondition::getCostApplyId,id); @@ -168,6 +168,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl actLqw = new LambdaQueryWrapper<>(); + actLqw.eq(TbsActivity::getCostApplyId,costApplyId); + List activityList = tbsActivityMapper.selectList(actLqw); + for (TbsActivity activity : activityList) { + if(!activity.getActivityState().equals(TbsActivityState.STATE_4_Release) + &&!activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){ + return; + } + } + TbsCostApply costApply = new TbsCostApply(); + costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode()); + this.updateById(costApply); + } + } 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 1f01e9a9..26572ba9 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 @@ -151,8 +151,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl activityList = activityService.listByCostApplyId(costApply.getId()); + boolean updateChargeState = true; + for (TbsActivity tbsActivity : activityList) { + if(!tbsActivity.getActivityState().equals(TbsActivityState.STATE_4_Release) + &&!tbsActivity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){ + updateChargeState = false; + break; + } + } + if(updateChargeState){ + updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode()); + } } costApplyService.updateById(updCost); }