Explorar el Código

修改
1、查房记录列表按照查房时间排序
2、服务工单增加按照长者姓名过滤

liangwenxuan hace 2 meses
padre
commit
78c56263f4

+ 3 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyorder/ElderlyServiceOrderPageReqVO.java

@@ -18,6 +18,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class ElderlyServiceOrderPageReqVO extends PageParam {
 
+    @Schema(description = "长者姓名")
+    private String elderName;
+
     @Schema(description = "服务人员姓名")
     private String serviceName;
 

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/WardRoundRecordMapper.java

@@ -29,7 +29,7 @@ public interface WardRoundRecordMapper extends BaseMapperX<WardRoundRecordDO> {
                 .likeIfPresent(WardRoundRecordDO::getElderName, reqVO.getElderName())
                 .geIfPresent(WardRoundRecordDO::getRoundTime, reqVO.getRoundTime() != null && reqVO.getRoundTime().length >= 1 ? reqVO.getRoundTime()[0].atStartOfDay() : null)
                 .leIfPresent(WardRoundRecordDO::getRoundTime, reqVO.getRoundTime() != null &&reqVO.getRoundTime().length == 2 ? reqVO.getRoundTime()[1].atTime(LocalTime.MAX) : null)
-                .orderByDesc(WardRoundRecordDO::getId));
+                .orderByDesc(WardRoundRecordDO::getRoundTime));
     }
 
 }

+ 3 - 0
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyServiceOrderMapper.xml

@@ -24,6 +24,9 @@
             <if test="pageVO.serviceName != null and pageVO.serviceName != ''">
                 AND eso.service_name LIKE CONCAT('%', #{pageVO.serviceName}, '%')
             </if>
+            <if test="pageVO.elderName != null and pageVO.elderName != ''">
+                AND eso.elder_name LIKE CONCAT('%', #{pageVO.elderName}, '%')
+            </if>
             <if test="pageVO.orderStatus != null">
                 AND eso.order_status = #{pageVO.orderStatus}
             </if>