From 92756a19ca99f2cade8a7e3ff46e08f47bf31cbc Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 16 十二月 2025 22:06:34 +0800
Subject: [PATCH] 修改了一个bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java | 101 +++++++++++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/peopleSearchController.java | 36 ++++++++++++
zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java | 3
zhang-content/src/main/java/com/ruoyi/domain/dto/zfEventdto.java | 13 ++++
zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java | 3
zhang-content/src/main/java/com/ruoyi/domain/peopleSea.java | 15 +++++
zhang-content/src/main/java/com/ruoyi/service/PeopleSearchService.java | 9 +++
7 files changed, 178 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/peopleSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/peopleSearchController.java
new file mode 100644
index 0000000..b56b97f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/peopleSearchController.java
@@ -0,0 +1,36 @@
+package com.ruoyi.web.controller.zhang;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.ZfDoctor;
+import com.ruoyi.domain.peopleSea;
+import com.ruoyi.service.PeopleSearchService;
+import com.ruoyi.service.PhyscialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
+
+@RestController
+@RequestMapping("/zPeopleSearch")
+public class peopleSearchController extends BaseController {
+
+ @Autowired
+ private PeopleSearchService peopleSearchService;
+
+
+ @GetMapping("/all")
+ public AjaxResult listAll(peopleSea peopleSea){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ System.out.println(peopleSearchService);
+ System.out.println(peopleSea);
+
+ return peopleSearchService.selectDataList(peopleSea, pageNum, pageSize);
+ }
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
index 784ecf2..bd53df9 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
@@ -48,7 +48,8 @@
*/
@Excel(name = "璐骇绫诲埆")
private String type;
-
+ @Excel(name = "浠峰�煎尯闂�")
+ private String valueRange;
/**
* 鏀舵敮鍚嶇О
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
index 3c3aeb7..90f1719 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
@@ -52,7 +52,8 @@
/** 瀛樻斁鍦板潃 */
@Excel(name = "瀛樻斁鍦板潃")
private String address;
-
+ @Excel(name = "浠峰�煎尯闂�")
+ private String valueRange;
@Excel(name="澶囨敞")
private String remark;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/zfEventdto.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/zfEventdto.java
new file mode 100644
index 0000000..9875366
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/zfEventdto.java
@@ -0,0 +1,13 @@
+package com.ruoyi.domain.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class zfEventdto {
+ private String module;
+ private String name;
+ private Integer id;
+ private Date createTime;
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/peopleSea.java b/zhang-content/src/main/java/com/ruoyi/domain/peopleSea.java
new file mode 100644
index 0000000..9354012
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/peopleSea.java
@@ -0,0 +1,15 @@
+package com.ruoyi.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class peopleSea {
+ private String[] modules;
+
+// private String module;
+ private Date startTime;
+ private Date endTime;
+ private String peoples;
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/PeopleSearchService.java b/zhang-content/src/main/java/com/ruoyi/service/PeopleSearchService.java
new file mode 100644
index 0000000..a7db1e2
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/PeopleSearchService.java
@@ -0,0 +1,9 @@
+package com.ruoyi.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.peopleSea;
+
+public interface PeopleSearchService {
+
+ AjaxResult selectDataList(peopleSea peopleS, Integer pageNum, Integer pageSize);
+}
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
new file mode 100644
index 0000000..f988cd5
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
@@ -0,0 +1,101 @@
+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.MapUtils;
+
+import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.dto.zfEventdto;
+import com.ruoyi.domain.peopleSea;
+import com.ruoyi.service.PeopleSearchService;
+import com.ruoyi.service.ZfEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@Service
+public class PeopleSearchServiceImpl implements PeopleSearchService {
+
+ @Autowired
+ private ZfEventService zfEventService;
+
+
+ private LambdaQueryWrapper<peopleSea> buildCondition(peopleSea peops) {
+
+ return null;
+// if(peops.getModule().equals("浜嬬邯")) {
+// LambdaQueryWrapper<> lqw = new LambdaQueryWrapper<>();
+// lqw.orderByDesc(ZfEquipment::getHappenTime);
+// lqw.like(StringUtils.isNotEmpty(zfEquipment.getName()), ZfEquipment::getName, zfEquipment.getName());
+// lqw.like(StringUtils.isNotEmpty(zfEquipment.getBuyer()), ZfEquipment::getBuyer, zfEquipment.getBuyer());
+// lqw.like(StringUtils.isNotEmpty(zfEquipment.getContent()), ZfEquipment::getContent, zfEquipment.getContent());
+// lqw.like(StringUtils.isNotEmpty(zfEquipment.getLocation()), ZfEquipment::getLocation, zfEquipment.getLocation());
+// lqw.like(StringUtils.isNotEmpty(zfEquipment.getRemark()), ZfEquipment::getRemark, zfEquipment.getRemark());
+// lqw.eq(zfEquipment.getHappenTime() != null, ZfEquipment::getHappenTime, zfEquipment.getHappenTime());
+//
+// lqw.between(peops.getStartTime() != null && peops.getEndTime() != null, peopleSea::getStartTime, zfEquipment.getHappenStartTime(), zfEquipment.getHappenEndTime());
+//
+// } return lqw;
+ }
+
+ @Override
+
+ 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());
+
+ 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
+ return AjaxResult.success(data);
+
+ }
+
+ return null;
+ }
+ public List<zfEventdto> encapData(List<ZfEvent> lis, String module)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(ZfEvent obj : lis)
+ {
+ zfEventdto atd = new zfEventdto();
+ atd.setId(obj.getId());
+ atd.setModule(module);
+ atd.setName(obj.getPeople());
+ atd.setCreateTime(obj.getHappenTime());
+ daoRes.add(atd);
+ }
+ return daoRes;
+ }
+}
--
Gitblit v1.9.1