对于企业微信过期公司不进行日报审核以及日报漏填提醒

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/WxCorpInfoMapper.java

@@ -3,6 +3,8 @@ package com.management.platform.mapper;
 import com.management.platform.entity.WxCorpInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface WxCorpInfoMapper extends BaseMapper<WxCorpInfo> {
 
+    List<WxCorpInfo> getWxCompanyList();
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -12,6 +12,7 @@ import com.management.platform.mapper.*;
 import com.management.platform.service.*;
 import com.management.platform.service.impl.WxCorpInfoServiceImpl;
 import com.management.platform.util.*;
+import jdk.nashorn.internal.ir.ContinueNode;
 import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
@@ -585,7 +586,7 @@ public class TimingTask {
 //                }
             }
         }
-        List<WxCorpInfo> wxCorpInfoList = wxCorpInfoService.list(new QueryWrapper<WxCorpInfo>());
+        List<WxCorpInfo> wxCorpInfoList = wxCorpInfoMapper.getWxCompanyList();
         for (WxCorpInfo wxCorpInfo : wxCorpInfoList) {
             if (wxCorpInfo!=null) {
             List<Map<String, Object>> result = reportMapper.getWaitingApproveCnt(wxCorpInfo.getCompanyId());
@@ -872,6 +873,10 @@ public class TimingTask {
                 }
                 //发送推送提醒
                 Company company = companyMapper.selectById(t.getCompanyId());
+                //过期公司不提醒
+                if(company.getExpirationDate().isBefore(LocalDateTime.now())){
+                    return;
+                }
                 //开通了OA功能，有请假模块的，需要把当前请假的排除掉
                 List<Map<String, Object>> userList = null;
                 if (company.getPackageOa() == 1) {

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

@@ -28,4 +28,11 @@
         corpid, corp_name, corp_full_name, corp_scale, corp_industry, corp_sub_industry, location, access_token, expire_time, permanent_code, auth_username, company_id, agentid, contact_secret, contact_server, saas_sync_contact, auth_mode
     </sql>
 
+    <select id="getWxCompanyList" resultType="com.management.platform.entity.WxCorpInfo">
+        select *
+        from wx_corp_info
+        left join company
+        ON wx_corp_info.company_id = company.id
+        where company.expiration_date >= now()
+    </select>
 </mapper>