From e72b3ab95aace19535fe596897822f0e334de5d6 Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期五, 11 八月 2023 18:00:23 +0800
Subject: [PATCH] 8-11提交代码

---
 cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml b/cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml
index 0b9e5f3..8f53657 100644
--- a/cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml
+++ b/cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.xml
@@ -4,26 +4,26 @@
     <!--鏌ヨ瀹℃牳璁″垝-->
     <select id="selectAllList" resultType="com.yuanchu.limslaboratory.pojo.vo.CnasAnnualPlanVo">
         select id,
-               audit_type,
-               department,
-               audit_purpose,
-               audit_leader,
-               audit_emp,
-               audit_pursuant,
-               audit_scope,
-               write_user,
-               keyboarder,
-               plan_time,
-               count,
-               audit_state,
-               state,
-               audit_time,
-               create_time,
-               update_time
+        audit_type,
+        department,
+        audit_purpose,
+        audit_leader,
+        audit_emp,
+        audit_pursuant,
+        audit_scope,
+        write_user,
+        keyboarder,
+        plan_time,
+        count,
+        state,
+        audit_time,
+        update_time
         from cnas_annual_plan
         where state = 1
-          <if test="beginTime != null and endTime != null">
-              and plan_time between #{beginTime} and #{endTime}
-          </if>
+        <if test="year != null and month != null">
+            and year(plan_time) = #{year}
+            and month(plan_time) = #{month}
+        </if>
+        order by id desc
     </select>
 </mapper>

--
Gitblit v1.9.3