From 60f81ce58ccb481db36337dd744f15bd96f9141e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 10:54:45 +0800
Subject: [PATCH] 设备列表接口修改，根据部门id查询时修改为模糊查询
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 8 ++------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 14 +++++++-------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 6 ++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 2 +-
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 8422b26..337de19 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -204,6 +204,11 @@
/**
* 自定义分页(部门挂接)
+ * @param dxtype ???
+ * @param equipment 设备对象信息
+ * @param query 查询参数
+ * @param pid 组织机构Id
+ * @param response servlet 响应对象
*/
@GetMapping("/pageDept")
@ApiOperationSupport(order = 3)
@@ -222,6 +227,7 @@
String[] split = page.getRecords().get(j).getDeptId().split(",");
List<String> list = Arrays.asList(split);
StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
for (String deptId:list) {
for (DeptVo deptVo:deptVos) {
if (deptId.equals(deptVo.getId().toString())){
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index ed26d04..8a53b18 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -37,7 +37,7 @@
List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);
- List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,List childList,String dxtype);
+ List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,@Param("pid") String pid,String dxtype);
void s(Equipment equipment);
void updateOne(Equipment equipment);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 943b8c7..442e7b7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -202,12 +202,8 @@
<if test="dxtype!=null and dxtype == 3">
and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and state!=null
</if>
-
- <if test="childList!=null and childList.size>0">
- and deptId in
- <foreach collection="childList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ <if test="pid!=null and pid!=''">
+ and deptId like concat('%',#{pid},'%')
</if>
</select>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index da93309..aa190c5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -66,13 +66,13 @@
@Override
public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {
- List deptIdList;
- if (pid != null && !pid.equals("")){
- deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
- }else{
- deptIdList = SysCache.getDeptChildIds(null);
- }
- return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
+// List deptIdList;
+// if (pid != null && !pid.equals("")){
+// deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
+// }else{
+// deptIdList = SysCache.getDeptChildIds(null);
+// }
+ return page.setRecords(baseMapper.selectDeptPages(page,equipment,pid,dxdype));
}
--
Gitblit v1.9.3