邮件发送

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

@@ -70,13 +70,13 @@ public class Task {
             List<String> idCardList = keyPeopleInfoList.stream().map(KeyPeopleInfo::getIdCard).collect(Collectors.toList());
             //从第三方数据库查询人员核酸计录
             List<OdsQssHsjcxx> OdsQssHsjcxxList = qdsQssHsjcxxService.thirdNucleicAcid(startTime, endTime, idCardList);
-
-            Map<String, List<OdsQssHsjcxx>> OdsQssHsjcxxMapSorted = new HashMap<>();
+            if(OdsQssHsjcxxList == null && OdsQssHsjcxxList.size() <= 0){
+                return;
+            }
+            /*Map<String, List<OdsQssHsjcxx>> OdsQssHsjcxxMapSorted = new HashMap<>();
             if (OdsQssHsjcxxList != null && OdsQssHsjcxxList.size() > 0) {
                 OdsQssHsjcxxMapSorted = OdsQssHsjcxxList.stream().sorted(Comparator.comparing(OdsQssHsjcxx::getCjsj).reversed()).collect(Collectors.groupingBy(OdsQssHsjcxx::getSfzhm));
             }
-            //把采集时间降序
-            List<UserNucleicTime> UserNucleicTimeList = new ArrayList<>();
 
 
             int index = 0;
@@ -171,7 +171,7 @@ public class Task {
                 }
 
                 userList.add(userInfo);
-            }
+            }*/
 
             /*if (OdsQssHsjcxxList != null && OdsQssHsjcxxList.size() > 0) {
                 for (OdsQssHsjcxx odsQssHsjcxx : OdsQssHsjcxxList) {
@@ -197,24 +197,28 @@ public class Task {
 
             List<Map<String, Object>> mapList = new ArrayList<>();
 
-            for (UserInfo info : userList) {
+            for (OdsQssHsjcxx odsQssHsjcxx : OdsQssHsjcxxList) {
                 Map<String, Object> map = new HashMap<>();
-                map.put("姓名", info.getName());
-                map.put("身份证号码", info.getIdCard());
-                map.put("联系号码", info.getPhoneNum());
-                map.put("核酸采集时间", info.getNucleicCollectTime());
-                map.put("核酸结果时间", info.getNucleicResultsTime());
-                map.put("采集地点", info.getCollectPlace());
-                map.put("采集结果", info.getNucleicResults());
-                map.put("职业类别", info.getJobStyle());
-                map.put("重点人群分类", info.getFocusCrowdStyle());
-                map.put("监测频次（次/天）", info.getDetectionFrequency());
-                map.put("比对开始时间", info.getStartTime());
-                map.put("比对结束时间", info.getEndTime());
-                map.put("进度（已做核酸次数/频次）", info.getDetectionProgress());
-                map.put("是否异常", info.getDetectionResult());
+                map.put("姓名", odsQssHsjcxx.getXm());
+                map.put("身份证号码", odsQssHsjcxx.getSfzhm());
+                map.put("联系号码", odsQssHsjcxx.getSjhm());
+                map.put("核酸采集时间", odsQssHsjcxx.getCjsj());
+                map.put("核酸结果时间", odsQssHsjcxx.getJgcjss());
+                map.put("采集地点", odsQssHsjcxx.getJcdd());
+                if(StringUtils.isEmpty(odsQssHsjcxx.getJcjg())){
+                    map.put("采集结果", odsQssHsjcxx.getJcjg());
+                }else if("0".equals(odsQssHsjcxx.getJcjg()) || "negative".equals(odsQssHsjcxx.getJcjg())){
+                    map.put("采集结果", "阴性");
+                }else if("1".equals(odsQssHsjcxx.getJcjg()) || "positive".equals(odsQssHsjcxx.getJcjg())){
+                    map.put("采集结果", "阳性");
+                }
+                map.put("采集结果", "");
+                map.put("比对开始时间", startTime);
+                map.put("比对结束时间", endTime);
                 mapList.add(map);
             }
+
+
             String path = ExcelUtils.getInstance().createExcel(mapList, "核酸对比数据", "对比数据");
             MailUtil.send("qsxzhb@126.com", "重点人群定时对比数据", "时间："+startTime+"--"+endTime, true,
                     FileUtil.file(path));