From 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 18:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index 1fd3fbf..63d795a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -9,6 +9,7 @@
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.Empower;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
@@ -109,11 +110,13 @@
queryWrapper.selectAs(Member::getName,Empower::getMemberName);
queryWrapper.selectAs(Member::getPhone,Empower::getMemberPhone);
queryWrapper.selectAs(Member::getIdcardDecode,Empower::getMemberidCard);
+ queryWrapper.selectAs(Device::getName,Empower::getDeviceName);
queryWrapper.selectAs(Company::getName,Empower::getCompanyName);
queryWrapper.selectAs(SystemUser::getUsername,Empower::getCreaterName);
queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Empower::getCreator);
+ queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
queryWrapper
/* .eq(Empower::getIsdeleted, Constants.ZERO)*/
@@ -122,8 +125,9 @@
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getSendStatus()),Empower::getSendStatus,pageWrap.getModel().getSendStatus());
queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
- queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getSendStartDate()),Empower::getSendDate,pageWrap.getModel().getSendStartDate());
- queryWrapper.le(Objects.nonNull(pageWrap.getModel().getSendEndDate()),Empower::getSendDate,pageWrap.getModel().getSendEndDate());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDeviceName()),Device::getName,pageWrap.getModel().getDeviceName());
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getSendStartDate()),Empower::getCreateDate,pageWrap.getModel().getSendStartDate());
+ queryWrapper.le(Objects.nonNull(pageWrap.getModel().getSendEndDate()),Empower::getCreateDate,pageWrap.getModel().getSendEndDate());
SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
Calendar cal=Calendar.getInstance();
@@ -142,7 +146,7 @@
queryWrapper.ge(Empower::getSendDate,cal.getTime());
}
}
- queryWrapper.orderByDesc(Empower::getCreateDate);
+ queryWrapper.orderByDesc(Empower::getId);
IPage<Empower> result = empowerJoinMapper.selectJoinPage(page, Empower.class,queryWrapper);
return PageData.from(result);
}
--
Gitblit v1.9.3