TimeType控制字段添加 无考勤无法填报

日报导出修改 企业微信同步
任务模板添加操作日志
八爪鱼TimeType控制字段添加

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -556,16 +556,13 @@
         DATE_FORMAT(r.create_date, '%m') as ofmonth,u.name as userName,u.job_number as jobNumber,d.department_name as departmentName,SUM(r.cost) as cost
         from report r
         left join project p  on p.id=r.project_id
-        left join task_group tg on tg.project_id=p.id and  r.group_id=tg.id
+        left join task_group tg  on  r.group_id=tg.id
         left join user u on u.id=r.creator_id
         left join department d on d.department_id=u.department_id
         where p.company_id=#{companyId}
-        <if test="startDate != null">
-            AND r.create_date &gt;= #{startDate}
-        </if>
-        <if test="endDate != null">
-            AND r.create_date &lt; #{endDate}
-        </if>
+        AND r.state=1
+        AND r.create_date &gt;= #{startDate}
+        AND r.create_date &lt; #{endDate}
         group by p.id,u.id,tg.id
     </select>
     <select id="getReportFillStatus" resultType="java.util.Map">