修改

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java

@@ -24,15 +24,15 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * 包厢
+ * 包厢信息
  *
  * @author zjf
- * @date 2024-12-16 13:05:37
+ * @date 2024-12-16 21:13:58
  */
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/boxesInfo" )
-@Tag(description = "boxesInfo" , name = "包厢管理" )
+@Tag(description = "boxesInfo" , name = "包厢信息管理" )
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class BoxesInfoController {
 
@@ -41,7 +41,7 @@ public class BoxesInfoController {
     /**
      * 分页查询
      * @param page 分页对象
-     * @param boxesInfo 包厢
+     * @param boxesInfo 包厢信息
      * @return
      */
     @Operation(summary = "分页查询" , description = "分页查询" )
@@ -55,7 +55,7 @@ public class BoxesInfoController {
 
 
     /**
-     * 通过id查询包厢
+     * 通过id查询包厢信息
      * @param id id
      * @return R
      */
@@ -67,12 +67,12 @@ public class BoxesInfoController {
     }
 
     /**
-     * 新增包厢
-     * @param boxesInfo 包厢
+     * 新增包厢信息
+     * @param boxesInfo 包厢信息
      * @return R
      */
-    @Operation(summary = "新增包厢" , description = "新增包厢" )
-    @SysLog("新增包厢" )
+    @Operation(summary = "新增包厢信息" , description = "新增包厢信息" )
+    @SysLog("新增包厢信息" )
     @PostMapping
     @PreAuthorize("@pms.hasPermission('canteen_boxesInfo_add')" )
     public R save(@RequestBody BoxesInfoEntity boxesInfo) {
@@ -80,12 +80,12 @@ public class BoxesInfoController {
     }
 
     /**
-     * 修改包厢
-     * @param boxesInfo 包厢
+     * 修改包厢信息
+     * @param boxesInfo 包厢信息
      * @return R
      */
-    @Operation(summary = "修改包厢" , description = "修改包厢" )
-    @SysLog("修改包厢" )
+    @Operation(summary = "修改包厢信息" , description = "修改包厢信息" )
+    @SysLog("修改包厢信息" )
     @PutMapping
     @PreAuthorize("@pms.hasPermission('canteen_boxesInfo_edit')" )
     public R updateById(@RequestBody BoxesInfoEntity boxesInfo) {
@@ -93,12 +93,12 @@ public class BoxesInfoController {
     }
 
     /**
-     * 通过id删除包厢
+     * 通过id删除包厢信息
      * @param ids id列表
      * @return R
      */
-    @Operation(summary = "通过id删除包厢" , description = "通过id删除包厢" )
-    @SysLog("通过id删除包厢" )
+    @Operation(summary = "通过id删除包厢信息" , description = "通过id删除包厢信息" )
+    @SysLog("通过id删除包厢信息" )
     @DeleteMapping
     @PreAuthorize("@pms.hasPermission('canteen_boxesInfo_del')" )
     public R removeById(@RequestBody Long[] ids) {

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java

@@ -15,6 +15,7 @@ import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
 import com.bsd.pjcloud.canteen.service.CanteenDailyMenuService;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -82,6 +83,7 @@ public class CanteenDailyMenuController {
     @PostMapping
     @PreAuthorize("@pms.hasPermission('canteen_canteenDailyMenu_add')" )
     public R save(@RequestBody CanteenDailyMenuEntity canteenDailyMenu) {
+        canteenDailyMenu.setDeptId(SecurityUtils.getUser().getDeptId());
         canteenDailyMenuService.saveToday(canteenDailyMenu);
         return R.ok();
     }

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java

@@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode;
 import java.time.LocalDateTime;
 
 /**
- * 包厢
+ * 包厢信息
  *
  * @author zjf
- * @date 2024-12-16 13:05:37
+ * @date 2024-12-16 21:13:58
  */
 @Data
 @TableName("boxes_info")
 @EqualsAndHashCode(callSuper = true)
-@Schema(description = "包厢")
+@Schema(description = "包厢信息")
 public class BoxesInfoEntity extends Model<BoxesInfoEntity> {
 
 

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesInfoServiceImpl.java

@@ -6,10 +6,10 @@ import com.bsd.pjcloud.canteen.mapper.BoxesInfoMapper;
 import com.bsd.pjcloud.canteen.service.BoxesInfoService;
 import org.springframework.stereotype.Service;
 /**
- * 包厢
+ * 包厢信息
  *
  * @author zjf
- * @date 2024-12-16 13:05:37
+ * @date 2024-12-16 21:13:58
  */
 @Service
 public class BoxesInfoServiceImpl extends ServiceImpl<BoxesInfoMapper, BoxesInfoEntity> implements BoxesInfoService {

pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml

@@ -29,7 +29,9 @@
         on t.spu_id=sp.id
         <where>
           AND t.merchant_id = #{merchantId}
-          AND sp.category_id = #{categoryId}
+               <if test="categoryId != null">
+                   AND sp.category_id = #{categoryId}
+               </if>
           AND sp.del_flag = 0
           AND t.start_time = #{time}
           And t.del_flag = 0