智慧厨房

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

@@ -65,7 +65,11 @@ public class KitchenWasteDeal extends BaseEntity {
     /** 处理方式: 1-丢弃,2-下一餐使用,3-集中售卖 */
     @Excel(name = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖")
     @ApiModelProperty(value = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖")
-    private Long dealType;
+    private Integer dealType;
+
+    @Excel(name = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖")
+    @ApiModelProperty(value = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖")
+    private String dealTypeName;
 
     /** 售卖金额 */
     @Excel(name = "售卖金额")
@@ -82,6 +86,16 @@ public class KitchenWasteDeal extends BaseEntity {
     @ApiModelProperty(value = "处理人id")
     private Long staffId;
 
+    /** 现场照片 */
+    @Excel(name = "食堂名称")
+    @ApiModelProperty(value = "食堂名称")
+    private String canteenName;
+
+    /** 现场照片 */
+    @Excel(name = "处理人姓名")
+    @ApiModelProperty(value = "处理人姓名")
+    private String dealUserName;
+
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDateTime;

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

@@ -27,9 +27,14 @@ public class KitchenWasteMeal extends BaseEntity {
 
     /** 台账日期时间 */
     @ApiModelProperty(value = "台账日期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "台账日期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime ledgerTime;
+
+    @ApiModelProperty(value = "台账日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "台账日期时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date ledgerTime;
+    private LocalDateTime ledgerDate;
 
     /** 餐次 */
     @Excel(name = "餐次")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java

@@ -1,6 +1,9 @@
 package com.bonus.canteen.core.kitchen.service.impl;
 
 import java.util.List;
+
+import cn.hutool.core.collection.CollUtil;
+import com.bonus.canteen.core.kitchen.domain.constants.WasteDealTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +42,13 @@ public class KitchenWasteDealServiceImpl implements IKitchenWasteDealService {
      */
     @Override
     public List<KitchenWasteDeal> selectKitchenWasteDealList(KitchenWasteDeal kitchenWasteDeal) {
-        return kitchenWasteDealMapper.selectKitchenWasteDealList(kitchenWasteDeal);
+        List<KitchenWasteDeal> list = kitchenWasteDealMapper.selectKitchenWasteDealList(kitchenWasteDeal);
+        if(CollUtil.isNotEmpty(list)) {
+            for(KitchenWasteDeal wasteDeal : list) {
+                wasteDeal.setDealTypeName(WasteDealTypeEnum.getDescByKey(wasteDeal.getDealType()));
+            }
+        }
+        return list;
     }
 
     /**

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

@@ -20,12 +20,15 @@ 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="canteenName"    column="canteen_name"    />
+        <result property="dealUserName"    column="deal_user_name"    />
     </resultMap>
 
     <sql id="selectKitchenWasteDealVo">
         select waste_id, weight, garbage_name, action_date, device_id, mealtime_type,
                kwd.canteen_id, kwd.area_id, deal_type, sale_amount, scene_picture, kwd.staff_id,
-               kwd.create_by, kwd.create_time, kwd.update_by, kwd.update_time
+               kwd.create_by, kwd.create_time, kwd.update_by, kwd.update_time, bc.canteen_name,
+               su.user_name as deal_user_name
         from kitchen_waste_deal kwd
         left join basic_canteen bc on kwd.canteen_id = bc.canteen_id
         left join kitchen_staff_info ksi on kwd.staff_id = ksi.staff_id

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

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="canteenName"    column="canteen_name"    />
         <result property="wasteMealCount"    column="waste_meal_count"    />
+        <result property="ledgerDate"    column="ledger_date"    />
     </resultMap>
 
     <sql id="selectKitchenWasteMealVo">
@@ -105,10 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectKitchenWasteMealListCount" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenWasteMeal" resultMap="KitchenWasteMealResult">
-        select ledger_time, mealtime_type, kwm.canteen_id,  bc.canteen_name, count(*) as waste_meal_count
+        select DATE(ledger_time) as ledger_date, mealtime_type, kwm.canteen_id,  bc.canteen_name, count(*) as waste_meal_count
         from kitchen_waste_meal kwm
         left join basic_canteen bc on bc.canteen_id = kwm.canteen_id
-         group by kwm.ledger_time, kwm.mealtime_type, kwm.canteen_id
         <where>
             <if test="ledgerTime != null "> and ledger_time = #{ledgerTime}</if>
             <if test="mealtimeType != null "> and mealtime_type = #{mealtimeType}</if>
@@ -122,5 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and kwm.ledger_time  <![CDATA[ <= ]]> #{endDateTime}
             </if>
         </where>
+        group by DATE(kwm.ledger_time), kwm.mealtime_type, kwm.canteen_id
     </select>
 </mapper>