From ee02f5032743f3c0bd217cb6cf8ba03ee663c629 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 10:16:31 +0800
Subject: [PATCH] 修改PeopleSea.java文件
---
zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
index 2c80efe..eb9b60a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
@@ -5,9 +5,10 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.dto.zfEventdto;
-import com.ruoyi.domain.peopleSea;
+import com.ruoyi.domain.PeopleSea;
import com.ruoyi.service.PeopleSearchService;
import com.ruoyi.service.ZfEventService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,7 @@
private ZfEventService zfEventService;
- private LambdaQueryWrapper<peopleSea> buildCondition(peopleSea peops) {
+ private LambdaQueryWrapper<PeopleSea> buildCondition(PeopleSea peops) {
return null;
// if(peops.getModule().equals("浜嬬邯")) {
@@ -44,34 +45,49 @@
@Override
- public AjaxResult selectDataList(peopleSea peopleS, Integer pageNum, Integer pageSize) {
+ public AjaxResult selectDataList(PeopleSea peopleS, Integer pageNum, Integer pageSize) {
+
+ System.out.println(peopleS.getModules().toString());
for(String thi: peopleS.getModules()) {
+ System.out.println("dsf4444");
HashMap<String, Object> data = new HashMap<>();
if (thi.equals("浜嬬邯")) {
LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
+ ;
//鎸夌収锛屽垎鍓插悕绉�
String[] pes = peopleS.getPeoples().split(",");
+
// 鍚庣画鏉′欢鐢╝nd杩炴帴
for (String pe : pes) {
lqw.like(ZfEvent::getPeople, pe);
}
- lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
- if(peopleS.getHasAttachment().equals("鏄�"))
- {
- lqw.isNotNull(ZfEvent::getUrl);
- }
- if(peopleS.getHasAttachment().equals("鏄�"))
- {
- lqw.isNotNull(ZfEvent::getUrl);
- }
+ peopleS.setIsHIde("鍚�");
+ lqw.eq(!StringUtils.isEmpty(peopleS.getIsHIde()), ZfEvent::getIsHide, "鍚�");
- Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
+ lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
+ if(peopleS.getHasAttachment()!=null&&peopleS.getHasAttachment().equals("鏄�"))
+ {
+ System.out.println("not null!");
+ lqw.isNotNull(ZfEvent::getUrl).and(r->r.apply("url!=''"));
+ }else
+ {
+ lqw.eq(!StringUtils.isEmpty(peopleS.getHasAttachment()), ZfEvent::getUrl, "");
+
+ }
+ // if(peopleS.getIsHIde()!=null)
+ Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
Page<ZfEvent> pageResult = zfEventService.page(zfEventPage, lqw);
+
List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+ System.out.println(beanRecords);
+ System.out.println(beanRecords.size());
List<zfEventdto> dtoResult = encapData(beanRecords, "浜嬬邯");
+ System.out.println(dtoResult);
data = MapUtils.getResult(pageResult, dtoResult);
+ System.out.println(data);
}
//鍚堝苟澶氫釜data
--
Gitblit v1.9.1