bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

留样柜

This commit is contained in:
jjLv 2025-08-28 13:24:15 +08:00
parent 56a1983e35
commit ccbaac0c4c
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,6 +188,9 @@ public class KitchenSampleDishesRecord extends BaseEntity {
@ApiModelProperty("留样人") @ApiModelProperty("留样人")
private String staffName; private String staffName;
@ApiModelProperty("取样人")
private String takeStaffName;
private String searchValue; private String searchValue;
private LocalDate applyDate; private LocalDate applyDate;

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleCabinetRecordServiceImpl.java
View File

@ -67,6 +67,7 @@ public class KitchenSampleCabinetRecordServiceImpl implements IKitchenSampleCabi
public int insertKitchenSampleCabinetRecord(KitchenSampleCabinetRecord kitchenSampleCabinetRecord) { public int insertKitchenSampleCabinetRecord(KitchenSampleCabinetRecord kitchenSampleCabinetRecord) {
kitchenSampleCabinetRecord.setCreateTime(DateUtils.getNowDate()); kitchenSampleCabinetRecord.setCreateTime(DateUtils.getNowDate());
kitchenSampleCabinetRecord.setCreateBy(SecurityUtils.getUsername()); kitchenSampleCabinetRecord.setCreateBy(SecurityUtils.getUsername());
kitchenSampleCabinetRecord.setStaffId(SecurityUtils.getUserId());
kitchenSampleCabinetRecord.setRecordId(null); kitchenSampleCabinetRecord.setRecordId(null);
try { try {
if (StringHelper.isNullOrEmptyString(kitchenSampleCabinetRecord.getSampleId())){ if (StringHelper.isNullOrEmptyString(kitchenSampleCabinetRecord.getSampleId())){

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

@ -152,7 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
cabinet_no = #{deviceId}, cabinet_no = #{deviceId},
save_status = '2' save_status = '2'
where record_id = #{sampleId}; where record_id = #{sampleId};
</if> </if>
<if test="actionType == 2"> <if test="actionType == 2">
update kitchen_sample_dishes_record set update kitchen_sample_dishes_record set
@ -160,7 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
cabinet_no = #{deviceId}, cabinet_no = #{deviceId},
save_status = '3', save_status = '3',
valid_duration = TIMESTAMPDIFF(HOUR , enter_cabinet_time, now()), 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}; where record_id = #{sampleId};
</if> </if>
</update> </update>

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml
View File

@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dishesImgUrl" column="dishes_img_url" /> <result property="dishesImgUrl" column="dishes_img_url" />
<result property="deviceName" column="device_name" /> <result property="deviceName" column="device_name" />
<result property="staffName" column="staff_name" /> <result property="staffName" column="staff_name" />
<result property="takeStaffName" column="take_staff_name" />
</resultMap> </resultMap>
<sql id="selectKitchenSampleDishesRecordVo"> <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, enter_cabinet_time, leave_cabinet_time, expiration_time, weight_standard,
valid_duration, duration_standard, ksdr.status, cabinet_no, save_status, valid_duration, duration_standard, ksdr.status, cabinet_no, save_status,
ksdr.create_by, ksdr.create_time, ksdr.update_by, ksdr.update_time, 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 from kitchen_sample_dishes_record ksdr
left join basic_canteen bc on bc.canteen_id = ksdr.canteen_id 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 basic_stall bs on bs.stall_id = ksdr.stall_id
left join cook_dishes bd on bd.dishes_id = ksdr.dishes_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_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 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> </sql>
<select id="selectKitchenSampleDishesRecordList" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenSampleDishesRecord" resultMap="KitchenSampleDishesRecordResult"> <select id="selectKitchenSampleDishesRecordList" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenSampleDishesRecord" resultMap="KitchenSampleDishesRecordResult">