From a9d07ce5e757de5367f452c888c37b7646b64b2b Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Fri, 4 Jul 2025 16:56:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/screening/service/DataScreeningServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java index 419abb9..06e4e5c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java @@ -130,14 +130,11 @@ public class DataScreeningServiceImpl implements DataScreeningService { BigDecimal todayNum = Optional.ofNullable(today.getNum()).orElse(BigDecimal.ZERO); if (yesterdayNum.compareTo(BigDecimal.ZERO) == 0) { - today.setRate(todayNum.compareTo(BigDecimal.ZERO) == 0 ? "0.0" : "100.0"); + today.setRate(todayNum.compareTo(BigDecimal.ZERO) == 0 ? "0.0" : "∞"); } else { BigDecimal rate = todayNum.subtract(yesterdayNum) .divide(yesterdayNum, 4, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100)); - if (rate.compareTo(BigDecimal.valueOf(100)) > 0) { - rate = BigDecimal.valueOf(100); - } today.setRate(String.format("%.2f", rate)); } From 2a4a4a97c224b10298fd4e9168311b20e0075ae6 Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Fri, 4 Jul 2025 17:13:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?jsk=20=20=E5=8E=A8=E6=88=BF=E8=BF=9B?= =?UTF-8?q?=E5=87=BA=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/KitchenStaffEnterExitRecord.java | 4 +++- .../utils/NetSDK/FMSGCallBack_V31.java | 3 +++ .../KitchenStaffEnterExitRecordMapper.xml | 22 ++++++++++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenStaffEnterExitRecord.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenStaffEnterExitRecord.java index c5e04a7..360245e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenStaffEnterExitRecord.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenStaffEnterExitRecord.java @@ -76,7 +76,7 @@ public class KitchenStaffEnterExitRecord extends BaseEntity { @ApiModelProperty("食堂") private String canteenId; @ApiModelProperty("位置") - private String placeFullName; + private String subPlaceName; @ApiModelProperty("门名称") private String doorName; @ApiModelProperty("进出方式") @@ -90,5 +90,7 @@ public class KitchenStaffEnterExitRecord extends BaseEntity { private String articleTitle; private String employeeNo; + private String subPlaceId; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FMSGCallBack_V31.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FMSGCallBack_V31.java index a389097..f6edd7d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FMSGCallBack_V31.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FMSGCallBack_V31.java @@ -92,7 +92,10 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 { KitchenStaffEnterExitRecord vo=new KitchenStaffEnterExitRecord(); vo.setStaffId(user.getStaffId()); vo.setEnterTime(swipedata); + vo.setDeviceId(13L); vo.setCreateTime(new Date()); + vo.setInoutType("人脸"); + vo.setInoutDirection("进入"); try{ kitchenStaffEnterExitRecordService.insertKitchenStaffEnterExitRecord(vo); }catch (Exception e){ diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml index 0e29066..68c228c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml @@ -29,19 +29,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select kseer.enter_time,kseer.exit_time,kseer.enter_img_url,kseer.exit_img_url,kseer.device_id, + select kseer.enter_time,de.area_id,de.sub_place,ksp.sub_place_name,de.device_name as doorname, + kseer.exit_time,kseer.enter_img_url,kseer.exit_img_url,kseer.device_id,kseer.inout_type,kseer.inout_direction, kst.staff_id, kst.canteen_id, staff_no, staff_name, post_name, mobile, sex, kst.area_id, health_cert_expire, health_cert_front_img, health_cert_back_img, nutrity_cert_expire, safety_cert_expire, kst.create_by, kst.create_time, kst.update_by, kst.update_time, ksf.photo_url, ksf.face_state, bc.canteen_name, ba.area_name from kitchen_staff_enter_exit_record kseer - left join kitchen_staff_info kst on kseer.staff_id=kst.staff_id - left join kitchen_staff_face ksf on kst.staff_id = ksf.staff_id - left join basic_canteen bc on kst.canteen_id = bc.canteen_id - left join basic_area ba on kst.area_id = ba.area_id + left join kitchen_staff_info kst on kseer.staff_id=kst.staff_id + left join kitchen_staff_face ksf on kst.staff_id = ksf.staff_id + left join basic_canteen bc on kst.canteen_id = bc.canteen_id + left join basic_area ba on kst.area_id = ba.area_id + left join kitchen_device_info de on kseer.device_id=de.device_id + left join kitchen_sub_place ksp on de.sub_place=ksp.sub_place_id @@ -141,6 +151,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join kitchen_staff_face ksf on kst.staff_id = ksf.staff_id left join basic_canteen bc on kst.canteen_id = bc.canteen_id left join basic_area ba on kst.area_id = ba.area_id - where kst.employee_no = #{employeeNo} + where kst.employee_no = #{employeeNo} or staff_no=#{employeeNo}