From 65ac48eda928ae02ed9d0c495e7bb1c5f3b66736 Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Mon, 7 Jul 2025 09:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=A8=E6=88=BF=E9=A6=96=E9=A1=B5=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/KitchenDeviceInfoServiceImpl.java    |  2 +-
 .../impl/KitchenHomePageerviceImpl.java       | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java
index 29b4214..e8d6179 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java
@@ -104,7 +104,7 @@ public class KitchenDeviceInfoServiceImpl extends ServiceImpl<KitchenDeviceInfoM
                         .eq(KitchenDeviceInfo::getDeviceName, kitchenDeviceInfo.getDeviceName())
         );
         if(bean !=null) {
-            throw new ServiceException("设备编号已存在，请检查后重新输入");
+            throw new ServiceException("设备名称已存在，请检查后重新输入");
         }
         bean = kitchenDeviceInfoMapper.selectOne(
                 Wrappers.<KitchenDeviceInfo>lambdaQuery()
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java
index cba8dab..af3318c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java
@@ -111,18 +111,23 @@ public class KitchenHomePageerviceImpl implements IKitchenHomePageService {
             //过期状态
             int expireCount = 0;
             for(KitchenStaffInfo kitchenStaffInfo : selectKitchenStaffInfoList){
-                LocalDate healthCertExpire = kitchenStaffInfo.getHealthCertExpire();
-                System.err.println("111: " + ChronoUnit.DAYS.between(healthCertExpire,LocalDate.now()));
-                System.err.println("222: " + ChronoUnit.DAYS.between(LocalDate.now(),healthCertExpire));
-                if(healthCertExpire == null){
+                try {
+                    LocalDate healthCertExpire = kitchenStaffInfo.getHealthCertExpire();
+                    if(healthCertExpire == null){
+                        lackCount ++;
+                    }else if(ChronoUnit.DAYS.between(LocalDate.now(), healthCertExpire)<inemValue && ChronoUnit.DAYS.between(LocalDate.now(), healthCertExpire)>=0){
+                        adventCount ++;
+                    }else if (ChronoUnit.DAYS.between(LocalDate.now(),healthCertExpire)<0){
+                        expireCount ++;
+                    }else{
+                        normalCount ++;
+                    }
+                }catch (Exception e){
                     lackCount ++;
-                }else if(ChronoUnit.DAYS.between(LocalDate.now(), healthCertExpire)<inemValue && ChronoUnit.DAYS.between(LocalDate.now(), healthCertExpire)>0){
-                    adventCount ++;
-                }else if (ChronoUnit.DAYS.between(LocalDate.now(),healthCertExpire)<0){
-                    expireCount ++;
-                }else{
-                    normalCount ++;
+//                    e.printStackTrace(); // 定位实际抛出 NPE 的代码行
+//                    throw new ServiceException("健康证到期时间格式错误");
                 }
+
             }
             IndexMapCountVO normal = new IndexMapCountVO();
             IndexMapCountVO lack = new IndexMapCountVO();