Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfGuestTeamRController.java

@@ -66,6 +66,17 @@ public class KfGuestTeamRController extends BaseController {
         ExcelUtil.exportExcel(list, "客人客团关系", KfGuestTeamRVo.class, response);
     }
 
+    /**
+     * 导出客人客团关系列表
+     */
+    @SaCheckPermission("basics:kfGuestTeam:export")
+    @Log(title = "团客人员列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportTeamGuest")
+    public void exportTeamGuest(@RequestParam Long teamId, HttpServletResponse response) {
+        List<KfGuestVo> list = kfGuestTeamRService.listGuests(teamId, null);
+        ExcelUtil.exportExcel(list, "团客人员信息", KfGuestVo.class, response);
+    }
+
     /**
      * 获取客人客团关系详细信息
      *

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfOrderController.java

@@ -66,14 +66,16 @@ public class KfOrderController extends BaseController {
         return R.ok(kfOrderService.queryTeamGuest(teamId, guestName));
     }
     /**
-     * 导出散客入住列表
+     * 导出订单
      */
     @SaCheckPermission("business:guestOrder:export")
     @Log(title = "散客入住", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(KfOrderBo bo, HttpServletResponse response) {
-        List<KfOrderVo> list = kfOrderService.queryList(bo);
-        ExcelUtil.exportExcel(list, "散客入住", KfOrderVo.class, response);
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setPageSize(999);
+        List<KfOrderVo> list = kfOrderService.queryPageList(bo, pageQuery).getRows();
+        ExcelUtil.exportExcel(list, "入住订单", KfOrderVo.class, response);
     }
 
     /**

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/vo/KfGuestVo.java

@@ -84,6 +84,6 @@ public class KfGuestVo implements Serializable {
     /**
      * 数据来源
      */
-    @ExcelProperty(value = "数据来源", converter = ExcelDictConvert.class)
+//    @ExcelProperty(value = "数据来源", converter = ExcelDictConvert.class)
     private String dataSource;
 }

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/vo/KfOrderVo.java

@@ -44,7 +44,8 @@ public class KfOrderVo implements Serializable {
     private String phone;
     @ExcelProperty(value = "身份证号")
     private String idCard;
-    @ExcelProperty(value = "性别")
+    @ExcelProperty(value = "性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
     private String sex;
     /**
      * 客团名称

ruoyi-modules/ruoyi-hotel/src/main/resources/mapper/hotel/basics/KfGuestTeamRMapper.xml

@@ -19,7 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectGuests" resultType="org.dromara.hotel.domain.vo.KfGuestVo">
-        select r.id, g.name, g.sex, g.id_card as idCard, g.phone from t_kf_guest_team_r r
+        select r.id, g.name, g.sex, g.id_card as idCard, g.phone, g.remark, g.create_time, g.create_by,g.data_source
+        from t_kf_guest_team_r r
             left join t_kf_guest g on r.guest_id = g.id
         <where>
             r.del_flag = 0