|
@@ -71,8 +71,13 @@ public class Task {
|
|
List<String> idCardList = keyPeopleInfoList.stream().map(KeyPeopleInfo::getIdCard).collect(Collectors.toList());
|
|
List<String> idCardList = keyPeopleInfoList.stream().map(KeyPeopleInfo::getIdCard).collect(Collectors.toList());
|
|
//从第三方数据库查询人员核酸计录
|
|
//从第三方数据库查询人员核酸计录
|
|
List<OdsQssHsjcxx> OdsQssHsjcxxList = qdsQssHsjcxxService.thirdNucleicAcid(startTime, endTime, idCardList);
|
|
List<OdsQssHsjcxx> OdsQssHsjcxxList = qdsQssHsjcxxService.thirdNucleicAcid(startTime, endTime, idCardList);
|
|
|
|
+
|
|
|
|
+ //查询65开头的人员核酸数据
|
|
|
|
+ List<OdsQssHsjcxx> OdsQssHsjcxxList65 = qdsQssHsjcxxService.thirdNucleicAcid65(startTime, endTime);
|
|
|
|
+ OdsQssHsjcxxList.addAll(OdsQssHsjcxxList65);
|
|
//查询安康码采集地点信息
|
|
//查询安康码采集地点信息
|
|
List<AkmData> akmDataList = akmDataMapper.selectAkmDataListByIdList(startTime, endTime, idCardList);
|
|
List<AkmData> akmDataList = akmDataMapper.selectAkmDataListByIdList(startTime, endTime, idCardList);
|
|
|
|
+
|
|
if((OdsQssHsjcxxList == null || OdsQssHsjcxxList.size() <= 0) && (akmDataList == null || akmDataList.size() <= 0)){
|
|
if((OdsQssHsjcxxList == null || OdsQssHsjcxxList.size() <= 0) && (akmDataList == null || akmDataList.size() <= 0)){
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -195,7 +200,7 @@ public class Task {
|
|
ArrayList<String> tos1 = CollUtil.newArrayList(
|
|
ArrayList<String> tos1 = CollUtil.newArrayList(
|
|
"1223814488@qq.com",
|
|
"1223814488@qq.com",
|
|
"15156696045@139.com");
|
|
"15156696045@139.com");
|
|
- MailUtil.send(tos, "会员积分实时变动通知", sb.toString(), true);
|
|
|
|
|
|
+ MailUtil.send(tos1, "会员积分实时变动通知", sb.toString(), true);
|
|
}
|
|
}
|
|
if(b1){
|
|
if(b1){
|
|
ArrayList<String> tos = CollUtil.newArrayList(
|
|
ArrayList<String> tos = CollUtil.newArrayList(
|
|
@@ -204,7 +209,7 @@ public class Task {
|
|
ArrayList<String> tos1 = CollUtil.newArrayList(
|
|
ArrayList<String> tos1 = CollUtil.newArrayList(
|
|
"1434899932@qq.com",
|
|
"1434899932@qq.com",
|
|
"1434745622@qq.com");
|
|
"1434745622@qq.com");
|
|
- MailUtil.send(tos, "会员积分实时变动通知", sb1.toString(), true);
|
|
|
|
|
|
+ MailUtil.send(tos1, "会员积分实时变动通知", sb1.toString(), true);
|
|
}
|
|
}
|
|
|
|
|
|
//String path = ExcelUtils.getInstance().createExcel(mapList, "核酸对比数据", "对比数据");
|
|
//String path = ExcelUtils.getInstance().createExcel(mapList, "核酸对比数据", "对比数据");
|