1.修改批量退房是 更新endTIme为操作时间

2.修改学员自助报到查询学员班级信息是增加delflag条件

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/payment/PtUserAccountMapper.xml

@@ -96,7 +96,7 @@
         INNER JOIN t_user_dept a on a.user_id=tpuA.user_id and a.main_dept='Y'
         INNER JOIN t_sys_dept tsd on tsd.dept_id=a.dept_id
         <where>
-            and tpuA.del_flag='0'
+            and tpuA.del_flag='0' and tsd.del_flag='0'
             <if test="bo.category!=null and bo.category!=''">
                 and tpuA.category=#{bo.category}
             </if>

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfOrderServiceImpl.java

@@ -416,6 +416,7 @@ public class KfOrderServiceImpl implements IKfOrderService {
                 kfOrder.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_QX);
             } else {
                 kfOrder.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_TF);
+                kfOrder.setEndTime(DateUtil.date());
             }
             convert.add(kfOrder);
         });

ruoyi-modules/ruoyi-hotel/src/main/resources/mapper/hotel/business/KfOrderMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.orderType != null and bo.orderType != ''">
                 and o.order_type = #{bo.orderType}
             </if>
-        order by o.order_index asc, o.create_time desc
+        order by  o.update_time desc
         </where>
     </select>