From 3b00f4033c0ceb2626483b7ef3f726d823930998 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 27 Jun 2025 10:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=8E=A8=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KitchenSampleDishesRecordController.java | 2 +- .../mapper/KitchenSampleDishesRecordMapper.java | 2 +- .../service/IKitchenSampleDishesRecordService.java | 2 +- .../impl/KitchenSampleDishesRecordServiceImpl.java | 11 +++++++++-- .../kitchen/KitchenSampleDishesRecordMapper.xml | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java index 0a2b7dd..fa03d10 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java @@ -85,7 +85,7 @@ public class KitchenSampleDishesRecordController extends BaseController { @PostMapping public AjaxResult add(@RequestBody KitchenSampleDishesRecord kitchenSampleDishesRecord) { try { - return toAjax(kitchenSampleDishesRecordService.insertKitchenSampleDishesRecord(kitchenSampleDishesRecord)); + return AjaxResult.success(kitchenSampleDishesRecordService.insertKitchenSampleDishesRecord(kitchenSampleDishesRecord)); } catch (Exception e) { return error(e.getMessage()); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java index e9380fd..3a2aabd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java @@ -32,7 +32,7 @@ public interface KitchenSampleDishesRecordMapper { * @param kitchenSampleDishesRecord 留样机留样清单 * @return 结果 */ - public int insertKitchenSampleDishesRecord(KitchenSampleDishesRecord kitchenSampleDishesRecord); + public long insertKitchenSampleDishesRecord(KitchenSampleDishesRecord kitchenSampleDishesRecord); /** * 修改留样机留样清单 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java index 440ca57..db5cac8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java @@ -32,7 +32,7 @@ public interface IKitchenSampleDishesRecordService { * @param kitchenSampleDishesRecord 留样机留样清单 * @return 结果 */ - public int insertKitchenSampleDishesRecord(KitchenSampleDishesRecord kitchenSampleDishesRecord); + public long insertKitchenSampleDishesRecord(KitchenSampleDishesRecord kitchenSampleDishesRecord); /** * 修改留样机留样清单 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java index b7bbd07..be84708 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java @@ -4,6 +4,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; +import java.util.Objects; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.kitchen.domain.constants.CommonFlagEnum; @@ -12,6 +13,7 @@ import com.bonus.canteen.core.kitchen.domain.constants.SampleDishesSearchType; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.canteen.core.kitchen.mapper.KitchenSampleDishesRecordMapper; @@ -84,11 +86,12 @@ public class KitchenSampleDishesRecordServiceImpl implements IKitchenSampleDishe * @return 结果 */ @Override - public int insertKitchenSampleDishesRecord(KitchenSampleDishesRecord kitchenSampleDishesRecord) { + public long insertKitchenSampleDishesRecord(KitchenSampleDishesRecord kitchenSampleDishesRecord) { kitchenSampleDishesRecord.setCreateTime(DateUtils.getNowDate()); kitchenSampleDishesRecord.setRecordId(null); try { - return kitchenSampleDishesRecordMapper.insertKitchenSampleDishesRecord(kitchenSampleDishesRecord); + kitchenSampleDishesRecordMapper.insertKitchenSampleDishesRecord(kitchenSampleDishesRecord); + return kitchenSampleDishesRecord.getRecordId(); } catch (Exception e) { throw new ServiceException(e.getMessage()); } @@ -102,7 +105,11 @@ public class KitchenSampleDishesRecordServiceImpl implements IKitchenSampleDishe */ @Override public int updateKitchenSampleDishesRecord(KitchenSampleDishesRecord kitchenSampleDishesRecord) { + if(Objects.isNull(kitchenSampleDishesRecord.getRecordId())) { + throw new ServiceException("留样机留样清单ID不能为空"); + } kitchenSampleDishesRecord.setUpdateTime(DateUtils.getNowDate()); + kitchenSampleDishesRecord.setUpdateBy(SecurityUtils.getUsername()); try { return kitchenSampleDishesRecordMapper.updateKitchenSampleDishesRecord(kitchenSampleDishesRecord); } catch (Exception e) { 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 4c3f0b1..9daaa6b 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 @@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where record_id = #{recordId} - + insert into kitchen_sample_dishes_record record_id,