bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏预警过滤去除

This commit is contained in:
hongchao 2025-09-18 17:34:38 +08:00
parent 1ffe0cb288
commit 140305f73f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java
View File

@ -147,7 +147,12 @@ public class PushProDataUseInfoController extends BaseController {
public TableDataInfo getApproachingDetails(ProIdsBean bean) { public TableDataInfo getApproachingDetails(ProIdsBean bean) {
try { try {
startPage(); startPage();
List<MachineInfoBean> results = service.getApproachingDetails(bean); List<MachineInfoBean> results = new ArrayList<>();
if(bean.getType() ==1){
results = null;
}else{
results = service.getApproachingDetails(bean);
}
return getDataTable(results); return getDataTable(results);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.toString(), e); logger.error(e.toString(), e);

6
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -223,11 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
THEN 1 THEN 1
ELSE NULL ELSE NULL
END) AS ApproachingNum, END) AS ApproachingNum,
COUNT(CASE 0 AS TimeoutNum AS TimeoutNum
WHEN mm.next_check_time &lt; NOW()
THEN 1
ELSE NULL
END) AS TimeoutNum
FROM ma_machine mm FROM ma_machine mm
LEFT JOIN slt_agreement_info sai on sai.ma_id = mm.ma_id and mm.type_id = sai.type_id LEFT JOIN slt_agreement_info sai on sai.ma_id = mm.ma_id and mm.type_id = sai.type_id
LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id