update

src/main/java/com/zhiqiyun/open/core/mapper/statistics/TravelHotelAuditMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.statistics.TravelHotelAudit;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TravelHotelAuditMapper extends BaseMapper<TravelHotelAudit> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/statistics/TravelReportMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.statistics.TravelReport;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TravelReportMapper extends BaseMapper<TravelReport> {
+}

src/main/java/com/zhiqiyun/open/core/models/BaseEntity.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2018 .
+ * <p>
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.zhiqiyun.open.core.models;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 基础实体类，所有实体都需要继承
+ *
+ * @author yangxin 450160147@qq.com
+ * @since 1.0.0 2019-10-18
+ */
+@Data
+public abstract class BaseEntity implements Serializable {
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creator;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+
+    /**
+     * 是否删除 0 否 1 是
+     */
+    private Integer isDeleted;
+}

src/main/java/com/zhiqiyun/open/core/models/statistics/TravelHotelAudit.java

@@ -0,0 +1,92 @@
+package com.zhiqiyun.open.core.models.statistics;
+
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("travel_hotel_audit")
+public class TravelHotelAudit {
+
+	private static final long serialVersionUID = 7561908588808119436L;
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	private Long authId;
+
+	/**
+	 * 旅行社团报信息ID
+	 */
+	private Long solicitId;
+
+	/**
+	 * 旅行社ID
+	 */
+	private Long travelId;
+
+	/**
+	 * 出行团号（团队号）
+	 */
+	private String tourCode;
+
+	/**
+	 * 创建日期
+	 */
+	private Long hotelId;
+
+	/**
+	 * 人数
+	 */
+	private Integer peopleNum;
+
+	/**
+	 * 到达日期
+	 */
+	private Date arrivalDate;
+
+
+	/**
+	 * 入住天数
+	 */
+	private Integer stayDays;
+
+	/**
+	 * 审核状态 -1 撤销 0 待复核 1 复核通过 2 复核驳回
+	 */
+	private Integer auditState;
+
+	/**
+	 * 备注
+	 */
+	private String remarks;
+
+	/**
+	 * 完成日期（ 申报通过 或者 撤销申报的日期 ）
+	 */
+	private Date completeDate;
+
+	/**
+	 * 票据等文件（图片）
+	 */
+	private String file;
+
+	/**
+	 * 创建者
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Long creator;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	private Integer isDeleted;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createDate;
+}

src/main/java/com/zhiqiyun/open/core/models/statistics/TravelReport.java

@@ -0,0 +1,93 @@
+package com.zhiqiyun.open.core.models.statistics;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("travel_report")
+public class TravelReport {
+
+	private static final long serialVersionUID = 1179648543558811065L;
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	private Long authId;
+
+	/**
+	 * 旅行社ID
+	 */
+	private Long travelId;
+
+	/**
+	 * 领队姓名
+	 */
+	private String leaderName;
+
+	/**
+	 * 出行团号（团队号）
+	 */
+	private String tourCode;
+
+	/**
+	 * 带团起始时间
+	 */
+	private Date startDate;
+
+	/**
+	 * 带团截止时间
+	 */
+	private Date endDate;
+
+	/**
+	 * 旅游社团人数
+	 */
+	private Integer touristNum;
+
+	/**
+	 * 相关证件号
+	 */
+	private String credentialNo;
+
+	/**
+	 * 相关证件资料
+	 */
+	private String credentialPic;
+
+	/**
+	 * 备注
+	 */
+	private String note;
+
+	/**
+	 * 申报进度 -1 撤销申请 0 景区,酒店复核 1 旅游局复核 2 申报通过 3 申报驳回
+	 */
+	private Integer reportProgress;
+
+	/**
+	 * 完成日期（ 申报通过 或者 撤销申报的日期 ）
+	 */
+	private Date completeDate;
+
+	/**
+	 * 创建者
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Long creator;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	private Integer isDeleted;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createDate;
+
+}

src/main/java/com/zhiqiyun/open/core/service/TravelHotelAuditService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.statistics.TravelHotelAudit;
+
+public interface TravelHotelAuditService extends IService<TravelHotelAudit> {
+}

src/main/java/com/zhiqiyun/open/core/service/TravelReportService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.statistics.TravelReport;
+
+public interface TravelReportService extends IService<TravelReport> {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/TravelHotelAuditServiceImpl.java

@@ -0,0 +1,14 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.statistics.TravelHotelAuditMapper;
+import com.zhiqiyun.open.core.mapper.statistics.TravelReportMapper;
+import com.zhiqiyun.open.core.models.statistics.TravelHotelAudit;
+import com.zhiqiyun.open.core.models.statistics.TravelReport;
+import com.zhiqiyun.open.core.service.TravelHotelAuditService;
+import com.zhiqiyun.open.core.service.TravelReportService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TravelHotelAuditServiceImpl extends ServiceImpl<TravelHotelAuditMapper, TravelHotelAudit> implements TravelHotelAuditService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/TravelReportServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.statistics.TravelReportMapper;
+import com.zhiqiyun.open.core.models.statistics.TravelReport;
+import com.zhiqiyun.open.core.service.TravelReportService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TravelReportServiceImpl extends ServiceImpl<TravelReportMapper, TravelReport> implements TravelReportService {
+}

src/main/java/com/zhiqiyun/open/router/apis/ComplaintApi.java

@@ -6,7 +6,7 @@ import com.dliyun.oap.framework.response.OapResponse;
 import com.zhiqiyun.open.core.models.statistics.ComplaintInfo;
 import com.zhiqiyun.open.core.service.ComplaintInfoService;
 import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.router.request.SaveComplaintInfoRequest;
+import com.zhiqiyun.open.router.request.statistics.SaveComplaintInfoRequest;
 import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zhiqiyun/open/router/apis/TravelHotelAuditApi.java

@@ -0,0 +1,72 @@
+package com.zhiqiyun.open.router.apis;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dliyun.oap.framework.annotation.ServiceMethod;
+import com.dliyun.oap.framework.annotation.ServiceMethodBean;
+import com.dliyun.oap.framework.response.OapResponse;
+import com.zhiqiyun.open.core.models.statistics.TravelHotelAudit;
+import com.zhiqiyun.open.core.models.statistics.TravelReport;
+import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.core.service.TravelHotelAuditService;
+import com.zhiqiyun.open.core.service.TravelReportService;
+import com.zhiqiyun.open.router.request.sentiment.IdsRequest;
+import com.zhiqiyun.open.router.request.statistics.*;
+import com.zhiqiyun.open.utils.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Slf4j
+@ServiceMethodBean
+public class TravelHotelAuditApi {
+
+	@Autowired
+	private TravelHotelAuditService travelHotelAuditService;
+
+	@Autowired
+	private SequenceService sequenceService;
+
+	@ServiceMethod(method = "travel.hotel.audit.findPage", title = "查询酒店申报记录")
+	public OapResponse findPage(QueryTravelReportRequest request) {
+		QueryWrapper<TravelHotelAudit> wrapper = new QueryWrapper<>();
+
+		Page<TravelHotelAudit> page = new Page<>(request.getCurrent(), request.getPageSize());
+		page.addOrder(OrderItem.desc("id"));
+
+		Page<TravelHotelAudit> resultData = this.travelHotelAuditService.page(page, wrapper);
+
+		return OapResponse.success().setBody(resultData);
+	}
+
+	@ServiceMethod(method = "travel.hotel.audit.add", title = "新建酒店申报")
+	public OapResponse save(SaveTravelHotelAuditRequest request) {
+
+		TravelHotelAudit entity = new TravelHotelAudit();
+		BeanUtils.copyProperties(request, entity);
+
+		entity.setCreateDate(DateUtil.current());
+		entity.setId(this.sequenceService.nextId());
+
+		this.travelHotelAuditService.save(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
+
+	@ServiceMethod(method = "travel.hotel.audit.updateById", title = "更新酒店申报")
+	public OapResponse updateById(UpdateTravelHotelAuditRequest request) {
+		TravelHotelAudit entity = new TravelHotelAudit();
+		BeanUtils.copyProperties(request, entity);
+
+		this.travelHotelAuditService.updateById(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
+
+	@ServiceMethod(method = "travel.hotel.audit.deleteByIds", title = "删除酒店申报")
+	public OapResponse deleteByIds(IdsRequest request) {
+		this.travelHotelAuditService.removeByIds(request.getIds());
+		return OapResponse.success();
+	}
+}

src/main/java/com/zhiqiyun/open/router/apis/TravelReportApi.java

@@ -0,0 +1,72 @@
+package com.zhiqiyun.open.router.apis;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dliyun.oap.framework.annotation.ServiceMethod;
+import com.dliyun.oap.framework.annotation.ServiceMethodBean;
+import com.dliyun.oap.framework.response.OapResponse;
+import com.zhiqiyun.open.core.models.statistics.TravelReport;
+import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.core.service.TravelReportService;
+import com.zhiqiyun.open.router.request.sentiment.IdsRequest;
+import com.zhiqiyun.open.router.request.statistics.QueryTravelReportRequest;
+import com.zhiqiyun.open.router.request.statistics.SaveTravelReportRequest;
+import com.zhiqiyun.open.router.request.statistics.UpdateTravelReportRequest;
+import com.zhiqiyun.open.utils.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Slf4j
+@ServiceMethodBean
+public class TravelReportApi {
+
+	@Autowired
+	private TravelReportService travelReportService;
+
+	@Autowired
+	private SequenceService sequenceService;
+
+	@ServiceMethod(method = "travel.report.findPage", title = "查询招徕奖励申报")
+	public OapResponse findPage(QueryTravelReportRequest request) {
+		QueryWrapper<TravelReport> wrapper = new QueryWrapper<>();
+
+		Page<TravelReport> page = new Page<>(request.getCurrent(), request.getPageSize());
+		page.addOrder(OrderItem.desc("id"));
+
+		Page<TravelReport> resultData = this.travelReportService.page(page, wrapper);
+
+		return OapResponse.success().setBody(resultData);
+	}
+
+	@ServiceMethod(method = "travel.report.add", title = "新建招徕奖励申报")
+	public OapResponse save(SaveTravelReportRequest request) {
+
+		TravelReport entity = new TravelReport();
+		BeanUtils.copyProperties(request, entity);
+
+		entity.setCreateDate(DateUtil.current());
+		entity.setId(this.sequenceService.nextId());
+
+		this.travelReportService.save(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
+
+	@ServiceMethod(method = "travel.report.updateById", title = "更新招徕奖励申报")
+	public OapResponse updateById(UpdateTravelReportRequest request) {
+		TravelReport entity = new TravelReport();
+		BeanUtils.copyProperties(request, entity);
+
+		this.travelReportService.updateById(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
+
+	@ServiceMethod(method = "travel.report.deleteByIds", title = "删除招徕奖励申报")
+	public OapResponse deleteByIds(IdsRequest request) {
+		this.travelReportService.removeByIds(request.getIds());
+		return OapResponse.success();
+	}
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/QueryTravelReportRequest.java

@@ -0,0 +1,22 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class QueryTravelReportRequest extends AbstractOapRequest {
+
+	@NotNull
+	@ServiceParamField(describe = "页数")
+	private Integer current = 1;
+
+	@NotNull
+	@ServiceParamField(describe = "每页条数")
+	private Integer pageSize = 10;
+
+}

src/main/java/com/zhiqiyun/open/router/request/SaveComplaintInfoRequest.java → src/main/java/com/zhiqiyun/open/router/request/statistics/SaveComplaintInfoRequest.java

@@ -1,16 +1,12 @@
-package com.zhiqiyun.open.router.request;
+package com.zhiqiyun.open.router.request.statistics;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.dliyun.oap.framework.annotation.ServiceParamField;
 import com.dliyun.oap.framework.request.AbstractOapRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
-import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data

src/main/java/com/zhiqiyun/open/router/request/statistics/SaveTravelHotelAuditRequest.java

@@ -0,0 +1,96 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SaveTravelHotelAuditRequest extends AbstractOapRequest {
+
+	@ServiceParamField(describe = "认证ID")
+	private Long authId;
+
+	/**
+	 * 旅行社团报信息ID
+	 */
+	@ServiceParamField(describe = "旅行社团报信息ID")
+	private Long solicitId;
+
+	/**
+	 * 旅行社ID
+	 */
+	@ServiceParamField(describe = "旅行社ID")
+	private Long travelId;
+
+	/**
+	 * 出行团号（团队号）
+	 */
+	@ServiceParamField(describe = "出行团号（团队号）")
+	private String tourCode;
+
+	/**
+	 * 酒店ID
+	 */
+	@ServiceParamField(describe = "酒店ID")
+	private Long hotelId;
+
+	/**
+	 * 人数
+	 */
+	@ServiceParamField(describe = "人数")
+	private Integer peopleNum;
+
+	/**
+	 * 到达日期
+	 */
+	@ServiceParamField(describe = "到达日期")
+	private Date arrivalDate;
+
+
+	/**
+	 * 入住天数
+	 */
+	@ServiceParamField(describe = "入住天数")
+	private Integer stayDays;
+
+	/**
+	 * 审核状态 -1 撤销 0 待复核 1 复核通过 2 复核驳回
+	 */
+	@ServiceParamField(describe = "审核状态 -1 撤销 0 待复核 1 复核通过 2 复核驳回")
+	private Integer auditState;
+
+	/**
+	 * 备注
+	 */
+	@ServiceParamField(describe = "备注")
+	private String remarks;
+
+	/**
+	 * 完成日期（ 申报通过 或者 撤销申报的日期 ）
+	 */
+	@ServiceParamField(describe = "完成日期（ 申报通过 或者 撤销申报的日期 ）")
+	private Date completeDate;
+
+	/**
+	 * 票据等文件（图片）
+	 */
+	@ServiceParamField(describe = "票据等文件（图片）")
+	private String file;
+
+	/**
+	 * 创建者
+	 */
+	@ServiceParamField(describe = "创建者")
+	private Long creator;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	@ServiceParamField(describe = "是否删除 0 否 1 是")
+	private Integer isDeleted;
+
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/SaveTravelReportRequest.java

@@ -0,0 +1,94 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SaveTravelReportRequest extends AbstractOapRequest {
+
+	@ServiceParamField(describe = "认证ID")
+	private Long authId;
+
+	/**
+	 * 旅行社ID
+	 */
+	@ServiceParamField(describe = "旅行社ID")
+	private Long travelId;
+
+	/**
+	 * 领队姓名
+	 */
+	@ServiceParamField(describe = "领队姓名")
+	private String leaderName;
+
+	/**
+	 * 出行团号（团队号）
+	 */
+	@ServiceParamField(describe = "出行团号（团队号）")
+	private String tourCode;
+
+	/**
+	 * 带团起始时间
+	 */
+	@ServiceParamField(describe = "带团起始时间")
+	private Date startDate;
+
+	/**
+	 * 带团截止时间
+	 */
+	@ServiceParamField(describe = "带团截止时间")
+	private Date endDate;
+
+	/**
+	 * 旅游社团人数
+	 */
+	@ServiceParamField(describe = "旅游社团人数")
+	private Integer touristNum;
+
+	/**
+	 * 相关证件号
+	 */
+	@ServiceParamField(describe = "相关证件号")
+	private String credentialNo;
+
+	/**
+	 * 相关证件资料
+	 */
+	@ServiceParamField(describe = "相关证件资料")
+	private String credentialPic;
+
+	/**
+	 * 备注
+	 */
+	@ServiceParamField(describe = "备注")
+	private String note;
+
+	/**
+	 * 申报进度 -1 撤销申请 0 景区,酒店复核 1 旅游局复核 2 申报通过 3 申报驳回
+	 */
+	@ServiceParamField(describe = "申报进度 -1 撤销申请 0 景区,酒店复核 1 旅游局复核 2 申报通过 3 申报驳回")
+	private Integer reportProgress;
+
+	/**
+	 * 完成日期（ 申报通过 或者 撤销申报的日期 ）
+	 */
+	@ServiceParamField(describe = "完成日期（ 申报通过 或者 撤销申报的日期 ）")
+	private Date completeDate;
+
+	/**
+	 * 创建者
+	 */
+	@ServiceParamField(describe = "创建者")
+	private Long creator;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	@ServiceParamField(describe = "是否删除 0 否 1 是")
+	private Integer isDeleted;
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/UpdateTravelHotelAuditRequest.java

@@ -0,0 +1,94 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class UpdateTravelHotelAuditRequest extends AbstractOapRequest {
+
+	@ServiceParamField(describe = "ID")
+	private Long id;
+
+	@ServiceParamField(describe = "认证ID")
+	private Long authId;
+
+	/**
+	 * 旅行社团报信息ID
+	 */
+	@ServiceParamField(describe = "旅行社团报信息ID")
+	private Long solicitId;
+
+	/**
+	 * 旅行社ID
+	 */
+	@ServiceParamField(describe = "旅行社ID")
+	private Long travelId;
+
+	/**
+	 * 出行团号（团队号）
+	 */
+	@ServiceParamField(describe = "出行团号（团队号）")
+	private String tourCode;
+
+	/**
+	 * 酒店ID
+	 */
+	@ServiceParamField(describe = "酒店ID")
+	private Long hotelId;
+
+	/**
+	 * 人数
+	 */
+	@ServiceParamField(describe = "人数")
+	private Integer peopleNum;
+
+	/**
+	 * 到达日期
+	 */
+	@ServiceParamField(describe = "到达日期")
+	private Date arrivalDate;
+
+
+	/**
+	 * 入住天数
+	 */
+	@ServiceParamField(describe = "入住天数")
+	private Integer stayDays;
+
+	/**
+	 * 审核状态 -1 撤销 0 待复核 1 复核通过 2 复核驳回
+	 */
+	@ServiceParamField(describe = "审核状态 -1 撤销 0 待复核 1 复核通过 2 复核驳回")
+	private Integer auditState;
+
+	/**
+	 * 备注
+	 */
+	@ServiceParamField(describe = "备注")
+	private String remarks;
+
+	/**
+	 * 完成日期（ 申报通过 或者 撤销申报的日期 ）
+	 */
+	@ServiceParamField(describe = "完成日期（ 申报通过 或者 撤销申报的日期 ）")
+	private Date completeDate;
+
+	/**
+	 * 票据等文件（图片）
+	 */
+	@ServiceParamField(describe = "票据等文件（图片）")
+	private String file;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	@ServiceParamField(describe = "是否删除 0 否 1 是")
+	private Integer isDeleted;
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/UpdateTravelReportRequest.java

@@ -0,0 +1,91 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class UpdateTravelReportRequest extends AbstractOapRequest {
+
+	@ServiceParamField(describe = "ID")
+	private Long id;
+
+	@ServiceParamField(describe = "认证ID")
+	private Long authId;
+
+	/**
+	 * 旅行社ID
+	 */
+	@ServiceParamField(describe = "旅行社ID")
+	private Long travelId;
+
+	/**
+	 * 领队姓名
+	 */
+	@ServiceParamField(describe = "领队姓名")
+	private String leaderName;
+
+	/**
+	 * 出行团号（团队号）
+	 */
+	@ServiceParamField(describe = "出行团号（团队号）")
+	private String tourCode;
+
+	/**
+	 * 带团起始时间
+	 */
+	@ServiceParamField(describe = "带团起始时间")
+	private Date startDate;
+
+	/**
+	 * 带团截止时间
+	 */
+	@ServiceParamField(describe = "带团截止时间")
+	private Date endDate;
+
+	/**
+	 * 旅游社团人数
+	 */
+	@ServiceParamField(describe = "旅游社团人数")
+	private Integer touristNum;
+
+	/**
+	 * 相关证件号
+	 */
+	@ServiceParamField(describe = "相关证件号")
+	private String credentialNo;
+
+	/**
+	 * 相关证件资料
+	 */
+	@ServiceParamField(describe = "相关证件资料")
+	private String credentialPic;
+
+	/**
+	 * 备注
+	 */
+	@ServiceParamField(describe = "备注")
+	private String note;
+
+	/**
+	 * 申报进度 -1 撤销申请 0 景区,酒店复核 1 旅游局复核 2 申报通过 3 申报驳回
+	 */
+	@ServiceParamField(describe = "申报进度 -1 撤销申请 0 景区,酒店复核 1 旅游局复核 2 申报通过 3 申报驳回")
+	private Integer reportProgress;
+
+	/**
+	 * 完成日期（ 申报通过 或者 撤销申报的日期 ）
+	 */
+	@ServiceParamField(describe = "完成日期（ 申报通过 或者 撤销申报的日期 ）")
+	private Date completeDate;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	@ServiceParamField(describe = "是否删除 0 否 1 是")
+	private Integer isDeleted;
+}

src/main/resources/db/migration/V1.1.8__travel_report.sql

@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS `travel_report`;
+CREATE TABLE `travel_report`
+(
+    `id`              bigint(20) NOT NULL,
+    `auth_id`         bigint(20) NULL DEFAULT NULL,
+    `creator`         bigint(20) NULL DEFAULT NULL COMMENT '创建者',
+    `create_date`     datetime NULL DEFAULT NULL COMMENT '创建日期',
+    `is_deleted`      tinyint(2) NULL DEFAULT 0 COMMENT '0 正常 1 删除',
+    `travel_id`       bigint(20) NULL DEFAULT NULL COMMENT '旅行社ID',
+    `leader_name`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '领队 or 导游姓名',
+    `start_date`      date NULL DEFAULT NULL COMMENT '领队带团起始日期',
+    `end_date`        date NULL DEFAULT NULL COMMENT '领队带团终止日期',
+    `tour_code`       varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出行团号（团队号）',
+    `tourist_num`     int(5) NULL DEFAULT 0 COMMENT '游客人数',
+    `credential_no`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关证件号',
+    `credential_pic`  varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关证件资料',
+    `note`            varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    `report_progress` tinyint(2) NULL DEFAULT 0 COMMENT '申报进度  -1 撤销申请 0 申报中 1 酒店,景区申报通过 2 旅游局申报通过 3 申报驳回',
+    `complete_date`   datetime NULL DEFAULT NULL COMMENT '完成日期（ 申报通过 或者 撤销申报的日期 ）',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='旅行社团报表';

src/main/resources/db/migration/V1.1.9__travel_hotel_audit.sql

@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS `travel_hotel_audit`;
+CREATE TABLE `travel_hotel_audit`
+(
+    `id`            bigint(20) NOT NULL,
+    `auth_id`       bigint(20) NULL DEFAULT NULL,
+    `creator`       bigint(20) NULL DEFAULT NULL COMMENT '创建者',
+    `create_date`   datetime NULL DEFAULT NULL COMMENT '创建日期',
+    `solicit_id`    bigint(20) NULL DEFAULT NULL COMMENT '旅行社信息申报ID',
+    `travel_id`     bigint(20) NULL DEFAULT NULL COMMENT '旅游团ID',
+    `tour_code`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出行团号（团队号）',
+    `hotel_id`      bigint(20) NULL DEFAULT NULL COMMENT '酒店ID',
+    `people_num`    int(5) NULL DEFAULT 0 COMMENT '人数',
+    `arrival_date`  datetime NULL DEFAULT NULL COMMENT '到达日期',
+    `stay_days`     int(5) NULL DEFAULT 0 COMMENT '入住天数',
+    `file`          varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发票等文件（图片）',
+    `remarks`       varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    `audit_state`   tinyint(2) NULL DEFAULT 0 COMMENT '审核状态 -1 撤销 0 待复核 1 复核通过 2 复核驳回',
+    `complete_date` datetime NULL DEFAULT NULL COMMENT '完成日期（ 申报通过 或者 撤销申报的日期 ）',
+    `is_deleted`    tinyint(2) NULL DEFAULT 0 COMMENT '0 正常 1 删除',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT = '旅行社  酒店申报表';

src/main/resources/public/static/css/chunk-1d9f9eae.4627e83e.css

@@ -0,0 +1 @@
+.image{width:100%;height:100%;border-radius:6px}

src/main/resources/public/static/css/chunk-2914c052.4627e83e.css

@@ -0,0 +1 @@
+.image{width:100%;height:100%;border-radius:6px}

src/main/resources/public/static/css/chunk-41fc9b08.e5f0ac0b.css

@@ -0,0 +1 @@
+.category{position:absolute;top:80px;left:30px;width:200px;z-index:9999}.category a{display:block;padding:10px 0}.marker span{color:#666;margin-right:10px;font-size:12px}.marker p{font-size:16px;margin:5px 0}

src/main/resources/public/static/css/chunk-53426fcd.d3af3a43.css

@@ -0,0 +1 @@
+.card{width:100%;height:200px;float:left}.card strong{font-size:24px}.vertical-divider-100{height:88px}.air-quality-info{font-size:12px;color:#999;line-height:30px}.sample-block{width:20px;height:10px;display:inline-block;margin-right:5px}

src/main/resources/public/static/css/chunk-5b1b9b36.8660dfad.css

@@ -0,0 +1 @@
+.dashboard-container[data-v-96282068]{margin:30px}.dashboard-text[data-v-96282068]{font-size:30px;line-height:46px}

src/main/resources/public/static/css/chunk-78a3203a.f6ed7f52.css

@@ -0,0 +1 @@
+.action-btns{text-align:right}

src/main/resources/public/static/css/chunk-7d2734ac.4627e83e.css

@@ -0,0 +1 @@
+.image{width:100%;height:100%;border-radius:6px}

src/main/resources/public/static/css/chunk-a8284054.43d8c414.css

@@ -0,0 +1 @@
+.footer{height:68px;line-height:68px;text-align:center;background:#eaeaea;font-size:12px}.footer,.footer a{color:#333}.footer a:hover{color:#f08200}

src/main/resources/public/static/css/chunk-ad2707dc.4627e83e.css

@@ -0,0 +1 @@
+.image{width:100%;height:100%;border-radius:6px}

src/main/resources/public/static/css/chunk-edd0c262.8a7d13e8.css

@@ -0,0 +1 @@
+em{color:red}p{font-size:10px}.description,p{text-indent:2em}.description{padding:10px;font-size:14px}.fragments{padding:10px;background:#efefef}

src/main/resources/public/static/js/chunk-67aa66b6.4c5744d7.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-67aa66b6"],{"1f33":function(t,s,a){},"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"8cdb":function(t,s,a){"use strict";a.r(s);var e=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("OOPS!")]),t._m(1),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),a("div",{staticClass:"bullshit__info"},[t._v("Please check that the URL you entered is correct, or click the button below to return to the homepage.")]),a("a",{staticClass:"bullshit__return-home",attrs:{href:"/"}},[t._v("返回首页")])])])])},c=[function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"pic-404"},[e("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),e("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),e("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),e("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"bullshit__info"},[t._v("All rights reserved "),a("a",{staticStyle:{color:"#20a0ff"},attrs:{href:"https://wallstreetcn.com",target:"_blank"}},[t._v("wallstreetcn")])])}],i={name:"Page404",computed:{message:function(){return"The webmaster said that you can not enter this page..."}}},l=i,n=(a("f7f2"),a("2877")),r=Object(n["a"])(l,e,c,!1,null,"f97bc486",null);s["default"]=r.exports},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"},f7f2:function(t,s,a){"use strict";a("1f33")}}]);