From 3036658c32319d376f9053512a04581a452cdffa Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Fri, 11 Oct 2024 10:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=AE=A1=E7=90=86=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/MaPartTypeMapper.xml   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
index c2b7a8c..120ccf9 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
@@ -43,7 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="remark != null and remark != ''">remark,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="companyId != null and companyId != ''">company_id,</if>
-        create_time
+        create_time,
+        year
         ) values (
         <if test="paId != null and paId != 0">#{paId},</if>
         <if test="paName != null and paName != ''">#{paName},</if>
@@ -57,7 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="companyId != null and companyId != ''">#{companyId},</if>
-        sysdate()
+        sysdate(),
+        YEAR(CURDATE())
         )
     </insert>
     <update id="updateById">
@@ -113,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             OR t3.pa_name LIKE CONCAT('%', #{paName}, '%'))
         </if>
         <if test="year != null and year != ''">
-            AND year = #{year}
+            AND t1.year = #{year}
         </if>