From b1afb52760227edde06197e7cd7acd51cfafc357 Mon Sep 17 00:00:00 2001
From: penghao <964829629@qq.com>
Date: Thu, 30 Mar 2023 17:13:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8E=E6=89=B9=E7=A4=BA?=
 =?UTF-8?q?=E5=88=86=E5=B8=83sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/project/PaProjectInfoMapper.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaProjectInfoMapper.xml b/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaProjectInfoMapper.xml
index c5e3b7fa..db137407 100644
--- a/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaProjectInfoMapper.xml
+++ b/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaProjectInfoMapper.xml
@@ -829,9 +829,9 @@
         from  "PUBLIC"."pa_instruction" 
            <where>
             <!--<if test="year != null  and year != '' and year != '0'.toString()"> and year = #{year}</if>-->
-            <if test="year != null and year != '' and year != '2015'.toString()  and year != '999'.toString() and year!=0 and year!='0'.toString()"> and year= #{year}</if>
-            <if test="year == '2015'.toString()"> and year &lt; 2016</if>
-            <if test="year == '999'.toString()">and year &gt;= 2016</if>
+            <if test="yearRadio2 != null and yearRadio2 != '' and yearRadio2 != '2015'.toString()  and yearRadio2 != '999'.toString() and yearRadio2!=0 and yearRadio2!='0'.toString()"> and year= #{yearRadio2}</if>
+            <if test="yearRadio2 == '2015'.toString()"> and year &lt; 2016</if>
+            <if test="yearRadio2 == '999'.toString()">and year &gt;= 2016</if>
 
             <if test="num != null "> and "num" = #{num}</if>
             <if test="totalNum != null "> and "total_num" = #{totalNum}</if>
@@ -862,9 +862,9 @@
           <where>
 				"status" = '1'
             <!--<if test="year != null  and year != '' and year != '0'.toString()"> and year = #{year}</if>-->
-            <if test="year != null and year != '' and year != '2015'.toString()  and year != '999'.toString() and year!=0 and year!='0'.toString()"> and year= #{year}</if>
-            <if test="year == '2015'.toString()"> and year &lt; 2016</if>
-            <if test="year == '999'.toString()">and year &gt;= 2016</if>
+            <if test="yearRadio2 != null and yearRadio2 != '' and yearRadio2 != '2015'.toString()  and yearRadio2 != '999'.toString() and yearRadio2!=0 and yearRadio2!='0'.toString()"> and year= #{yearRadio2}</if>
+            <if test="yearRadio2 == '2015'.toString()"> and year &lt; 2016</if>
+            <if test="yearRadio2 == '999'.toString()">and year &gt;= 2016</if>
 
             <if test="num != null "> and "num" = #{num}</if>
             <if test="totalNum != null "> and "total_num" = #{totalNum}</if>