格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/mapper/xml/VacationMapper.xml

@@ -11,7 +11,7 @@
         update geke_vacation_header set user_id=#{userid},year_day=#{yearDate},available_day=#{avDate},name=#{name},weixin_id=#{weixinId}   where id=#{id}
     </update>
     <delete id="deleteByDate">
-        delete from geke_vacation_body  where date_format(end_date, '%Y-%m')&lt;=date_format('2022-05-31', '%Y-%m')
+        delete from geke_vacation_body  where date_format(end_date, '%Y-%m')&lt;=date_format('2022-05-31', '%Y-%m') and holiday_type!='年假'
     </delete>
 
 
@@ -68,7 +68,8 @@
         start_date as 'startDates',
         end_date as 'endDates',
         holiday_count as 'holidayCount',
-        holiday_type as 'holidayType'
+        holiday_type as 'holidayType',
+        start_date as 'year'
         from geke_vacation_body
         where  holiday_type='年假' <!--not in('事假','病假','调休假')!-->
         <if test="userid!=null and ''!=userid">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/mapper/xml/BdAnnualLeaveMapper.xml

@@ -7,5 +7,6 @@
         <if test="date!=null and ''!=date">
             and date_format(#{date},'%Y-%m-%d')  between date_format(begin_date,'%Y-%m-%d') and date_format(end_date,'%Y-%m-%d')
         </if>
+        order by year_name asc
     </select>
 </mapper>