|
@@ -7,6 +7,7 @@ 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.ningdatech.basic.function.VUtils; |
|
|
import com.ningdatech.basic.function.VUtils; |
|
|
import com.ningdatech.basic.model.PageVo; |
|
|
import com.ningdatech.basic.model.PageVo; |
|
|
|
|
|
import com.ningdatech.pmapi.common.constant.RegionConst; |
|
|
import com.ningdatech.pmapi.common.helper.RegionCacheHelper; |
|
|
import com.ningdatech.pmapi.common.helper.RegionCacheHelper; |
|
|
import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil; |
|
|
import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil; |
|
|
import com.ningdatech.pmapi.projectlib.model.dto.ProjectCollectionSaveDTO; |
|
|
import com.ningdatech.pmapi.projectlib.model.dto.ProjectCollectionSaveDTO; |
|
@@ -78,7 +79,11 @@ public class ProjectCollectionManage { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
List<ProjectCollectionVO> res = page.getRecords().stream() |
|
|
List<ProjectCollectionVO> res = page.getRecords().stream() |
|
|
.map(record -> BeanUtil.copyProperties(record,ProjectCollectionVO.class)) |
|
|
|
|
|
|
|
|
.map(record -> { |
|
|
|
|
|
ProjectCollectionVO vo = BeanUtil.copyProperties(record, ProjectCollectionVO.class); |
|
|
|
|
|
vo.setArea(regionCacheHelper.getDisplayName(record.getAreaCode(), RegionConst.RL_COUNTY)); |
|
|
|
|
|
return vo; |
|
|
|
|
|
}) |
|
|
.collect(Collectors.toList()); |
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
return PageVo.of(res,page.getTotal()); |
|
|
return PageVo.of(res,page.getTotal()); |
|
|