admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2024-09-21 15:13:46 +08:00
parent b440bb6836
commit 78b4a7d14e
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/jz/mapper/JzMonthlyMapper.java
View File

@ -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);
}

3
src/main/java/com/zhgd/xmgl/modules/jz/mapper/xml/JzMonthlyMapper.xml
View File

@ -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>

2
src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzMonthlyServiceImpl.java
View File

@ -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));

4
src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java
View File

@ -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);
}