jsk

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenStaffEnterExitRecord.java

@@ -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;
 
 
 }

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("保存人脸图片")
+//    @ApiOperation("保存人脸图片")
-    @PostMapping({"/uploadUserFace"})
+//    @PostMapping({"/uploadUserFace"})
-    @RequiresGuest
+//    @RequiresGuest
-    public AjaxResult uploadUserFace(@RequestBody @Valid SysUserFace sysUserFace) {
+//    public AjaxResult uploadUserFace(@RequestBody @Valid SysUserFace sysUserFace) {
-        UserFace dto = new UserFace();
+//        UserFace dto = new UserFace();
-        dto.setUserId(sysUserFace.getUserId());
+//        dto.setUserId(sysUserFace.getUserId());
-        dto.setPhotoUrl(sysUserFace.getPhotoUrl());
+//        dto.setPhotoUrl(sysUserFace.getPhotoUrl());
-        return UserFaceService.uploadUserFace(dto);
+//        return UserFaceService.uploadUserFace(dto);
-    }
+//    }
 
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml

@@ -15,21 +15,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="staffId"    column="staff_id"    />
+        <result property="canteenId"    column="canteen_id"    />
+        <result property="staffNo"    column="staff_no"    />
+        <result property="staffName"    column="staff_name"    />
+        <result property="postName"    column="post_name"    />
+        <result property="mobile"    column="mobile"    />
+        <result property="sex"    column="sex"    />
+        <result property="areaId"    column="area_id"    />
+        <result property="canteenName"    column="canteen_name"    />
+        <result property="areaName"    column="area_name"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectKitchenStaffEnterExitRecordVo">
-        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
     </sql>
 
     <select id="selectKitchenStaffEnterExitRecordList" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenStaffEnterExitRecord" resultMap="KitchenStaffEnterExitRecordResult">
         <include refid="selectKitchenStaffEnterExitRecordVo"/>
         <where>
-            <if test="staffId != null "> and staff_id = #{staffId}</if>
+            <if test="articleTitle != null  and articleTitle != ''"> and (kst.staff_name  like concat('%', #{articleTitle}, '%') or kst.mobile  like concat('%', #{articleTitle}, '%'))</if>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="staffId != null "> and kseer.staff_id = #{staffId}</if>
-            <if test="enterTime != null "> and enter_time = #{enterTime}</if>
+            <if test="enterImgUrl != null  and enterImgUrl != ''"> and kseer.enter_img_url = #{enterImgUrl}</if>
-            <if test="enterImgUrl != null  and enterImgUrl != ''"> and enter_img_url = #{enterImgUrl}</if>
+            <if test="startDate != null "> and substring(kseer.enter_time,1,10) >= #{startDate} and #{endDate}>= substring(kseer.enter_time,1,10)</if>
-            <if test="exitTime != null "> and exit_time = #{exitTime}</if>
-            <if test="exitImgUrl != null  and exitImgUrl != ''"> and exit_img_url = #{exitImgUrl}</if>
         </where>
     </select>