From a1b9b2cfb3fac29fbf1015b1350d1368a7c05a4c Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 12 Nov 2024 11:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzgqj/business/bases/entity/PaTypeVo.java |  4 ++++
 .../business/bases/mapper/PaTypeMapper.java   |  2 ++
 .../bases/service/PaTypeServiceImpl.java      |  9 ++++----
 .../resources/mappers/bases/PaTypeMapper.xml  | 21 +++++++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java
index 1eed860..c2497be 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java
@@ -50,4 +50,8 @@ public class PaTypeVo {
      */
     private String remarks;
 
+    private String model;
+
+    private String type;
+
 }
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java
index bb2a30a..0d2b4a8 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java
@@ -51,4 +51,6 @@ public interface PaTypeMapper {
      * @return
      */
     int getActByName(PaTypeVo data);
+
+    List<PaTypeVo> findByPage(PaTypeVo data);
 }
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java
index 955c23d..2a0374e 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java
@@ -33,7 +33,7 @@ public class PaTypeServiceImpl  implements PaTypeService{
         }catch (Exception e){
             log.error(e.toString(),e);
         }
-        return  ServerResponse.createSuccess();
+        return  ServerResponse.createSuccess(list);
     }
 
     /**
@@ -147,12 +147,13 @@ public class PaTypeServiceImpl  implements PaTypeService{
      */
     @Override
     public List<PaTypeVo> findByPage(PaTypeVo data) {
+        List<PaTypeVo> list=new ArrayList<>();
       try{
-
+          list=mapper.findByPage(data);
       }catch (Exception e){
-
+          log.error(e.toString(),e);
       }
-      return null;
+      return list;
     }
 
 
diff --git a/src/main/resources/mappers/bases/PaTypeMapper.xml b/src/main/resources/mappers/bases/PaTypeMapper.xml
index a1a1980..4b87a35 100644
--- a/src/main/resources/mappers/bases/PaTypeMapper.xml
+++ b/src/main/resources/mappers/bases/PaTypeMapper.xml
@@ -39,4 +39,25 @@
 			and  id!=#{id}
 		</if>
 	</select>
+	<!--分页查询 节点数据-->
+	<select id="findByPage" resultType="com.bonus.gzgqj.business.bases.entity.PaTypeVo">
+		select   pt.id, pt.parent_id parentId,pt.name model ,pt.num,
+				 pt.price,pt.unit,pt.weight,pt.is_consumables ,
+				 pt.remarks,pt.is_active ,pt.level,pt.warn_num,pt1.`name` name  ,pt2.name type
+		FROM pa_type pt
+				 left join   pa_type pt1 on pt.parent_id=pt1.id  and pt1.`level`=2 and pt1.is_active=1
+				 left join   pa_type pt2 on pt1.parent_id=pt2.id  and pt2.`level`=1 and pt2.is_active=1
+		WHERE pt.is_active=1     and pt.`level`=3
+		<where>
+				<if test="type!=null and type !=''">
+					and   pt2.name like concat('%',#{type},'%')
+				</if>
+				<if test="name!=null and name !=''">
+					and   pt1.name like concat('%',#{name},'%')
+				</if>
+				<if test="model!=null and model !=''">
+					and   pt.name like concat('%',#{model},'%')
+				</if>
+		</where>
+	</select>
 </mapper>
\ No newline at end of file