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

初验调整

Browse Source
This commit is contained in:
pengjie 2025-03-21 09:02:48 +08:00
parent 2d83f7b7bb
commit 175304fbbd
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/jz/controller/JzInvestController.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.jz.controller; package com.zhgd.xmgl.modules.jz.controller;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
import com.zhgd.xmgl.modules.basicdata.entity.Company; import com.zhgd.xmgl.modules.basicdata.entity.Company;
@ -79,9 +80,15 @@ public class JzInvestController {
}) })
@PostMapping(value = "/page") @PostMapping(value = "/page")
public Result<IPage<JzInvest>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) { 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); 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); return Result.success(pageList);
} }

3
src/main/java/com/zhgd/xmgl/modules/jz/service/impl/JzInvestServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.jz.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.util.DateUtil; import com.zhgd.jeecg.common.util.DateUtil;
import com.zhgd.xmgl.modules.jz.entity.JzInvest; import com.zhgd.xmgl.modules.jz.entity.JzInvest;
@ -27,7 +28,7 @@ public class JzInvestServiceImpl extends ServiceImpl<JzInvestMapper, JzInvest> i
@Override @Override
public IPage<JzInvest> pageList(Page page, Wrapper<JzInvest> wrapper) { public IPage<JzInvest> pageList(Page page, Wrapper<JzInvest> wrapper) {
IPage<JzInvest> jzInvestIPage = baseMapper.pageList(page, 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()) { for (JzInvest record : jzInvestIPage.getRecords()) {
List<JzInvest> yearAmount = allList.stream().filter(a -> a.getProjectSn().equals(record.getProjectSn()) && List<JzInvest> yearAmount = allList.stream().filter(a -> a.getProjectSn().equals(record.getProjectSn()) &&
a.getYear().equals(record.getYear()) a.getYear().equals(record.getYear())