“人员资质管理”中“资质类型”增加作业资格证书，如动火与焊接证书等，消息事项中增加证件过期提醒，提前2个月出现消息提示，与危险作业模块相同

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/aptitude/job/Remind.java

 package com.testor.module.aptitude.job;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.testor.biz.sys.role.model.domain.SysRole;
+import com.testor.biz.sys.role.service.SysRoleService;
+import com.testor.biz.sys.user.model.domain.SysUser;
+import com.testor.biz.sys.userRole.model.domain.SysUserRole;
+import com.testor.biz.sys.userRole.service.SysUserRoleService;
 import com.testor.module.aptitude.model.domain.TPersonAptitude;
 import com.testor.module.aptitude.service.TPersonAptitudeService;
 import com.testor.module.messageNotice.model.vo.MsgTemplateVO;
 import com.testor.module.messageNotice.service.TMsgNoticeService;
+import com.testor.module.sys.service.TSysUserService;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -15,6 +22,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @ConditionalOnProperty(prefix = "service", name = "taskEnabled", havingValue = "true")
@@ -26,12 +34,22 @@ public class Remind {
     @Autowired
     private TMsgNoticeService tMsgNoticeService;
 
-    @XxlJob("checkAndSendReminders")
+    @Autowired
+    private TSysUserService sysUserService;
+
+    @Autowired
+    private SysRoleService roleService;
+
+    @Autowired
+    private SysUserRoleService userRoleService;
+
+    //@XxlJob("checkAndSendReminders")
+    @Scheduled(cron = "0 0 1 * * *")
     public void checkAndSendReminders() {
         LocalDate today = LocalDate.now();
 
         // 提前两个月提醒(60天后到期)
-        checkAndSendReminder(today.plusDays(60), "资质将在2个月后到期， 及时更新证件信息，以免影响正常使用，谢谢");
+        checkAndSendReminder(today.plusDays(60), "资质将在2个月后到期，及时更新证件信息，以免影响正常使用，谢谢");
 
         // 提前一个月提醒(30天后到期)
         checkAndSendReminder(today.plusDays(30), "资质将在1个月后到期，及时更新证件信息，以免影响正常使用，谢谢");
@@ -81,8 +99,23 @@ public class Remind {
     }
 
     private List<String> getUserId(String orgId) {
+        List<SysUser> userList = sysUserService.findOrgId(orgId);
+        List<String> userIds = userList.stream()
+                .map(SysUser::getUserId)
+                .collect(Collectors.toList());
+
+        List<SysRole> roleList = roleService.list(new QueryWrapper<SysRole>().like(SysRole.ROLE_NAME, "_system_admin"));
+        List<String> roleIdList = roleList.stream()
+                .map(SysRole::getRoleId)
+                .collect(Collectors.toList());
+
+        List<SysUserRole> userRoleList = userRoleService.list(new QueryWrapper<SysUserRole>().in(SysUser.USER_ID, userIds).eq(SysRole.ROLE_ID, roleIdList));
+
+        List<String> returnUserIdList = userRoleList.stream()
+                .map(SysUserRole::getUserId)
+                .collect(Collectors.toList());
 
-        return new ArrayList<>();
+        return returnUserIdList;
     }
 
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/TSysUserService.java

@@ -20,4 +20,7 @@ public interface TSysUserService {
    String getUserNamesByUserIds(String userIds);
 
    List<SysUser> getUserListByUserIds(String userIds);
+
+   public List<SysUser> findOrgId(String orgId);
+
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/impl/TSysUserServiceImpl.java

@@ -68,7 +68,6 @@ public class TSysUserServiceImpl implements TSysUserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-
     public void customerRemoval(CustomerRemovalDto dto) {
         String userId = dto.getUserId();
         String newOrgId = dto.getNewOrgId();
@@ -123,6 +122,12 @@ public class TSysUserServiceImpl implements TSysUserService {
         return sysUsers;
     }
 
+    @Override
+    public List<SysUser> findOrgId(String orgId) {
+        List<SysUser> sysUsers = sysUserService.list(new QueryWrapper<SysUser>().eq(SysUser.ORG_ID, orgId).eq(SysUser.STATUS,"0"));
+        return sysUsers;
+    }
+
     /**
      * 用户迁移
      *

zlmy-modules/zlmy-boot/src/main/resources/application.yml

@@ -97,3 +97,7 @@ tiny:
     path: tinyFile/
     url: /tinyFile/
 
+service:
+  taskEnabled: true
+
+