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 { + Page pageList(Page page, @Param(Constants.WRAPPER) Wrapper 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 @@ + \ 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 pageList(Page page, Wrapper wrapper) { - Page pageList = this.page(page, wrapper); + Page pageList = baseMapper.pageList(page, wrapper); if (pageList.getRecords().size() > 0) { List ids = pageList.getRecords().stream().map(p -> p.getId()).collect(Collectors.toList()); List monthly1List = jzMonthly1Service.list(Wrappers.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> keyNodeList(@RequestBody Map 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 wrapper = Wrappers.lambdaQuery().eq(Project::getNature, nature); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); if (StringUtil.isNotBlank(projectSn)) { wrapper.eq(Project::getProjectSn, projectSn); }