WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目库列表查询修改

Browse Source
This commit is contained in:
xiejunyu
2022-05-23 10:05:06 +08:00
parent 028155c084
commit 9ea905f783
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java
+6
View File
@@ -12,6 +12,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/**
@@ -83,4 +84,9 @@ public class ProjectNameInfoEO implements Serializable {
@TableField(exist = false)
private String cut;
/**年款数据集合*/
@Excel(name = "年款数据集合", width = 15)
@ApiModelProperty(value = "年款数据集合")
@TableField(exist = false)
private List<ProjectYearNameInfoEO> yearNameDataList;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
+17 -2
View File
@@ -1,10 +1,13 @@
package com.jero.modules.project.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.service.IProjectNameInfoEOService;
import com.jero.modules.space.service.SpaceServiceImpl;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -94,8 +97,20 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
*/
@Override
public List<ProjectNameInfoEO> queryList() {
List<ProjectNameInfoEO> projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear();
return projectNameAndYear;
QueryWrapper<ProjectNameInfoEO> nameInfoEOQueryWrapper = new QueryWrapper<>();
List<ProjectNameInfoEO> projectNameInfoEOList = list(nameInfoEOQueryWrapper);
// List<String> projectNameInfoIdList = projectNameInfoEOList.stream().map(e -> e.getId()).collect(Collectors.toList());
for (ProjectNameInfoEO projectNameInfoEO : projectNameInfoEOList){
QueryWrapper<ProjectYearNameInfoEO> yearNameInfoEOQueryWrapper = new QueryWrapper<>();
yearNameInfoEOQueryWrapper.eq("project_name_id",projectNameInfoEO.getId());
List<ProjectYearNameInfoEO> yearNameInfoDataList = projectYearNameInfoEOService.list(yearNameInfoEOQueryWrapper);
if(CollectionUtils.isNotEmpty(yearNameInfoDataList)) {
projectNameInfoEO.setYearNameDataList(yearNameInfoDataList);
}
}
// List<ProjectNameInfoEO> projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear();
return projectNameInfoEOList;
}
/* @Override