智慧厨房

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

@@ -99,10 +99,10 @@ public class KitchenDeviceSensorRecord extends BaseEntity {
     private List<Integer> sensorResultTypeList;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 }

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

@@ -95,11 +95,11 @@ public class KitchenSampleCabinetRecord extends BaseEntity {
     private Long staffName;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 
 }

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

@@ -155,29 +155,29 @@ public class KitchenSampleDishesRecord extends BaseEntity {
     @NotNull(message = "查询类型不能为空")
     private Integer searchType;
 
-    @ApiModelProperty(value = "违规状态 1 重量未达标 2 时长未达标 3 正常")
+    @ApiModelProperty(value = "违规状态  重量未达标  时长未达标  正常")
     private String illegalStatusName;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 
     @ApiModelProperty("食堂名称")
-    private LocalDateTime canteenName;
+    private String canteenName;
 
     @ApiModelProperty("档口名称")
-    private LocalDateTime stallName;
+    private String stallName;
 
     @ApiModelProperty("菜品名称")
-    private LocalDateTime dishesName;
+    private String dishesName;
 
     @ApiModelProperty("设备名称")
-    private LocalDateTime deviceName;
+    private String deviceName;
 
     @ApiModelProperty("留样人")
-    private LocalDateTime userName;
+    private String userName;
 }

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

@@ -85,11 +85,11 @@ public class KitchenStaffIllegalWarning extends BaseEntity {
     private Long alarmType;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 
     private String nickName;

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

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.common.core.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
@@ -61,23 +62,31 @@ public class KitchenStaffMorningCheck extends BaseEntity {
     private String checkVideoUrl;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 
     @ApiModelProperty("岗位")
     private Long[] postIds;
 
+    @ApiModelProperty("岗位名称")
     private String postName;
 
+    @ApiModelProperty("用户名称")
     private String nickName;
 
+    @ApiModelProperty("食堂名称")
     private String canteenName;
 
+    @ApiModelProperty("手机号码")
     private String phonenumber;
 
+    @ApiModelProperty("员工编号")
+    private Long staffNo;
+
+    @JsonIgnore
     private String encryptedSearchValue;
 }

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

@@ -83,10 +83,10 @@ public class KitchenWasteDeal extends BaseEntity {
     private Long staffId;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 }

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

@@ -55,11 +55,11 @@ public class KitchenWasteMeal extends BaseEntity {
     private String canteenName;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 
     @Excel(name = "区域Id")

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

@@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from kitchen_sample_cabinet_record kscr
         left join kitchen_device_info kdi on kdi.device_id = kscr.device_id
         left join basic_canteen bc on bc.canteen_id = kdi.canteen_id
-        left join sys_user su on su.user_id = kscr.staff_id
+        left join kitchen_staff_info ksi on ksi.staff_id = kscr.staff_id
+        left join sys_user su on su.user_id = ksi.user_id
     </sql>
 
     <select id="selectKitchenSampleCabinetRecordList" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenSampleCabinetRecord" resultMap="KitchenSampleCabinetRecordResult">
@@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null "> and kscr.device_id = #{deviceId}</if>
             <if test="openCabinetTemp != null "> and open_cabinet_temp = #{openCabinetTemp}</if>
             <if test="closeCabinetTemp != null "> and close_cabinet_temp = #{closeCabinetTemp}</if>
-            <if test="staffId != null "> and staff_id = #{staffId}</if>
+            <if test="staffId != null "> and kscr.staff_id = #{staffId}</if>
             <if test="openCabinetTime != null "> and open_cabinet_time = #{openCabinetTime}</if>
             <if test="closeCabinetTime != null "> and close_cabinet_time = #{closeCabinetTime}</if>
             <if test="operateType != null "> and operate_type = #{operateType}</if>

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

@@ -20,13 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="postName"    column="post_name"    />
         <result property="canteenName"    column="canteen_name"    />
         <result property="phonenumber"    column="phonenumber"    />
+        <result property="staffNo"    column="staffNo"    />
     </resultMap>
 
     <sql id="selectKitchenStaffMorningCheckVo">
         select check_Id, ksmc.staff_id, device_id, temperature_value, temperature_status,
                check_status, record_time, check_video_url, ksmc.create_by, ksmc.create_time,
                ksmc.update_by, ksmc.update_time, su.nick_name, sp.post_name, bc.canteen_name,
-               su.phonenumber
+               su.phonenumber, su.user_id as staffNo
         from kitchen_staff_morning_check ksmc
             left join kitchen_staff_info ksi on ksmc.staff_id = ksi.staff_id
             left join sys_user su on ksi.user_id = su.user_id
@@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or su.user_id like CONCAT('%',#{searchValue},'%')
                 )
             </if>
-            <if test="postIds != null and postIds.length() > 0">
+            <if test="postIds != null and postIds.length > 0">
                 and sup.post_id in
                 <foreach item="postId" collection="postIds" open="(" separator="," close=")">
                     #{postId}