邮件发送

ruoyi-admin/src/main/resources/application.yml

@@ -29,8 +29,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
-    #active: prod
+    #active: druid
+    active: prod
   # 文件上传
   servlet:
     multipart:

ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java

@@ -70,7 +70,7 @@ public class Task {
             List<String> idCardList = keyPeopleInfoList.stream().map(KeyPeopleInfo::getIdCard).collect(Collectors.toList());
             //从第三方数据库查询人员核酸计录
             List<OdsQssHsjcxx> OdsQssHsjcxxList = qdsQssHsjcxxService.thirdNucleicAcid(startTime, endTime, idCardList);
-            if(OdsQssHsjcxxList == null && OdsQssHsjcxxList.size() <= 0){
+            if(OdsQssHsjcxxList == null || OdsQssHsjcxxList.size() <= 0){
                 return;
             }
             /*Map<String, List<OdsQssHsjcxx>> OdsQssHsjcxxMapSorted = new HashMap<>();

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java

@@ -138,7 +138,9 @@ public class UserInfoServiceImpl implements IUserInfoService {
         KeyPeopleInfo keyPeopleInfo = new KeyPeopleInfo();
         keyPeopleInfo.setDeptId(user.getDeptId().toString());
         List<KeyPeopleInfo> keyPeopleInfoList = keyPeopleInfoMapper.selectKeyPeopleInfoList(keyPeopleInfo);
-
+        if(keyPeopleInfoList==null || keyPeopleInfoList.size()<=0){
+            return "请先上传该部门重点人员";
+        }
         String startTime = userInfoP.getStartTime();
         String endTime = userInfoP.getEndTime();
         String detectionNumber = userInfoP.getDetectionNumber();

ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml

@@ -253,6 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ( select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg,sjly
         from ods_qss_hsjcxx_all
         where cjsj > #{startTime}  and #{endTime}>=cjsj
+        and sjly != '东软系统'
         and sfzhm in
         <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
             #{idCard}