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 91dfeacc..d4a4796f 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 @@ -9,6 +9,8 @@ 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 com.qs.serve.modules.tbs.entity.TbsActivityChannel; +import com.qs.serve.modules.tbs.service.TbsActivityChannelService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -34,6 +36,7 @@ public class BmsChannelController { private BmsChannelService bmsChannelService; private BmsChannelPointService bmsChannelPointService; + private TbsActivityChannelService activityChannelService; /** * 翻页 @@ -108,6 +111,11 @@ public class BmsChannelController { @SysLog(module = SystemModule.BASE, title = "渠道", biz = BizType.DELETE) @PreAuthorize("hasRole('bms:channel:delete')") public R deleteById(@PathVariable("id") Long id){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsActivityChannel::getChannelId,id); + if(activityChannelService.count()>0){ + return R.error("活动含当前渠道，删除失败"); + } boolean result = bmsChannelService.removeById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index fbc61268..4cc9109d 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java @@ -16,6 +16,8 @@ import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo; import com.qs.serve.modules.bms.service.BmsChannelService; import com.qs.serve.modules.bms.service.BmsRegion2Service; import com.qs.serve.modules.bms.service.BmsRegionService; +import com.qs.serve.modules.tbs.entity.TbsActivityChannelPoint; +import com.qs.serve.modules.tbs.service.TbsActivityChannelPointService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -43,6 +45,7 @@ public class BmsChannelPointController { private BmsChannelService bmsChannelService; private BmsRegionService bmsRegionService; private BmsRegion2Service bmsRegion2Service; + private TbsActivityChannelPointService activityChannelPointService; /** * 翻页 @@ -126,6 +129,11 @@ public class BmsChannelPointController { @SysLog(module = SystemModule.BASE, title = "渠道站点", biz = BizType.DELETE) @PreAuthorize("hasRole('bms:channelPoint:delete')") public R deleteById(@PathVariable("id") Long id){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsActivityChannelPoint::getPointId,id); + if(activityChannelPointService.count(lqw)>0){ + return R.error("活动含当前站点，删除失败"); + } boolean result = bmsChannelPointService.removeById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java index 82681217..256a9ec8 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java @@ -15,6 +15,9 @@ import com.qs.serve.modules.bms.entity.vo.BmsMasterUserCenterVo; import com.qs.serve.modules.bms.entity.vo.BmsSubjectTreeVo; import com.qs.serve.modules.bms.service.BmsMasterUserService; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.tbs.common.TbsCenterType; +import com.qs.serve.modules.tbs.entity.TbsActivityCenter; +import com.qs.serve.modules.tbs.service.TbsActivityCenterService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -42,6 +45,7 @@ public class BmsCostCenterController { private BmsCostCenterService bmsCostCenterService; private BmsMasterUserService bmsMasterUserService; + private TbsActivityCenterService activityCenterService; /** * 树查询 @@ -196,6 +200,12 @@ public class BmsCostCenterController { @PreAuthorize("hasRole('bms:costCenter:delete')") public R deleteById(@PathVariable("id") Long id){ //TODO 未校验已用不能删，预算和费用申请 + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsActivityCenter::getCenterId,id); + lqw.eq(TbsActivityCenter::getCenterType, TbsCenterType.center.name()); + if(activityCenterService.count(lqw)>0){ + return R.error("活动含当前成本中心，删除失败"); + } boolean result = bmsCostCenterService.removeSelfAndChildById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java index 607d713a..e6a221c8 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java @@ -13,6 +13,8 @@ import com.qs.serve.modules.bms.entity.BmsCostCenter; import com.qs.serve.modules.bms.entity.bo.BmsCostCenterBo; import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo; import com.qs.serve.modules.bms.entity.vo.BmsSubjectTreeVo; +import com.qs.serve.modules.tbs.entity.TbsActivitySubject; +import com.qs.serve.modules.tbs.service.TbsActivitySubjectService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -37,6 +39,7 @@ import java.util.stream.Collectors; public class BmsSubjectController { private BmsSubjectService bmsSubjectService; + private TbsActivitySubjectService activitySubjectService; /** * 树查询 @@ -134,6 +137,11 @@ public class BmsSubjectController { @SysLog(module = SystemModule.BASE, title = "科目", biz = BizType.DELETE) @PreAuthorize("hasRole('bms:subject:delete')") public R deleteById(@PathVariable("id") Long id){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsActivitySubject::getSubjectId,id); + if(activitySubjectService.count(lqw)>0){ + return R.error("活动含当前的科目，删除失败"); + } boolean result = bmsSubjectService.removeSelfAndChildById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java index 552b2e5c..373d98ca 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java @@ -15,7 +15,8 @@ public enum TbsCostApplyState { State_0_unPublish(0), State_1_apply(1), State_2_actioning(2), - State_3_finished(3); + State_3_finished(3), + State_4_refused(4); private Integer code; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 461bd27f..7f663876 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -118,7 +118,7 @@ public class TbsCostApplyController { } SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); TbsCostApply tbsCostApply = tbsCostApplyService.getById(id); - if(tbsCostApply.getChargeState().equals(0)){ + if(tbsCostApply.getChargeState().equals(TbsCostApplyState.State_0_unPublish.getCode())){ Map data = new HashMap<>(10); data.put("empId",sysUser.getCode()); data.put("applyTime",DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME)); @@ -147,7 +147,7 @@ public class TbsCostApplyController { tbsCostApplyService.updateById(costApply); //todo 扣除预算 return R.ok(); - }else if (tbsCostApply.getChargeState().equals(4)){ + }else if (tbsCostApply.getChargeState().equals(TbsCostApplyState.State_4_refused.getCode())){ //todo 驳回重新申请 } return R.error("当前状态不可申请"); @@ -266,7 +266,7 @@ public class TbsCostApplyController { public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); TbsCostApply costApply = tbsCostApplyService.getById(affairCommit.getAffairId()); - if(!costApply.getChargeState().equals(1)){ + if(!costApply.getChargeState().equals(TbsCostApplyState.State_1_apply.getCode())){ return R.error("param err1"); } CtpAffairCommit param = new CtpAffairCommit(); @@ -285,14 +285,14 @@ public class TbsCostApplyController { //判断是否有下一节点 String flag = result.getData(); //审批中(next)、完成(finish)、拒绝(refused) - if(flag.equals("finish")){ + if("finish".equals(flag)){ TbsCostApply apply = new TbsCostApply(); apply.setId(costApply.getId()); - apply.setChargeState(2); + apply.setChargeState(TbsCostApplyState.State_2_actioning.getCode()); tbsCostApplyService.updateById(apply); - }else if (flag.equals("refused")){ + }else if ("refused".equals(flag)){ //todo 退回节点 - }else if (flag.equals("next")){ + }else if ("next".equals(flag)){ return R.ok(); } } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenter.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenter.java index 9bd00790..9b7eadac 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenter.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenter.java @@ -112,5 +112,7 @@ public class TbsActivityCenter implements Serializable { @JsonProperty private String delFlag; + /** 模板唯一健 */ + private String tmpUk; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java index 16b114e1..5418a42d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java @@ -181,6 +181,9 @@ public class TbsActivityCenterGoods implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private LocalDate preCheckDate; + /** 模板唯一健 */ + private String tmpUk; + @TableField(exist = false) private String spuName; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannel.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannel.java index cb27e918..3c5b8ccf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannel.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannel.java @@ -95,5 +95,7 @@ public class TbsActivityChannel implements Serializable { @JsonProperty private String delFlag; + /** 模板唯一健 */ + private String tmpUk; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannelPoint.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannelPoint.java index ad9f474c..79270a2d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannelPoint.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityChannelPoint.java @@ -105,5 +105,8 @@ public class TbsActivityChannelPoint implements Serializable { @JsonProperty private String delFlag; + /** 模板唯一健 */ + private String tmpUk; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java index 06813e87..e07004ef 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java @@ -100,6 +100,9 @@ public class TbsActivityGoods implements Serializable { @JsonProperty private String delFlag; + /** 模板唯一健 */ + private String tmpUk; + @TableField(exist = false) private String spuName; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java index c49119f7..58316487 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySubject.java @@ -103,6 +103,9 @@ public class TbsActivitySubject implements Serializable { @JsonProperty private String delFlag; + /** 模板唯一健 */ + private String tmpUk; + @TableField(exist = false) List activityCenterList; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java index ff3dd94a..58b4e24d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityCenterGoodsBo.java @@ -62,5 +62,7 @@ public class TbsActivityCenterGoodsBo implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 模板唯一健 */ + private String tmpUk; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java index 952f706d..8c25f6dd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelBo.java @@ -41,5 +41,7 @@ public class TbsActivityChannelBo implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 模板唯一健 */ + private String tmpUk; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java index 8e3ab80f..67212e76 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityChannelPointBo.java @@ -35,5 +35,7 @@ public class TbsActivityChannelPointBo implements Serializable { private String remark; + /** 模板唯一健 */ + private String tmpUk; } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java index e4c35f3e..ce27e4ee 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityGoodsBo.java @@ -33,5 +33,8 @@ public class TbsActivityGoodsBo implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 模板唯一健 */ + private String tmpUk; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java index 1fe31491..fd2fd6ce 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivitySubjectBo.java @@ -43,6 +43,9 @@ public class TbsActivitySubjectBo implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 模板唯一健 */ + private String tmpUk; + /** 成本中心列表 */ private List centerList; @@ -70,6 +73,9 @@ public class TbsActivitySubjectBo implements Serializable { @NotNull(message = "费用占比率不能为空") private BigDecimal centerAmount; + /** 模板唯一健 */ + private String tmpUk; + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index b37c9b6b..a883ceb3 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -83,6 +83,7 @@ public class TbsActivityServiceImpl extends ServiceImpl