From 140305f73f45260425533539d27c4edc9af6dfa0 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 18 Sep 2025 17:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A2=84=E8=AD=A6=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../push/controller/PushProDataUseInfoController.java | 7 ++++++- .../mapper/material/push/ProDataUseInfoMapper.xml | 6 +----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java index 940fdb14..5df61a7c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java @@ -147,7 +147,12 @@ public class PushProDataUseInfoController extends BaseController { public TableDataInfo getApproachingDetails(ProIdsBean bean) { try { startPage(); - List results = service.getApproachingDetails(bean); + List results = new ArrayList<>(); + if(bean.getType() ==1){ + results = null; + }else{ + results = service.getApproachingDetails(bean); + } return getDataTable(results); } catch (Exception e) { logger.error(e.toString(), e); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml index d54387cd..c98ce284 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml @@ -223,11 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" THEN 1 ELSE NULL END) AS ApproachingNum, - COUNT(CASE - WHEN mm.next_check_time < NOW() - THEN 1 - ELSE NULL - END) AS TimeoutNum + 0 AS TimeoutNum AS TimeoutNum 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 bm_agreement_info bai ON sai.agreement_id = bai.agreement_id