From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
index afc5810..4a7794d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
@@ -1,14 +1,11 @@
package com.doumee.service.business.impl;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.Visits;
-import com.doumee.dao.business.model.Warning;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WarningPushMapper;
-import com.doumee.dao.business.model.WarningPush;
-import com.doumee.dao.business.model.Member;
import com.doumee.service.business.WarningPushService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -99,16 +96,19 @@
pageWrap.getModel().setIsdeleted(Constants.ZERO);
queryWrapper.selectAll(WarningPush.class )
.selectAs(Member::getName,WarningPush::getMemberName)
+ .selectAs(Company::getName,WarningPush::getCompanyName)
.selectAs(Warning::getName,WarningPush::getWarningName)
.selectAs(Warning::getType,WarningPush::getWarningType)
.selectAs(Warning::getLevel,WarningPush::getWarningLevel)
.leftJoin(Member.class,Member::getId,WarningPush::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.leftJoin(Warning.class,Warning::getId,WarningPush::getWarningId);
queryWrapper.eq(pageWrap.getModel().getWarningType()!=null,Warning::getType, pageWrap.getModel().getWarningType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getWarningName()),Warning::getName, pageWrap.getModel().getWarningName());
queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
- queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
- queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()), WarningPush::getCreateDate,Utils.Date.getStart(pageWrap.getModel().getQueryStarttime()));
- queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),WarningPush::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getQueryEndtime()));
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName, pageWrap.getModel().getMemberName());
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()), WarningPush::getCreateDate, pageWrap.getModel().getQueryStarttime());
+ queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),WarningPush::getCreateDate, pageWrap.getModel().getQueryEndtime());
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(WarningPush::getId, pageWrap.getModel().getId());
}
--
Gitblit v1.9.3