项目库列表查询修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java

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

@@ -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();
+		QueryWrapper<ProjectNameInfoEO> nameInfoEOQueryWrapper = new QueryWrapper<>();
-		return projectNameAndYear;
+		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