From d435d728e722211c677f2c7f704cad24e985242a Mon Sep 17 00:00:00 2001 From: gmhao <1285330039@qq.com> Date: Tue, 19 Dec 2023 01:38:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/controller/MaPropInfoController.java | 12 ++++++------ .../sgzb/base/controller/SysDicController.java | 11 +++++++++++ .../bonus/sgzb/base/mapper/MaPropInfoMapper.java | 4 ++-- .../com/bonus/sgzb/base/mapper/SysDicMapper.java | 2 ++ .../sgzb/base/service/IMaPropInfoService.java | 4 ++-- .../bonus/sgzb/base/service/ISysDicService.java | 7 +++++++ .../base/service/impl/MaPropInfoServiceImpl.java | 4 ++-- .../sgzb/base/service/impl/SysDicServiceImpl.java | 11 +++++++++++ .../resources/mapper/base/MaPropInfoMapper.xml | 3 +++ .../main/resources/mapper/base/SysDicMapper.xml | 14 ++++++++++++++ 10 files changed, 60 insertions(+), 12 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java index 58541749..fadf7346 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java @@ -46,15 +46,15 @@ public class MaPropInfoController extends BaseController { /** * 查询资产属性列表 - * @param propName + * @param maPropInfo * @return */ @GetMapping("/list") @ApiOperation(value = "查询资产属性列表") - public TableDataInfo list(String propName) + public TableDataInfo list(MaPropInfo maPropInfo) { startPage(); - List list = maPropInfoService.selectMaPropInfoList(propName); + List list = maPropInfoService.selectMaPropInfoList(maPropInfo); return getDataTable(list); } /** @@ -162,9 +162,9 @@ public class MaPropInfoController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, String propName) { - List list = maPropInfoService.selectMaPropInfoList(propName); - ExcelUtil util = new ExcelUtil(MaPropInfo.class); - util.exportExcel(response, list, "资产属性类型数据"); + // List list = maPropInfoService.selectMaPropInfoList(propName); + // ExcelUtil util = new ExcelUtil(MaPropInfo.class); + // util.exportExcel(response, list, "资产属性类型数据"); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java index b83f1f1f..37fd2237 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java @@ -48,6 +48,17 @@ public class SysDicController extends BaseController List list = sysDicService.selectSysDicList(sysDic); return getDataTable(list); } + /** + * 查询数据字典列表id + */ + @ApiOperation(value = "查询数据字典列表id") + @GetMapping("/listId") + public TableDataInfo listid(SysDic sysDic) + { + startPage(); + List list = sysDicService.selectSysDic(sysDic); + return getDataTable(list); + } /** * 查询父类数据字典列表 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java index 24d1ff1d..047156b1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java @@ -16,10 +16,10 @@ public interface MaPropInfoMapper { /** * 根据资产名称查询资产属性列表 - * @param propName + * @param maPropInfo * @return */ - List selectMaPropSet(String propName); + List selectMaPropSet(MaPropInfo maPropInfo); /** * 根据资产名称查询资产名称列表 * @param diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java index f60706c6..ba0e19b3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java @@ -28,7 +28,9 @@ public interface SysDicMapper * @return 数据字典集合 */ public List selectSysDicList(SysDic sysDic); + public List selectSysDic(SysDic sysDic); /** + * * 查询父类数据字典列表 * * @param sysDic 数据字典 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java index 300790d5..6d44e33b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java @@ -16,10 +16,10 @@ public interface IMaPropInfoService { /** * 查询资产属性列表 - * @param propName + * @param maPropInfo * @return */ - List selectMaPropInfoList(String propName); + List selectMaPropInfoList(MaPropInfo maPropInfo); /** * 查询资产属性列表 * @param diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java index d410484d..b14a7170 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java @@ -28,6 +28,13 @@ public interface ISysDicService * @return 数据字典集合 */ public List selectSysDicList(SysDic sysDic); + /** + * 查询数据字典列表 + * + * @param sysDic 数据字典 + * @return 数据字典集合 + */ + public List selectSysDic(SysDic sysDic); /** * 查询父类数据字典列表 * diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java index 4f85eabd..4e9688ee 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java @@ -38,8 +38,8 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService { * @return */ @Override - public List selectMaPropInfoList(String propName) { - return maPropInfoMapper.selectMaPropSet(propName); + public List selectMaPropInfoList(MaPropInfo maPropInfo) { + return maPropInfoMapper.selectMaPropSet(maPropInfo); } /** * 查询资产属性列表 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java index 02d13b27..96933b91 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java @@ -46,6 +46,17 @@ public class SysDicServiceImpl implements ISysDicService { return sysDicMapper.selectSysDicList(sysDic); } + /** + * 查询数据字典列表id + * + * @param sysDic 数据字典 + * @return 数据字典 + */ + @Override + public List selectSysDic(SysDic sysDic) + { + return sysDicMapper.selectSysDic(sysDic); + } /** * 查询父类数据字典列表 * diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml index 0b06275f..98666311 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml @@ -180,6 +180,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.prop_name like concat('%', #{propName}, '%') + + AND a.prop_id = #{propId} + +