新增食谱图片

ruoyi-admin/src/main/java/com/ruoyi/web/controller/appointment/BomanReservatConfigTimeController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.appointment;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,18 +30,16 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/reservat/time")
-public class BomanReservatConfigTimeController extends BaseController
-{
+public class BomanReservatConfigTimeController extends BaseController {
     @Autowired
     private IBomanReservatConfigTimeService bomanReservatConfigTimeService;
 
-/**
- * 查询预约时段配置列表
- */
-@PreAuthorize("@ss.hasPermi('system:time:list')")
-@GetMapping("/list")
-    public TableDataInfo list(BomanReservatConfigTime bomanReservatConfigTime)
-    {
+    /**
+     * 查询预约时段配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:time:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BomanReservatConfigTime bomanReservatConfigTime) {
         startPage();
         List<BomanReservatConfigTime> list = bomanReservatConfigTimeService.selectBomanReservatConfigTimeList(bomanReservatConfigTime);
         return getDataTable(list);
@@ -52,8 +51,7 @@ public class BomanReservatConfigTimeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:time:export')")
     @Log(title = "预约时段配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BomanReservatConfigTime bomanReservatConfigTime)
-    {
+    public void export(HttpServletResponse response, BomanReservatConfigTime bomanReservatConfigTime) {
         List<BomanReservatConfigTime> list = bomanReservatConfigTimeService.selectBomanReservatConfigTimeList(bomanReservatConfigTime);
         ExcelUtil<BomanReservatConfigTime> util = new ExcelUtil<BomanReservatConfigTime>(BomanReservatConfigTime.class);
         util.exportExcel(response, list, "预约时段配置数据");
@@ -64,8 +62,7 @@ public class BomanReservatConfigTimeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:time:query')")
     @GetMapping(value = "/{reservatConfigTimeId}")
-    public AjaxResult getInfo(@PathVariable("reservatConfigTimeId") Long reservatConfigTimeId)
-    {
+    public AjaxResult getInfo(@PathVariable("reservatConfigTimeId") Long reservatConfigTimeId) {
         return success(bomanReservatConfigTimeService.selectBomanReservatConfigTimeByReservatConfigTimeId(reservatConfigTimeId));
     }
 
@@ -75,8 +72,7 @@ public class BomanReservatConfigTimeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:time:add')")
     @Log(title = "预约时段配置", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BomanReservatConfigTime bomanReservatConfigTime)
-    {
+    public AjaxResult add(@RequestBody BomanReservatConfigTime bomanReservatConfigTime) {
         return toAjax(bomanReservatConfigTimeService.insertBomanReservatConfigTime(bomanReservatConfigTime));
     }
 
@@ -86,8 +82,7 @@ public class BomanReservatConfigTimeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:time:edit')")
     @Log(title = "预约时段配置", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody BomanReservatConfigTime bomanReservatConfigTime)
-    {
+    public AjaxResult edit(@RequestBody BomanReservatConfigTime bomanReservatConfigTime) {
         return toAjax(bomanReservatConfigTimeService.updateBomanReservatConfigTime(bomanReservatConfigTime));
     }
 
@@ -97,8 +92,7 @@ public class BomanReservatConfigTimeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:time:remove')")
     @Log(title = "预约时段配置", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{reservatConfigTimeIds}")
-    public AjaxResult remove(@PathVariable Long[] reservatConfigTimeIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] reservatConfigTimeIds) {
         return toAjax(bomanReservatConfigTimeService.deleteBomanReservatConfigTimeByReservatConfigTimeIds(reservatConfigTimeIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/appointment/BomanReservatController.java

@@ -1,25 +1,19 @@
 package com.ruoyi.web.controller.appointment;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.BomanReservat;
 import com.ruoyi.system.service.IBomanReservatService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 预约Controller
@@ -74,7 +68,7 @@ public class BomanReservatController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:reservat:add')")
     @Log(title = "预约", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody BomanReservat bomanReservat)
     {
         return toAjax(bomanReservatService.insertBomanReservat(bomanReservat));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/meeting/RealTimeController.java

@@ -16,7 +16,6 @@ import com.ruoyi.system.service.IMeetingRecordsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileInputStream;

ruoyi-common/pom.xml

@@ -16,6 +16,7 @@
     </description>
 
     <dependencies>
+
         <!--讯飞语音识别需要的-->
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -23,10 +24,11 @@
             <version>5.7.21</version>
         </dependency>
         <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.9.0</version>
-    </dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -163,6 +165,7 @@
         </dependency>
 
 
+
     </dependencies>
 
 </project>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/system/app/new").permitAll()
-                .antMatchers("/real/time/getResult/**").permitAll()
+                .antMatchers("/real/time/getResult/**","/reservat/time/list","/system/dict/data/type/**","/system/reservat/add").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

ruoyi-system/src/main/java/com/ruoyi/system/domain/MenuFood.java

@@ -1,7 +1,5 @@
 package com.ruoyi.system.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -29,14 +27,17 @@ public class MenuFood extends BaseEntity
     /** 食谱早餐详情 */
     @Excel(name = "食谱早餐详情")
     private String menuFoodDetailBk;
+    private String menuFoodDetailBkPhoto;
 
     /** 食谱中餐详情 */
     @Excel(name = "食谱中餐详情")
     private String menuFoodDetailLu;
+    private String menuFoodDetailLuPhoto;
 
     /** 食谱晚餐详情 */
     @Excel(name = "食谱晚餐详情")
     private String menuFoodDetailDi;
+    private String menuFoodDetailDiPhoto;
 
     /** 食堂名称 */
     @Excel(name = "食堂名称")
@@ -53,7 +54,31 @@ public class MenuFood extends BaseEntity
     /** 创建部门 */
     private Long createDept;
 
-    public void setMenuFoodId(Long menuFoodId) 
+    public String getMenuFoodDetailBkPhoto() {
+        return menuFoodDetailBkPhoto;
+    }
+
+    public void setMenuFoodDetailBkPhoto(String menuFoodDetailBkPhoto) {
+        this.menuFoodDetailBkPhoto = menuFoodDetailBkPhoto;
+    }
+
+    public String getMenuFoodDetailLuPhoto() {
+        return menuFoodDetailLuPhoto;
+    }
+
+    public void setMenuFoodDetailLuPhoto(String menuFoodDetailLuPhoto) {
+        this.menuFoodDetailLuPhoto = menuFoodDetailLuPhoto;
+    }
+
+    public String getMenuFoodDetailDiPhoto() {
+        return menuFoodDetailDiPhoto;
+    }
+
+    public void setMenuFoodDetailDiPhoto(String menuFoodDetailDiPhoto) {
+        this.menuFoodDetailDiPhoto = menuFoodDetailDiPhoto;
+    }
+
+    public void setMenuFoodId(Long menuFoodId)
     {
         this.menuFoodId = menuFoodId;
     }
@@ -146,22 +171,20 @@ public class MenuFood extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("menuFoodId", getMenuFoodId())
-            .append("menuFoodTime", getMenuFoodTime())
-            .append("menuFoodType", getMenuFoodType())
-            .append("menuFoodDetailBk", getMenuFoodDetailBk())
-            .append("menuFoodDetailLu", getMenuFoodDetailLu())
-            .append("menuFoodDetailDi", getMenuFoodDetailDi())
-            .append("canteenName", getCanteenName())
-            .append("canteenId", getCanteenId())
-            .append("isUse", getIsUse())
-            .append("createDept", getCreateDept())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "MenuFood{" +
+                "menuFoodId=" + menuFoodId +
+                ", menuFoodTime='" + menuFoodTime + '\'' +
+                ", menuFoodType='" + menuFoodType + '\'' +
+                ", menuFoodDetailBk='" + menuFoodDetailBk + '\'' +
+                ", menuFoodDetailBkPhoto='" + menuFoodDetailBkPhoto + '\'' +
+                ", menuFoodDetailLu='" + menuFoodDetailLu + '\'' +
+                ", menuFoodDetailLuPhoto='" + menuFoodDetailLuPhoto + '\'' +
+                ", menuFoodDetailDi='" + menuFoodDetailDi + '\'' +
+                ", menuFoodDetailDiPhoto='" + menuFoodDetailDiPhoto + '\'' +
+                ", canteenName='" + canteenName + '\'' +
+                ", canteenId=" + canteenId +
+                ", isUse='" + isUse + '\'' +
+                ", createDept=" + createDept +
+                '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/MenuFoodRecord.java

@@ -3,8 +3,6 @@ package com.ruoyi.system.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 
@@ -32,14 +30,17 @@ public class MenuFoodRecord extends BaseEntity
     /** 食谱早餐详情 */
     @Excel(name = "食谱早餐详情")
     private String menuFoodDetailBk;
+    private String menuFoodDetailBkPhoto;
 
     /** 食谱中餐详情 */
     @Excel(name = "食谱中餐详情")
     private String menuFoodDetailLu;
+    private String menuFoodDetailLuPhoto;
 
     /** 食谱午餐详情 */
     @Excel(name = "食谱午餐详情")
     private String menuFoodDetailDi;
+    private String menuFoodDetailDiPhoto;
 
     /** 食堂名称 */
     @Excel(name = "食堂名称")
@@ -57,7 +58,31 @@ public class MenuFoodRecord extends BaseEntity
     /** 创建部门 */
     private Long createDept;
 
-    public void setMenuFoodRecordId(Long menuFoodRecordId) 
+    public String getMenuFoodDetailBkPhoto() {
+        return menuFoodDetailBkPhoto;
+    }
+
+    public void setMenuFoodDetailBkPhoto(String menuFoodDetailBkPhoto) {
+        this.menuFoodDetailBkPhoto = menuFoodDetailBkPhoto;
+    }
+
+    public String getMenuFoodDetailLuPhoto() {
+        return menuFoodDetailLuPhoto;
+    }
+
+    public void setMenuFoodDetailLuPhoto(String menuFoodDetailLuPhoto) {
+        this.menuFoodDetailLuPhoto = menuFoodDetailLuPhoto;
+    }
+
+    public String getMenuFoodDetailDiPhoto() {
+        return menuFoodDetailDiPhoto;
+    }
+
+    public void setMenuFoodDetailDiPhoto(String menuFoodDetailDiPhoto) {
+        this.menuFoodDetailDiPhoto = menuFoodDetailDiPhoto;
+    }
+
+    public void setMenuFoodRecordId(Long menuFoodRecordId)
     {
         this.menuFoodRecordId = menuFoodRecordId;
     }
@@ -150,22 +175,20 @@ public class MenuFoodRecord extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("menuFoodRecordId", getMenuFoodRecordId())
-            .append("menuFoodTime", getMenuFoodTime())
-            .append("menuFoodType", getMenuFoodType())
-            .append("menuFoodDetailBk", getMenuFoodDetailBk())
-            .append("menuFoodDetailLu", getMenuFoodDetailLu())
-            .append("menuFoodDetailDi", getMenuFoodDetailDi())
-            .append("canteenName", getCanteenName())
-            .append("canteenId", getCanteenId())
-            .append("recordTime", getRecordTime())
-            .append("createDept", getCreateDept())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "MenuFoodRecord{" +
+                "menuFoodRecordId=" + menuFoodRecordId +
+                ", menuFoodTime='" + menuFoodTime + '\'' +
+                ", menuFoodType='" + menuFoodType + '\'' +
+                ", menuFoodDetailBk='" + menuFoodDetailBk + '\'' +
+                ", menuFoodDetailBkPhoto='" + menuFoodDetailBkPhoto + '\'' +
+                ", menuFoodDetailLu='" + menuFoodDetailLu + '\'' +
+                ", menuFoodDetailLuPhoto='" + menuFoodDetailLuPhoto + '\'' +
+                ", menuFoodDetailDi='" + menuFoodDetailDi + '\'' +
+                ", menuFoodDetailDiPhoto='" + menuFoodDetailDiPhoto + '\'' +
+                ", canteenName='" + canteenName + '\'' +
+                ", canteenId=" + canteenId +
+                ", recordTime=" + recordTime +
+                ", createDept=" + createDept +
+                '}';
     }
 }

ruoyi-system/src/main/resources/mapper/system/MenuFoodMapper.xml

@@ -9,8 +9,11 @@
         <result property="menuFoodTime" column="menu_food_time"/>
         <result property="menuFoodType" column="menu_food_type"/>
         <result property="menuFoodDetailBk" column="menu_food_detail_bk"/>
+        <result property="menuFoodDetailBkPhoto" column="menu_food_detail_bk_photo"/>
         <result property="menuFoodDetailLu" column="menu_food_detail_lu"/>
+        <result property="menuFoodDetailLuPhoto" column="menu_food_detail_lu_photo"/>
         <result property="menuFoodDetailDi" column="menu_food_detail_di"/>
+        <result property="menuFoodDetailDiPhoto" column="menu_food_detail_di_photo"/>
         <result property="canteenName" column="canteen_name"/>
         <result property="canteenId" column="canteen_id"/>
         <result property="isUse" column="is_use"/>
@@ -27,8 +30,11 @@
                menu_food_time,
                menu_food_type,
                menu_food_detail_bk,
+               menu_food_detail_bk_photo,
                menu_food_detail_lu,
+               menu_food_detail_lu_photo,
                menu_food_detail_di,
+               menu_food_detail_di_photo,
                canteen_name,
                canteen_id,
                is_use,
@@ -75,8 +81,11 @@
             <if test="menuFoodTime != null">menu_food_time,</if>
             <if test="menuFoodType != null">menu_food_type,</if>
             <if test="menuFoodDetailBk != null">menu_food_detail_bk,</if>
+            <if test="menuFoodDetailBkPhoto != null">menu_food_detail_bk_photo,</if>
             <if test="menuFoodDetailLu != null">menu_food_detail_lu,</if>
+            <if test="menuFoodDetailLuPhoto != null">menu_food_detail_lu_photo,</if>
             <if test="menuFoodDetailDi != null">menu_food_detail_di,</if>
+            <if test="menuFoodDetailDiPhoto != null">menu_food_detail_di_photo,</if>
             <if test="canteenName != null">canteen_name,</if>
             <if test="canteenId != null">canteen_id,</if>
             <if test="isUse != null">is_use,</if>
@@ -91,8 +100,11 @@
             <if test="menuFoodTime != null">#{menuFoodTime},</if>
             <if test="menuFoodType != null">#{menuFoodType},</if>
             <if test="menuFoodDetailBk != null">#{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailBkPhoto != null">#{menuFoodDetailBkPhoto},</if>
             <if test="menuFoodDetailLu != null">#{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailLuPhoto != null">#{menuFoodDetailLuPhoto},</if>
             <if test="menuFoodDetailDi != null">#{menuFoodDetailDi},</if>
+            <if test="menuFoodDetailDiPhoto != null">#{menuFoodDetailDiPhoto},</if>
             <if test="canteenName != null">#{canteenName},</if>
             <if test="canteenId != null">#{canteenId},</if>
             <if test="isUse != null">#{isUse},</if>
@@ -106,10 +118,10 @@
     </insert>
 
     <insert id="batchMenuFoodVo">
-        insert into menu_food(menu_food_time, menu_food_detail_bk, menu_food_detail_lu, menu_food_detail_di, is_use,
+        insert into menu_food(menu_food_time, menu_food_detail_bk,menu_food_detail_bk_photo, menu_food_detail_lu,menu_food_detail_lu_photo, menu_food_detail_di, menu_food_detail_di_photo, is_use,
         create_time, remark) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.menuFoodTime},#{item.menuFoodDetailBk},#{item.menuFoodDetailLu},#{item.menuFoodDetailDi},#{item.isUse},sysdate(),#{item.remark})
+            (#{item.menuFoodTime},#{item.menuFoodDetailBk},#{item.menuFoodDetailBkPhoto},#{item.menuFoodDetailLu},#{item.menuFoodDetailLuPhoto},#{item.menuFoodDetailDi},#{item.menuFoodDetailDiPhoto},#{item.isUse},sysdate(),#{item.remark})
         </foreach>
     </insert>
     <update id="updateMenuFood" parameterType="MenuFood">
@@ -118,8 +130,11 @@
             <if test="menuFoodTime != null">menu_food_time = #{menuFoodTime},</if>
             <if test="menuFoodType != null">menu_food_type = #{menuFoodType},</if>
             <if test="menuFoodDetailBk != null">menu_food_detail_bk = #{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailBkPhoto != null">menu_food_detail_bk_photo = #{menuFoodDetailBkPhoto},</if>
             <if test="menuFoodDetailLu != null">menu_food_detail_lu = #{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailLuPhoto != null">menu_food_detail_lu_photo = #{menuFoodDetailLuPhoto},</if>
             <if test="menuFoodDetailDi != null">menu_food_detail_di = #{menuFoodDetailDi},</if>
+            <if test="menuFoodDetailDiPhoto != null">menu_food_detail_di_photo = #{menuFoodDetailDiPhoto},</if>
             <if test="canteenName != null">canteen_name = #{canteenName},</if>
             <if test="canteenId != null">canteen_id = #{canteenId},</if>
             <if test="isUse != null">is_use = #{isUse},</if>

ruoyi-system/src/main/resources/mapper/system/MenuFoodRecordMapper.xml

@@ -8,9 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="menuFoodRecordId"    column="menu_food_record_id"    />
         <result property="menuFoodTime"    column="menu_food_time"    />
         <result property="menuFoodType"    column="menu_food_type"    />
-        <result property="menuFoodDetailBk"    column="menu_food_detail_bk"    />
-        <result property="menuFoodDetailLu"    column="menu_food_detail_lu"    />
-        <result property="menuFoodDetailDi"    column="menu_food_detail_di"    />
+        <result property="menuFoodDetailBk" column="menu_food_detail_bk"/>
+        <result property="menuFoodDetailBkPhoto" column="menu_food_detail_bk_photo"/>
+        <result property="menuFoodDetailLu" column="menu_food_detail_lu"/>
+        <result property="menuFoodDetailLuPhoto" column="menu_food_detail_lu_photo"/>
+        <result property="menuFoodDetailDi" column="menu_food_detail_di"/>
+        <result property="menuFoodDetailDiPhoto" column="menu_food_detail_di_photo"/>
         <result property="canteenName"    column="canteen_name"    />
         <result property="canteenId"    column="canteen_id"    />
         <result property="recordTime"    column="record_time"    />
@@ -23,7 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMenuFoodRecordVo">
-        select menu_food_record_id, menu_food_time, menu_food_type, menu_food_detail_bk, menu_food_detail_lu, menu_food_detail_di, canteen_name, canteen_id, record_time, create_dept, create_by, create_time, update_by, update_time, remark from menu_food_record
+        select menu_food_record_id, menu_food_time, menu_food_type,
+               menu_food_detail_bk,
+               menu_food_detail_bk_photo,
+               menu_food_detail_lu,
+               menu_food_detail_lu_photo,
+               menu_food_detail_di,
+               menu_food_detail_di_photo, canteen_name, canteen_id, record_time, create_dept, create_by, create_time, update_by, update_time, remark from menu_food_record
     </sql>
 
     <select id="selectMenuFoodRecordList" parameterType="MenuFoodRecord" resultMap="MenuFoodRecordResult">
@@ -52,8 +61,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="menuFoodTime != null">menu_food_time,</if>
             <if test="menuFoodType != null">menu_food_type,</if>
             <if test="menuFoodDetailBk != null">menu_food_detail_bk,</if>
+            <if test="menuFoodDetailBkPhoto != null">menu_food_detail_bk_photo,</if>
             <if test="menuFoodDetailLu != null">menu_food_detail_lu,</if>
+            <if test="menuFoodDetailLuPhoto != null">menu_food_detail_lu_photo,</if>
             <if test="menuFoodDetailDi != null">menu_food_detail_di,</if>
+            <if test="menuFoodDetailDiPhoto != null">menu_food_detail_di_photo,</if>
             <if test="canteenName != null">canteen_name,</if>
             <if test="canteenId != null">canteen_id,</if>
             <if test="recordTime != null">record_time,</if>
@@ -68,8 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="menuFoodTime != null">#{menuFoodTime},</if>
             <if test="menuFoodType != null">#{menuFoodType},</if>
             <if test="menuFoodDetailBk != null">#{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailBkPhoto != null">#{menuFoodDetailBkPhoto},</if>
             <if test="menuFoodDetailLu != null">#{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailLuPhoto != null">#{menuFoodDetailLuPhoto},</if>
             <if test="menuFoodDetailDi != null">#{menuFoodDetailDi},</if>
+            <if test="menuFoodDetailDiPhoto != null">#{menuFoodDetailDiPhoto},</if>
             <if test="canteenName != null">#{canteenName},</if>
             <if test="canteenId != null">#{canteenId},</if>
             <if test="recordTime != null">#{recordTime},</if>
@@ -88,8 +103,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="menuFoodTime != null">menu_food_time = #{menuFoodTime},</if>
             <if test="menuFoodType != null">menu_food_type = #{menuFoodType},</if>
             <if test="menuFoodDetailBk != null">menu_food_detail_bk = #{menuFoodDetailBk},</if>
+            <if test="menuFoodDetailBkPhoto != null">menu_food_detail_bk_photo = #{menuFoodDetailBkPhoto},</if>
             <if test="menuFoodDetailLu != null">menu_food_detail_lu = #{menuFoodDetailLu},</if>
+            <if test="menuFoodDetailLuPhoto != null">menu_food_detail_lu_photo = #{menuFoodDetailLuPhoto},</if>
             <if test="menuFoodDetailDi != null">menu_food_detail_di = #{menuFoodDetailDi},</if>
+            <if test="menuFoodDetailDiPhoto != null">menu_food_detail_di_photo = #{menuFoodDetailDiPhoto},</if>
             <if test="canteenName != null">canteen_name = #{canteenName},</if>
             <if test="canteenId != null">canteen_id = #{canteenId},</if>
             <if test="recordTime != null">record_time = #{recordTime},</if>