防错当日不生效问题

application-task/src/main/resources/mappers/OnsiteTaskMapper.xml

@@ -98,7 +98,7 @@
         FROM 
         benteler_plan bp
 		join onsite_approval_plan oap on oap.benteler_plan_id = bp.id and oap.approval_level = 2 and oap.`status` = 1
-		join onsite_calendar oc on  oc.benteler_plan_id = bp.id and oc.type_flag=#{type_flag} and oc.effect_type=1
+		join onsite_calendar oc on  oc.benteler_plan_id = bp.id and oc.type_flag=#{type_flag} and oc.effect_flag=1
 		left join onsite_task ot on ot.onsite_calendar_id = oc.id
         <choose>
         	<when test="type_flag==2">
@@ -116,7 +116,7 @@
         and bp.`status`=4 
         and bp.pause_flag=0 
         and bp.deleted=0 
-        and bp.effective_date &lt; now() 
+        and bp.effective_date &lt;= now() 
         and ot.onsite_calendar_id is null
 
     </select>