假期问题修复

ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml

@@ -17,5 +17,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
+    <resultMap type="com.ruoyi.oa.domain.vo.SysHolidayVo" id="SysOaHolidayVoResult">
+        <result property="holidayType" column="type"/>
+        <result property="holidayName" column="name"/>
+        <collection property="holidayVoList" ofType="com.ruoyi.oa.domain.SysOaHoliday">
+            <result property="holidayTime" column="holiday_time"/>
+        </collection>
+    </resultMap>
+
+
+
+    <select id="queryVoList" resultMap="SysOaHolidayVoResult">
+        SELECT
+            soh.name,
+            soh.type,
+            soh.holiday_time
+        FROM sys_oa_holiday soh
+        where soh.type !='0'
+        ORDER BY soh.name, soh.type,soh.holiday_time
+    </select>
+
 
 </mapper>