1.默认维度修改

2.钉钉过期公司不进行提醒

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

@@ -742,13 +742,11 @@
     </select>
 
     <select id="getDefaultDegree" resultType="java.util.Map">
-        select r.* FROM report
-        LEFT JOIN report_extra_degree as r
-        ON report.degree_id = r.id
+        select report.degree_id as id FROM report
         WHERE report.company_id = #{companyId}
         AND project_id = #{projectId}
         AND creator_id = #{userId}
-        ORDER BY create_date DESC
-        LIMIT 0,1
+        ORDER BY create_time DESC
+        LIMIT 1
     </select>
 </mapper>

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

@@ -137,9 +137,11 @@
     <select id="getPushDingdingUserList" resultType="java.util.Map">
         SELECT a.company_id as companyId, a.dingding_userid as dingdingUserid
         FROM user AS a left join time_type on time_type.company_id = a.company_id
+        left join company on a.company_id = company.id
         WHERE a.dingding_userid is not null and time_type.alert_time = #{alertTime}
         AND a.is_active = 1
         AND a.report_status=0
+        AND company.expiration_date >= NOW()
         AND NOT EXISTS(SELECT 1 FROM report WHERE report.`creator_id` = a.id AND ((report.`create_date` = DATE_FORMAT(date_sub(NOW(),interval 1 day), '%Y-%m-%d') and time_type.alert_type=1)or(report.`create_date` = DATE_FORMAT(NOW(), '%Y-%m-%d') and time_type.alert_type=0)))
         <if test="date != null">
             and not exists (select 1 from leave_sheet where owner_id = a.id and start_date &lt;= #{date} and end_date &gt;= #{date} and leave_sheet.status = 0)