From 78b4a7d14eaf807c8a6d4be2ad209a29d04225e8 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sat, 21 Sep 2024 15:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/modules/jz/mapper/JzMonthlyMapper.java     | 5 +++++
 .../com/zhgd/xmgl/modules/jz/mapper/xml/JzMonthlyMapper.xml  | 3 +++
 .../xmgl/modules/jz/service/impl/JzMonthlyServiceImpl.java   | 2 +-
 .../controller/ProgressPanoramaNodePlanController.java       | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/jz/mapper/JzMonthlyMapper.java b/src/main/java/com/zhgd/xmgl/modules/jz/mapper/JzMonthlyMapper.java
index 28cf03de6..2938027b2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/jz/mapper/JzMonthlyMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/jz/mapper/JzMonthlyMapper.java
@@ -2,6 +2,10 @@ package com.zhgd.xmgl.modules.jz.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.xmgl.modules.jz.vo.JzMonthlyVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.zhgd.xmgl.modules.jz.entity.JzMonthly;
@@ -16,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface JzMonthlyMapper extends BaseMapper<JzMonthly> {
 
+    Page<JzMonthlyVo> pageList(Page page, @Param(Constants.WRAPPER) Wrapper<JzMonthly> wrapper);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/jz/mapper/xml/JzMonthlyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/jz/mapper/xml/JzMonthlyMapper.xml
index c9d29d58c..f9c77d8a3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/jz/mapper/xml/JzMonthlyMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/jz/mapper/xml/JzMonthlyMapper.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.jz.mapper.JzMonthlyMapper">
 
+    <select id="pageList" resultType="com.zhgd.xmgl.modules.jz.vo.JzMonthlyVo">
+        select * from jz_monthly
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzMonthlyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzMonthlyServiceImpl.java
index 477677109..537038c44 100644
--- a/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzMonthlyServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzMonthlyServiceImpl.java
@@ -37,7 +37,7 @@ public class JzMonthlyServiceImpl extends ServiceImpl<JzMonthlyMapper, JzMonthly
 
     @Override
     public Page<JzMonthlyVo> pageList(Page page, Wrapper<JzMonthly> wrapper) {
-        Page<JzMonthlyVo> pageList = this.page(page, wrapper);
+        Page<JzMonthlyVo> pageList = baseMapper.pageList(page, wrapper);
         if (pageList.getRecords().size() > 0) {
             List<Long> ids = pageList.getRecords().stream().map(p -> p.getId()).collect(Collectors.toList());
             List<JzMonthly1> monthly1List = jzMonthly1Service.list(Wrappers.<JzMonthly1>lambdaQuery().in(JzMonthly1::getMonthId, ids));
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java
index 97bd0d259..dddea698c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java
@@ -142,9 +142,9 @@ public class ProgressPanoramaNodePlanController {
 	@PostMapping(value = "/keyNodeList")
 	public Result<List<ProjectKeyNode>> keyNodeList(@RequestBody Map<String, Object> map) {
 		String projectSn = MapUtils.getString(map, "projectSn");
-		String nature = MapUtils.getString(map, "nature");
+//		String nature = MapUtils.getString(map, "nature");
 		Integer type = MapUtils.getInteger(map, "type");
-		LambdaQueryWrapper<Project> wrapper = Wrappers.<Project>lambdaQuery().eq(Project::getNature, nature);
+		LambdaQueryWrapper<Project> wrapper = Wrappers.<Project>lambdaQuery();
 		if (StringUtil.isNotBlank(projectSn)) {
 			wrapper.eq(Project::getProjectSn, projectSn);
 		}