From 4be7d863a161b64f8592a789d699e807545e7dc6 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 15 十一月 2024 16:46:12 +0800
Subject: [PATCH] 计划数据
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/controller/admin/PlanItemController.java | 5 +++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/PlanItemService.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/impl/PlanItemServiceImpl.java | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/controller/admin/PlanItemController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/controller/admin/PlanItemController.java
index c9cf4e4..2d6c83c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/controller/admin/PlanItemController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/controller/admin/PlanItemController.java
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import static com.iailab.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -94,8 +95,8 @@
@GetMapping("/list")
@Operation(summary = "获取计划项列表", description = "用于【计划项】界面")
@PreAuthorize("@ss.hasPermission('data:plan-item:query')")
- public CommonResult<List<PlanItemRespVO>> getList(PlanItemPageReqVO reqVO) {
- List<PlanItemEntity> list = planItemService.list();
+ public CommonResult<List<PlanItemRespVO>> getList(@RequestParam Map<String, Object> params) {
+ List<PlanItemEntity> list = planItemService.list(params);
return success(ConvertUtils.sourceToTarget(list, PlanItemRespVO.class));
}
}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/PlanItemService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/PlanItemService.java
index 78ab077..5556f7d 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/PlanItemService.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/PlanItemService.java
@@ -19,7 +19,7 @@
PageResult<PlanItemEntity> page(PlanItemPageReqVO reqVO);
- List<PlanItemEntity> list();
+ List<PlanItemEntity> list(Map<String, Object> params);
void create(PlanItemSaveReqVO createReqVO);
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/impl/PlanItemServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/impl/PlanItemServiceImpl.java
index 29a7b42..6b89b39 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/impl/PlanItemServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/service/impl/PlanItemServiceImpl.java
@@ -34,8 +34,9 @@
}
@Override
- public List<PlanItemEntity> list() {
+ public List<PlanItemEntity> list(Map<String, Object> params) {
QueryWrapper<PlanItemEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(params.get("status") != null, "status", params.get("status"));
queryWrapper.orderByDesc("create_time");
return baseDao.selectList(queryWrapper);
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
index 94fed54..8c080f8 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
@@ -52,7 +52,7 @@
}
@GetMapping("/list")
- public CommonResult<List<MmPredictItemRespVO>> list(Map<String, Object> params) {
+ public CommonResult<List<MmPredictItemRespVO>> list(@RequestParam Map<String, Object> params) {
List<MmPredictItemRespVO> list = mmPredictItemService.list(params);
return success(list);
}
--
Gitblit v1.9.3