修改

1、修改长者点餐统计导出排序

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/ElderlyOrderFoodPageReqVO.java

@@ -20,9 +20,13 @@ public class ElderlyOrderFoodPageReqVO extends PageParam {
     @Schema(description = "长者id", example = "1")
     private Long elderId;
 
-    @Schema(description = "报餐日期")
+    @Schema(description = "报餐开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate orderFoodDate;
+    private LocalDate orderFoodStartDate;
+
+    @Schema(description = "报餐结束日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate orderFoodEndDate;
 
     @Schema(description = "机构id", example = "1")
     private Long tenantId;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyOrderFoodMapper.java

@@ -1,9 +1,6 @@
 package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.ElderOrderFoodExportExcelVO;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.ElderlyOrderFoodPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.ElderlyOrderFoodRespVO;
@@ -17,14 +14,6 @@ import java.util.List;
 @Mapper
 public interface ElderlyOrderFoodMapper extends BaseMapperX<ElderlyOrderFoodDO> {
 
-    default PageResult<ElderlyOrderFoodDO> selectPage(ElderlyOrderFoodPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyOrderFoodDO>()
-                .eqIfPresent(ElderlyOrderFoodDO::getElderId, reqVO.getElderId())
-                .eqIfPresent(ElderlyOrderFoodDO::getOrderFoodDate, reqVO.getOrderFoodDate())
-                .eqIfPresent(ElderlyOrderFoodDO::getTenantId, reqVO.getTenantId())
-                .orderByDesc(ElderlyOrderFoodDO::getId));
-    }
-
 
     List<ElderlyOrderFoodRespVO> selectPageWithDetail(IPage<ElderlyOrderFoodRespVO> page, @Param("reqVO") ElderlyOrderFoodPageReqVO reqVO);
     List<ElderOrderFoodExportExcelVO> getList(@Param("reqVO") ElderlyOrderFoodPageReqVO reqVO);

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyOrderFoodMapper.xml

@@ -28,8 +28,11 @@
         <if test="reqVO.floorName != null and  reqVO.floorName != ''">
             AND f.floor_name like concat('%',#{reqVO.floorName},'%')
         </if>
-        <if test="reqVO.orderFoodDate != null">
-            AND eof.order_food_date = #{reqVO.orderFoodDate}
+        <if test="reqVO.orderFoodStartDate != null">
+            AND eof.order_food_date &gt;= #{reqVO.orderFoodStartDate}
+        </if>
+        <if test="reqVO.orderFoodEndDate != null">
+            AND eof.order_food_date &lt;= #{reqVO.orderFoodEndDate}
         </if>
         ORDER BY eof.order_food_date DESC, eof.id DESC
     </select>
@@ -60,10 +63,13 @@
         <if test="reqVO.floorName != null and  reqVO.floorName != ''">
             AND f.floor_name like concat('%',#{reqVO.floorName},'%')
         </if>
-        <if test="reqVO.orderFoodDate != null">
-            AND eof.order_food_date = #{reqVO.orderFoodDate}
+        <if test="reqVO.orderFoodStartDate != null">
+            AND eof.order_food_date &gt;= #{reqVO.orderFoodStartDate}
+        </if>
+        <if test="reqVO.orderFoodEndDate != null">
+            AND eof.order_food_date &lt;= #{reqVO.orderFoodEndDate}
         </if>
-        ORDER BY b.build_name DESC, f.floor_name DESC, r.room_name DESC, eof.order_food_date DESC,eof.elder_id DESC
+        ORDER BY b.build_name DESC, f.floor_name DESC, r.room_name DESC, eof.elder_id DESC,eof.order_food_date DESC
     </select>
 
 </mapper>