Browse Source

瑞思ehr第四版--取消请假的时间限制

hxx 11 months ago
parent
commit
193ceb7932

+ 5 - 5
src/main/resources/ruisi/com/ruisiehr/mapper/ScheduleTaskMapper.xml

@@ -29,7 +29,7 @@
                           LEFT OUTER JOIN T_BD_Person PROPOSER ON ATSHOLIDAYFILE.FProposerID = PROPOSER.FID WHERE HOLIDAYTYPE.FState = 1 ) tmp
                           LEFT OUTER JOIN T_BD_Person PROPOSER ON ATSHOLIDAYFILE.FProposerID = PROPOSER.FID WHERE HOLIDAYTYPE.FState = 1 ) tmp
         WHERE isread = '不隐藏'
         WHERE isread = '不隐藏'
           AND (to_char( DelayDate, 'yyyymmdd' ) >= to_char( SYSDATE, 'yyyymmdd' ) OR DelayDate IS NULL)
           AND (to_char( DelayDate, 'yyyymmdd' ) >= to_char( SYSDATE, 'yyyymmdd' ) OR DelayDate IS NULL)
-          AND (validYear= extract(year from sysdate) OR validYear IS NULL)
+--           AND (validYear= extract(year from sysdate) OR validYear IS NULL)
           AND peopleCode = #{peopleCode}
           AND peopleCode = #{peopleCode}
         union all
         union all
         select people, holidayName, holidayCode, realLimit, freezeLimit, unit,validYear, peopleCode, telphone, usedLimit, remainLimit
         select people, holidayName, holidayCode, realLimit, freezeLimit, unit,validYear, peopleCode, telphone, usedLimit, remainLimit
@@ -57,8 +57,8 @@
              WHERE HOLIDAYPOLICY.FIsCtrlLimit=0 AND HOLIDAYTYPE.FState = 1) tmp
              WHERE HOLIDAYPOLICY.FIsCtrlLimit=0 AND HOLIDAYTYPE.FState = 1) tmp
         where
         where
             isread = '不隐藏'
             isread = '不隐藏'
-          AND (validYear= extract(year from sysdate) OR validYear IS NULL)
-          AND peopleCode = #{peopleCode}
+--           AND (validYear= extract(year from sysdate) OR validYear IS NULL)
+--           AND peopleCode = #{peopleCode}
     </select>
     </select>
 
 
 
 
@@ -92,7 +92,7 @@
                 LEFT OUTER JOIN T_BD_Person PROPOSER ON ATSHOLIDAYFILE.FProposerID = PROPOSER.FID WHERE HOLIDAYTYPE.FState = 1 ) tmp
                 LEFT OUTER JOIN T_BD_Person PROPOSER ON ATSHOLIDAYFILE.FProposerID = PROPOSER.FID WHERE HOLIDAYTYPE.FState = 1 ) tmp
     WHERE isread = '不隐藏'
     WHERE isread = '不隐藏'
           AND (to_char( 延期时间, 'yyyymmdd' ) >= to_char( SYSDATE, 'yyyymmdd' ) OR 延期时间 IS NULL)
           AND (to_char( 延期时间, 'yyyymmdd' ) >= to_char( SYSDATE, 'yyyymmdd' ) OR 延期时间 IS NULL)
-          AND (validYear= extract(year from sysdate) OR validYear IS NULL)
+--           AND (validYear= extract(year from sysdate) OR validYear IS NULL)
     union all
     union all
     select people, holidayName, holidayCode, realLimit, freezeLimit, unit,validYear, peopleCode, telphone
     select people, holidayName, holidayCode, realLimit, freezeLimit, unit,validYear, peopleCode, telphone
     from
     from
@@ -119,7 +119,7 @@
          WHERE HOLIDAYPOLICY.FIsCtrlLimit=0 AND HOLIDAYTYPE.FState = 1) tmp
          WHERE HOLIDAYPOLICY.FIsCtrlLimit=0 AND HOLIDAYTYPE.FState = 1) tmp
     where
     where
         isread = '不隐藏'
         isread = '不隐藏'
-      AND (validYear= extract(year from sysdate) OR validYear IS NULL)
+--       AND (validYear= extract(year from sysdate) OR validYear IS NULL)
 </select>
 </select>
 <!--    查询招聘来源 CT_MP_RECRUIT-->
 <!--    查询招聘来源 CT_MP_RECRUIT-->
     <select id="getRecruitSource" parameterType="String" resultType="java.util.Map">
     <select id="getRecruitSource" parameterType="String" resultType="java.util.Map">