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 c251271..d9851c8 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
@@ -10,7 +10,7 @@ import com.bonus.common.core.web.domain.BaseEntity;
/**
* 厨房员工进出门禁记录对象 kitchen_staff_enter_exit_record
- *
+ *
* @author xsheng
* @date 2025-06-23
*/
@@ -55,6 +55,39 @@ public class KitchenStaffEnterExitRecord extends BaseEntity {
@Excel(name = "出门图片")
@ApiModelProperty(value = "出门图片")
private String exitImgUrl;
+ @ApiModelProperty("人员名称")
+ private String staffName;
+ @ApiModelProperty("人员编号")
+ private String staffNo;
+ @ApiModelProperty("体温")
+ private String temp;
+ @ApiModelProperty("手机号")
+ private String mobile;
+ @ApiModelProperty("组织名称")
+ private String orgFullName;
+ @ApiModelProperty("职位")
+ private String postName;
+ @ApiModelProperty("区域ID")
+ private String areaId;
+ @ApiModelProperty("食堂ID")
+ private String canteenName;
+ @ApiModelProperty("区域")
+ private String areaName;
+ @ApiModelProperty("食堂")
+ private String canteenId;
+ @ApiModelProperty("位置")
+ private String placeFullName;
+ @ApiModelProperty("门名称")
+ private String doorName;
+ @ApiModelProperty("进出方式")
+ private String inoutType;
+ @ApiModelProperty("进出方向")
+ private String inoutDirection;
+ @ApiModelProperty("性别")
+ private String sex;
+ private String startDate;
+ private String endDate;
+ private String articleTitle;
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/controller/UserFaceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/controller/UserFaceController.java
index fac243d..8a638a4 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/controller/UserFaceController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/controller/UserFaceController.java
@@ -11,7 +11,7 @@ import com.bonus.common.houqin.encrypt.RequiresGuest;
import com.bonus.common.houqin.i18n.I18n;
import com.bonus.common.log.enums.OperaType;
import com.bonus.system.api.domain.SysUser;
-import com.bonus.system.api.domain.SysUserFace;
+//import com.bonus.system.api.domain.SysUserFace;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,14 +42,14 @@ public class UserFaceController extends BaseController {
@Autowired
private IUserFaceService UserFaceService;
- @ApiOperation("保存人脸图片")
- @PostMapping({"/uploadUserFace"})
- @RequiresGuest
- public AjaxResult uploadUserFace(@RequestBody @Valid SysUserFace sysUserFace) {
- UserFace dto = new UserFace();
- dto.setUserId(sysUserFace.getUserId());
- dto.setPhotoUrl(sysUserFace.getPhotoUrl());
- return UserFaceService.uploadUserFace(dto);
- }
+// @ApiOperation("保存人脸图片")
+// @PostMapping({"/uploadUserFace"})
+// @RequiresGuest
+// public AjaxResult uploadUserFace(@RequestBody @Valid SysUserFace sysUserFace) {
+// UserFace dto = new UserFace();
+// dto.setUserId(sysUserFace.getUserId());
+// dto.setPhotoUrl(sysUserFace.getPhotoUrl());
+// return UserFaceService.uploadUserFace(dto);
+// }
}
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 aef175c..2dc75a3 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
@@ -15,29 +15,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- select check_Id, staff_id, device_id, enter_time, enter_img_url, exit_time, exit_img_url, create_by, create_time, update_by, update_time from kitchen_staff_enter_exit_record
+ select kseer.enter_time,kseer.exit_time,kseer.enter_img_url,kseer.exit_img_url,kseer.device_id,
+ 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
-
+
-
+
insert into kitchen_staff_enter_exit_record
@@ -88,9 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from kitchen_staff_enter_exit_record where check_Id in
+ delete from kitchen_staff_enter_exit_record where check_Id in
#{checkId}
-
\ No newline at end of file
+