From b4c1cfbc6e549a4831dfd58d195c67843c8709eb Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 18 Apr 2025 15:31:14 +0800
Subject: [PATCH] menu_dishes menu_dishes_base crby fix

---
 .../bonus/canteen/core/menu/dto/MenuDishesDTO.java   |  8 ++++----
 .../menu/service/impl/MenuDishesServiceImpl.java     | 12 +++++++-----
 .../main/resources/mapper/menu/MenuDishesMapper.xml  |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java
index 7647d66..d8ea1eb 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java
@@ -86,14 +86,14 @@ public class MenuDishesDTO {
 
     @TableField(value = "crby", fill = FieldFill.INSERT)
     @ApiModelProperty("创建人")
-    private String crby;
+    private String createBy;
     @ApiModelProperty("创建时间")
-    private LocalDateTime crtime;
+    private LocalDateTime createTime;
     @TableField(value = "upby", fill = FieldFill.UPDATE)
     @ApiModelProperty("更新人")
-    private String upby;
+    private String updateBy;
     @ApiModelProperty("更新时间")
-    private LocalDateTime uptime;
+    private LocalDateTime updateTime;
 
     @ApiModelProperty("功效")
     private Integer effectId;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
index d45322a..d5db3fb 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
@@ -135,7 +135,7 @@ public class MenuDishesServiceImpl implements IMenuDishesService {
         }
         Long dishesId = Id.next();
         Long baseDishesId = Id.next();
-        menuDishesDTO.setCrby(SecurityUtils.getUserId()+"");
+        menuDishesDTO.setCreateBy(SecurityUtils.getUsername());
         //添加基础主表信息
         menuDishesDTO.setBaseDishesId(baseDishesId+"");
         menuDishesDTO.setDishesId(dishesId+"");
@@ -197,17 +197,19 @@ public class MenuDishesServiceImpl implements IMenuDishesService {
     //首字母转小写
     public static String toLowerCaseFirstOne(String s)
     {
-        if(Character.isLowerCase(s.charAt(0)))
+        if(Character.isLowerCase(s.charAt(0))) {
             return s;
-        else
+        } else {
             return (new StringBuilder()).append(Character.toLowerCase(s.charAt(0))).append(s.substring(1)).toString();
+        }
     }
     //首字母转大写
     public static String toUpperCaseFirstOne(String s) {
-        if (Character.isUpperCase(s.charAt(0)))
+        if (Character.isUpperCase(s.charAt(0))) {
             return s;
-        else
+        } else {
             return (new StringBuilder()).append(Character.toUpperCase(s.charAt(0))).append(s.substring(1)).toString();
+        }
     }
 
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
index 7cc7794..1f93c3a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
@@ -371,12 +371,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="baseDishesId != null">base_dishes_id,</if>
             <if test="dishesName != null">dishes_name,</if>
-            <if test="crby != null">crby,</if>
+            <if test="createBy != null">create_by,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test=" baseDishesId!= null">#{baseDishesId},</if>
             <if test=" dishesName!= null">#{dishesName},</if>
-            <if test="crby != null">#{crby},</if>
+            <if test="createBy != null">#{createBy},</if>
         </trim>
     </insert>
 
@@ -401,7 +401,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="styleId != null">style_id,</if>
             <if test="cookId != null">cook_id,</if>
             <if test="classifyId != null">classify_id,</if>
-            <if test="crby != null">create_by,</if>
+            <if test="createBy != null">create_by,</if>
             <if test="customId != null">custom_id,</if>
 
         </trim>
@@ -424,7 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="styleId != null">#{styleId},</if>
             <if test="cookId != null">#{cookId},</if>
             <if test="classifyId != null">#{classifyId},</if>
-            <if test="crby != null">#{crby},</if>
+            <if test="createBy != null">#{createBy},</if>
             <if test="customId != null">#{customId},</if>
         </trim>
     </insert>