Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/resources/mapper/wgz/WgzAttendanceMapper.xml

@@ -33,13 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="countByTaskId" resultType="com.ruoyi.bgt.domain.vo.BgtAttendanceCountVO">
         select count(1) as reportToDutyNum,
         date,
-        (select count(1) from bgt_project_recruit_apply where entry_time &lt;= date
+        (select count(1) from bgt_project_recruit_apply where entry_time &lt;= date and (leave_time is null or leave_time>date)
         and recruit_id in (select id from bgt_project_recruit where task_id = #{taskId} )) as totalNum
         from wgz_attendance
         where date between #{beginDate} and #{endDate}
         and (missed_in = 0 or missed_out = 0)
         and recruit_id in (select id from bgt_project_recruit where task_id = #{taskId} )
-        group by date
+        group by date order by date
     </select>
 
 </mapper>