From a97b38655411a84660037a9014d309657316c467 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 26 九月 2024 14:41:18 +0800
Subject: [PATCH] 预测项列表
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml | 22 +++++++++++-----------
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java | 5 ++---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java | 2 ++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java | 3 ++-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java | 4 ++--
5 files changed, 19 insertions(+), 17 deletions(-)
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 6b3c57b..b1e1f28 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
@@ -5,7 +5,6 @@
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.module.model.common.enums.CommonConstant;
import com.iailab.module.model.mcs.pre.dto.MmPredictItemDTO;
-import com.iailab.module.model.mcs.pre.entity.MmPredictItemEntity;
import com.iailab.module.model.mcs.pre.service.MmPredictItemService;
import com.iailab.module.model.mcs.pre.vo.CountItemtypeVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictItemPageReqVO;
@@ -54,8 +53,8 @@
}
@GetMapping("/list")
- public CommonResult<List<MmPredictItemEntity>> list() {
- List<MmPredictItemEntity> list = mmPredictItemService.list();
+ public CommonResult<List<MmPredictItemRespVO>> list(Map<String, Object> params) {
+ List<MmPredictItemRespVO> list = mmPredictItemService.list(params);
return success(list);
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java
index 210c039..8786e02 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java
@@ -24,6 +24,8 @@
IPage<MmPredictItemRespVO> getPageList(IPage<MmPredictItemEntity> page, @Param("params") MmPredictItemPageReqVO params);
+ List<MmPredictItemRespVO> queryList(Map<String, Object> params);
+
List<ItemVO> getByModuleId(Map<String, Object> params);
List<ItemVO> getItem(Map<String, Object> params);
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
index c961f2f..8a7d4bf 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
@@ -9,6 +9,7 @@
import com.iailab.module.model.mdk.vo.MergeItemVO;
import java.util.List;
+import java.util.Map;
/**
* @author PanZhibao
@@ -36,5 +37,5 @@
void update(MmPredictItemDTO mmPredictItemDTO);
- List<MmPredictItemEntity> list();
+ List<MmPredictItemRespVO> list(Map<String, Object> params);
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
index 18395b1..d229a5a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
@@ -65,8 +65,8 @@
}
@Override
- public List<MmPredictItemEntity> list() {
- return mmPredictItemDao.selectList(new QueryWrapper<>());
+ public List<MmPredictItemRespVO> list(Map<String, Object> params) {
+ return mmPredictItemDao.queryList(params);
}
@Override
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
index f3ba08e..06aa959 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
@@ -79,7 +79,7 @@
TMPI.WORKCHECKED,
TDMI.MODULEID,
TDMI.ITEMORDER,
- TDMI.STATUS,
+ TMPI.STATUS,
TDMI.CATEGORYID,
TMIO.POINTID,
TMIO.TAGNAME,
@@ -91,20 +91,20 @@
LEFT JOIN T_MM_ITEM_OUTPUT TMIO ON TMIO.ITEMID = TMPI.ID
LEFT JOIN T_MM_RESULT_TABLE TMRT ON TMRT.ID = TMIO.RESULTTABLEID
WHERE 1 = 1
- <if test="params.itemno != null and params.itemno != ''">
- AND TMPI.ITEMNO LIKE CONCAT('%', #{params.itemno},'%')
+ <if test="itemno != null and itemno != ''">
+ AND TMPI.ITEMNO LIKE CONCAT('%', #{itemno},'%')
</if>
- <if test="params.itemname != null and params.itemname != ''">
- AND TMPI.ITEMNAME LIKE CONCAT('%', #{params.itemname},'%')
+ <if test="itemname != null and itemname != ''">
+ AND TMPI.ITEMNAME LIKE CONCAT('%', #{itemname},'%')
</if>
- <if test="params.itemtypeid != null and params.itemtypeid != ''">
- AND TMPI.ITEMTYPEID = #{params.itemtypeid}
+ <if test="itemtypeid != null and itemtypeid != ''">
+ AND TMPI.ITEMTYPEID = #{itemtypeid}
</if>
- <if test="params.itemtypename != null and params.itemtypename != ''">
- AND TMIT.ITEMTYPENAME = #{params.itemtypename}
+ <if test="itemtypename != null and itemtypename != ''">
+ AND TMIT.ITEMTYPENAME = #{itemtypename}
</if>
- <if test="params.status != null and params.status != ''">
- AND TDMI.STATUS = #{params.status}
+ <if test="status != null and status != ''">
+ AND TMPI.STATUS = #{status}
</if>
ORDER BY TMPI.CREATE_TIME DESC
</select>
--
Gitblit v1.9.3