From e9895d000bf722b708af01b5d89af7c0f147d31d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 23 十二月 2024 09:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java b/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
index 9dba0cd..5b307f2 100644
--- a/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.common.base.Result;
+import com.ycl.common.enums.business.ProjectStatusEnum;
+import com.ycl.common.enums.business.ProjectTypeEnum;
import com.ycl.domain.entity.Plan;
+import com.ycl.domain.vo.ProjectPlanResponseVO;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.PlanMapper;
import com.ycl.service.PlanService;
@@ -87,8 +90,16 @@
*/
@Override
public Result page(PlanQuery query) {
- IPage<PlanVO> page = PageUtil.getPage(query, PlanVO.class);
+ IPage<ProjectPlanResponseVO> page = PageUtil.getPage(query, ProjectPlanResponseVO.class);
baseMapper.getPage(page, query);
+ // 瀵瑰垎椤靛悗鐨勫睘鎬ц繘琛屽鐞�
+ List<ProjectPlanResponseVO> records = page.getRecords();
+ for (ProjectPlanResponseVO record : records) {
+ record.setProjectType(ProjectTypeEnum.getDescByType(record.getProjectType()));
+ record.setProjectStatus(ProjectStatusEnum.getDescByType(record.getProjectStatus()));
+ record.setProjectColorCode("green");
+ }
+
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
--
Gitblit v1.8.0