|
@@ -204,9 +204,18 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
planItemBoQueryWrapper.eq("dl_plan_item.deleted", 0);
|
|
planItemBoQueryWrapper.eq("dl_plan_item.deleted", 0);
|
|
});
|
|
});
|
|
|
|
+ queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan.state", 1);
|
|
|
|
+ });
|
|
|
|
+ queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan.on_state", 1);
|
|
|
|
+ });
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
planItemBoQueryWrapper.gt("plan_end_time", DateUtil.date());
|
|
planItemBoQueryWrapper.gt("plan_end_time", DateUtil.date());
|
|
});
|
|
});
|
|
|
|
+ queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
|
+ planItemBoQueryWrapper.apply("dl_plan.plan_id = dl_plan_item.plan_id");
|
|
|
|
+ });
|
|
Integer count = planItemMapper.getEuipmentPlanCont(queryWrapper);
|
|
Integer count = planItemMapper.getEuipmentPlanCont(queryWrapper);
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
return R.fail("设备下存在广告计划,请移除广告后在删除设备");
|
|
return R.fail("设备下存在广告计划,请移除广告后在删除设备");
|