From 175304fbbd593cd3e188c6752cf1f94cc072a63e Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 21 Mar 2025 09:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E9=AA=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/jz/controller/JzInvestController.java     | 11 +++++++++--
 .../modules/jz/service/impl/JzInvestServiceImpl.java  |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/jz/controller/JzInvestController.java b/src/main/java/com/zhgd/xmgl/modules/jz/controller/JzInvestController.java
index d7f2564ac..a72ff478f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/jz/controller/JzInvestController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/jz/controller/JzInvestController.java
@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.jz.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.xmgl.modules.basicdata.entity.Company;
@@ -79,9 +80,15 @@ public class JzInvestController {
     })
     @PostMapping(value = "/page")
     public Result<IPage<JzInvest>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
-        QueryWrapper<JzInvest> queryWrapper = QueryGenerator.initPageQueryWrapper(JzInvest.class, map);
         Page<JzInvest> page = PageUtil.getPage(map);
-        IPage<JzInvest> pageList = jzInvestService.pageList(page, queryWrapper);
+        QueryWrapper<JzInvest> wrapper = Wrappers.<JzInvest>query();
+        String projectSn = MapUtils.getString(map, "projectSn");
+        wrapper.eq("j.project_sn", projectSn);
+        String enterpriseName = MapUtils.getString(map, "enterpriseName");
+        if (StringUtils.isNotBlank(enterpriseName)) {
+            wrapper.like("j.enterprise_name", enterpriseName);
+        }
+        IPage<JzInvest> pageList = jzInvestService.pageList(page, wrapper);
         return Result.success(pageList);
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzInvestServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzInvestServiceImpl.java
index 29a751689..46527fd4a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzInvestServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzInvestServiceImpl.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.jz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.jeecg.common.util.DateUtil;
 import com.zhgd.xmgl.modules.jz.entity.JzInvest;
@@ -27,7 +28,7 @@ public class JzInvestServiceImpl extends ServiceImpl<JzInvestMapper, JzInvest> i
     @Override
     public IPage<JzInvest> pageList(Page page, Wrapper<JzInvest> wrapper) {
         IPage<JzInvest> jzInvestIPage = baseMapper.pageList(page, wrapper);
-        List<JzInvest> allList = baseMapper.pageList(new Page(-1, -1), null).getRecords();
+        List<JzInvest> allList = baseMapper.pageList(new Page(-1, -1), Wrappers.<JzInvest>query()).getRecords();
         for (JzInvest record : jzInvestIPage.getRecords()) {
             List<JzInvest> yearAmount = allList.stream().filter(a -> a.getProjectSn().equals(record.getProjectSn()) &&
                     a.getYear().equals(record.getYear())