From ccbaac0c4cccff18ce7f23f9b68fcde3df514f1e Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 28 Aug 2025 13:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E6=A0=B7=E6=9F=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/kitchen/domain/KitchenSampleDishesRecord.java        | 3 +++
 .../service/impl/KitchenSampleCabinetRecordServiceImpl.java   | 1 +
 .../mapper/kitchen/KitchenSampleCabinetRecordMapper.xml       | 4 ++--
 .../mapper/kitchen/KitchenSampleDishesRecordMapper.xml        | 4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java
index 21cecee..5436dd5 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java
@@ -188,6 +188,9 @@ public class KitchenSampleDishesRecord extends BaseEntity {
     @ApiModelProperty("留样人")
     private String staffName;
 
+    @ApiModelProperty("取样人")
+    private String takeStaffName;
+
     private String searchValue;
 
     private LocalDate applyDate;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleCabinetRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleCabinetRecordServiceImpl.java
index 6ca9327..46ab35c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleCabinetRecordServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleCabinetRecordServiceImpl.java
@@ -67,6 +67,7 @@ public class KitchenSampleCabinetRecordServiceImpl implements IKitchenSampleCabi
     public int insertKitchenSampleCabinetRecord(KitchenSampleCabinetRecord kitchenSampleCabinetRecord) {
         kitchenSampleCabinetRecord.setCreateTime(DateUtils.getNowDate());
         kitchenSampleCabinetRecord.setCreateBy(SecurityUtils.getUsername());
+        kitchenSampleCabinetRecord.setStaffId(SecurityUtils.getUserId());
         kitchenSampleCabinetRecord.setRecordId(null);
         try {
             if (StringHelper.isNullOrEmptyString(kitchenSampleCabinetRecord.getSampleId())){
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml
index 4117867..890af10 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml
@@ -152,7 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cabinet_no = #{deviceId},
             save_status = '2'
             where record_id = #{sampleId};
-
         </if>
         <if test="actionType == 2">
             update kitchen_sample_dishes_record set
@@ -160,7 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cabinet_no = #{deviceId},
             save_status = '3',
             valid_duration = TIMESTAMPDIFF(HOUR , enter_cabinet_time, now()),
-            duration_standard = if(TIMESTAMPDIFF(HOUR, enter_cabinet_time, now()), 1, 2)
+            duration_standard = if(TIMESTAMPDIFF(HOUR, enter_cabinet_time, now()), 1, 2),
+            sample_take_staff_id = #{staffId}
             where record_id = #{sampleId};
         </if>
     </update>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml
index 6e1c0ae..4b9e69b 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dishesImgUrl"    column="dishes_img_url"    />
         <result property="deviceName"    column="device_name"    />
         <result property="staffName" column="staff_name"    />
+        <result property="takeStaffName" column="take_staff_name"    />
     </resultMap>
 
     <sql id="selectKitchenSampleDishesRecordVo">
@@ -47,13 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                enter_cabinet_time, leave_cabinet_time, expiration_time, weight_standard,
                valid_duration, duration_standard, ksdr.status, cabinet_no, save_status,
                ksdr.create_by, ksdr.create_time, ksdr.update_by, ksdr.update_time,
-               bc.canteen_name, bs.stall_name, bd.dishes_name, kdi.device_name, ksi.staff_name
+               bc.canteen_name, bs.stall_name, bd.dishes_name, kdi.device_name, ksi.staff_name,su.user_name as take_staff_name
         from kitchen_sample_dishes_record ksdr
              left join basic_canteen bc on bc.canteen_id = ksdr.canteen_id
              left join basic_stall bs on bs.stall_id = ksdr.stall_id
              left join cook_dishes bd on bd.dishes_id = ksdr.dishes_id
              left join kitchen_device_info kdi on kdi.device_id = ksdr.device_id
              left join kitchen_staff_info ksi on ksi.staff_id = ksdr.sample_save_staff_id
+             left join sys_user su on su.user_id = ksdr.sample_take_staff_id
     </sql>
 
     <select id="selectKitchenSampleDishesRecordList" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenSampleDishesRecord" resultMap="KitchenSampleDishesRecordResult">