diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index b2d39708..91dfeacc 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -7,6 +7,8 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; +import com.qs.serve.modules.bms.entity.BmsChannelPoint; +import com.qs.serve.modules.bms.service.BmsChannelPointService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -17,6 +19,7 @@ import com.qs.serve.modules.bms.service.BmsChannelService; import javax.validation.Valid; import java.util.List; +import java.util.stream.Collectors; /** * 基础档案 渠道 @@ -30,6 +33,7 @@ import java.util.List; public class BmsChannelController { private BmsChannelService bmsChannelService; + private BmsChannelPointService bmsChannelPointService; /** * 翻页 @@ -69,7 +73,16 @@ public class BmsChannelController { @SysLog(module = SystemModule.BASE, title = "渠道", biz = BizType.UPDATE) @PreAuthorize("hasRole('bms:channel:update')") public R updateById(@RequestBody @Valid BmsChannel param){ + BmsChannel ori = bmsChannelService.getById(param.getId()); boolean result = bmsChannelService.updateById(param); + if(!ori.getChannelName().equals(param.getChannelName())){ + List channelPoints = bmsChannelPointService.listByChannelId(param.getId()); + channelPoints = channelPoints.stream().map(a->{ + a.setChannelName(param.getChannelName()); + return a; + }).collect(Collectors.toList()); + bmsChannelPointService.updateBatchById(channelPoints); + } return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java index 970767f0..245b4cfc 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java @@ -19,5 +19,7 @@ public interface BmsChannelPointService extends IService { List listByBizRegionId(String id); List listBySaleRegionId(String id); + + List listByChannelId(Long id); } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java index fc29cfae..71e87b61 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java @@ -81,5 +81,13 @@ public class BmsChannelPointServiceImpl extends ServiceImpl listByChannelId(Long id) { + LambdaQueryWrapper channelPointWrapper = new LambdaQueryWrapper<>(); + channelPointWrapper.eq(BmsChannelPoint::getChannelName,id); + List list = this.list(channelPointWrapper); + return list; + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java index 2b02c8ae..c590f773 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java @@ -97,6 +97,11 @@ public class TbsScheduleController { @PreAuthorize("hasRole('tbs:schedule:update')") public R updateById(@RequestBody @Valid TbsSchedule entity){ // TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule()); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsBudget::getScheduleId,entity.getId()); + if(tbsBudgetService.count(lqw)>0){ + Assert.throwEx("预算中已使用该周期模板,不能修改"); + } boolean result = tbsScheduleService.updateById(entity); List scheduleItems = tbsScheduleItemService.listByScheduleId(entity.getId()); tbsScheduleItemService.removeBatchByIds(scheduleItems);