From 3f84603ed2848eaa4ea88e1a1b02609fa62f61ad Mon Sep 17 00:00:00 2001
From: 76164 <761646706@qq.com>
Date: Mon, 22 Jul 2024 14:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/base/domain/MaPartType.java    |  3 +++
 .../main/resources/mapper/base/MaPartTypeMapper.xml    | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
index 70433380..dd4548dd 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
@@ -82,6 +82,9 @@ public class MaPartType extends BaseEntity {
     @Excel(name = "数据所属组织")
     private String companyId;
 
+    //框架年份
+//    @Excel(name = "年份")
+    private String year;
 
 }
 
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml
index 50ff4ce0..300a6bbb 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml
@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="companyId"    column="company_id"    />
+        <result property="year"    column="year"    />
     </resultMap>
 
     <sql id="selectMaPartTypeVo">
@@ -82,11 +83,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMaPartType" parameterType="com.bonus.sgzb.base.domain.MaPartType" resultMap="MaPartTypeResult">
-        <include refid="selectMaPartTypeVo"/>
+        select pa_id, pa_name, parent_id, status, num, unit_id, buy_price, level, warn_num, del_flag, create_by, create_time, remark, company_id
+            from ma_part_type
         where del_flag = '0'
         <if test="paName != null and paName != ''">
             AND pa_name like concat('%', #{paName}, '%')
         </if>
+        <if test="year != null and year != ''">
+            AND year = #{year}
+        </if>
+
 
     </select>
 
@@ -99,4 +105,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ma_part_type
         where pa_id = #{paId}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>