update

src/main/java/com/zhiqiyun/open/core/mapper/statistics/TravelScenicAuditMapper.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.TravelScenicAudit;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TravelScenicAuditMapper extends BaseMapper<TravelScenicAudit> {
+}

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

@@ -0,0 +1,92 @@
+package com.zhiqiyun.open.core.models.statistics;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("travel_scenic_audit")
+public class TravelScenicAudit {
+
+	private static final long serialVersionUID = -4025904620791857153L;
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	private Long authId;
+
+	/**
+	 * 团报信息ID
+	 */
+	private Long solicitId;
+
+	/**
+	 * 旅行社ID
+	 */
+	private Long travelId;
+
+	/**
+	 * 出行团号（团队号）
+	 */
+	private String tourCode;
+
+	/**
+	 * 景区ID
+	 */
+	private Long scenicId;
+
+	/**
+	 * 人数
+	 */
+	private Integer peopleNum;
+
+	/**
+	 * 到达时间
+	 */
+	private Date arrivalDate;
+
+	/**
+	 * 门票单价
+	 */
+	private BigDecimal ticketPrice;
+
+	/**
+	 * 审核状态 -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/service/TravelScenicAuditService.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.TravelScenicAudit;
+
+public interface TravelScenicAuditService extends IService<TravelScenicAudit> {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/TravelScenicAuditServiceImpl.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.TravelScenicAuditMapper;
+import com.zhiqiyun.open.core.models.statistics.TravelHotelAudit;
+import com.zhiqiyun.open.core.models.statistics.TravelScenicAudit;
+import com.zhiqiyun.open.core.service.TravelHotelAuditService;
+import com.zhiqiyun.open.core.service.TravelScenicAuditService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TravelScenicAuditServiceImpl extends ServiceImpl<TravelScenicAuditMapper, TravelScenicAudit> implements TravelScenicAuditService {
+}

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

@@ -7,12 +7,12 @@ 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.router.request.statistics.QueryTravelHotelAuditRequest;
+import com.zhiqiyun.open.router.request.statistics.SaveTravelHotelAuditRequest;
+import com.zhiqiyun.open.router.request.statistics.UpdateTravelHotelAuditRequest;
 import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -29,7 +29,7 @@ public class TravelHotelAuditApi {
 	private SequenceService sequenceService;
 
 	@ServiceMethod(method = "travel.hotel.audit.findPage", title = "查询酒店申报记录")
-	public OapResponse findPage(QueryTravelReportRequest request) {
+	public OapResponse findPage(QueryTravelHotelAuditRequest request) {
 		QueryWrapper<TravelHotelAudit> wrapper = new QueryWrapper<>();
 
 		Page<TravelHotelAudit> page = new Page<>(request.getCurrent(), request.getPageSize());

src/main/java/com/zhiqiyun/open/router/apis/TravelScenicAuditApi.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.TravelScenicAudit;
+import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.core.service.TravelScenicAuditService;
+import com.zhiqiyun.open.router.request.sentiment.IdsRequest;
+import com.zhiqiyun.open.router.request.statistics.QueryTravelScenicAuditRequest;
+import com.zhiqiyun.open.router.request.statistics.SaveTravelScenicAuditRequest;
+import com.zhiqiyun.open.router.request.statistics.UpdateTravelScenicAuditRequest;
+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 TravelScenicAuditApi {
+
+	@Autowired
+	private TravelScenicAuditService travelScenicAuditService;
+
+	@Autowired
+	private SequenceService sequenceService;
+
+	@ServiceMethod(method = "travel.scenic.audit.findPage", title = "查询景区申报")
+	public OapResponse findPage(QueryTravelScenicAuditRequest request) {
+		QueryWrapper<TravelScenicAudit> wrapper = new QueryWrapper<>();
+
+		Page<TravelScenicAudit> page = new Page<>(request.getCurrent(), request.getPageSize());
+		page.addOrder(OrderItem.desc("id"));
+
+		Page<TravelScenicAudit> resultData = this.travelScenicAuditService.page(page, wrapper);
+
+		return OapResponse.success().setBody(resultData);
+	}
+
+	@ServiceMethod(method = "travel.scenic.audit.add", title = "新建景区申报")
+	public OapResponse save(SaveTravelScenicAuditRequest request) {
+
+		TravelScenicAudit entity = new TravelScenicAudit();
+		BeanUtils.copyProperties(request, entity);
+
+		entity.setCreateDate(DateUtil.current());
+		entity.setId(this.sequenceService.nextId());
+
+		this.travelScenicAuditService.save(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
+
+	@ServiceMethod(method = "travel.scenic.audit.updateById", title = "更新景区申报")
+	public OapResponse updateById(UpdateTravelScenicAuditRequest request) {
+		TravelScenicAudit entity = new TravelScenicAudit();
+		BeanUtils.copyProperties(request, entity);
+
+		this.travelScenicAuditService.updateById(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
+
+	@ServiceMethod(method = "travel.scenic.audit.deleteByIds", title = "删除景区申报")
+	public OapResponse deleteByIds(IdsRequest request) {
+		this.travelScenicAuditService.removeByIds(request.getIds());
+		return OapResponse.success();
+	}
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/QueryTravelHotelAuditRequest.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 QueryTravelHotelAuditRequest extends AbstractOapRequest {
+
+	@NotNull
+	@ServiceParamField(describe = "页数")
+	private Integer current = 1;
+
+	@NotNull
+	@ServiceParamField(describe = "每页条数")
+	private Integer pageSize = 10;
+
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/QueryTravelScenicAuditRequest.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 QueryTravelScenicAuditRequest extends AbstractOapRequest {
+
+	@NotNull
+	@ServiceParamField(describe = "页数")
+	private Integer current = 1;
+
+	@NotNull
+	@ServiceParamField(describe = "每页条数")
+	private Integer pageSize = 10;
+
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/SaveTravelScenicAuditRequest.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.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SaveTravelScenicAuditRequest 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 scenicId;
+
+	/**
+	 * 人数
+	 */
+	@ServiceParamField(describe = "人数")
+	private Integer peopleNum;
+
+	/**
+	 * 到达时间
+	 */
+	@ServiceParamField(describe = "到达时间")
+	private Date arrivalDate;
+
+	/**
+	 * 门票单价
+	 */
+	@ServiceParamField(describe = "门票单价")
+	private BigDecimal ticketPrice;
+
+	/**
+	 * 审核状态 -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/UpdateTravelScenicAuditRequest.java

@@ -0,0 +1,93 @@
+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.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UpdateTravelScenicAuditRequest 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 scenicId;
+
+	/**
+	 * 人数
+	 */
+	@ServiceParamField(describe = "人数")
+	private Integer peopleNum;
+
+	/**
+	 * 到达时间
+	 */
+	@ServiceParamField(describe = "到达时间")
+	private Date arrivalDate;
+
+	/**
+	 * 门票单价
+	 */
+	@ServiceParamField(describe = "门票单价")
+	private BigDecimal ticketPrice;
+
+	/**
+	 * 审核状态 -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/resources/db/migration/V1.2.0__travel_scenic_audit.sql

@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS `travel_scenic_audit`;
+CREATE TABLE `travel_scenic_audit`
+(
+    `id`            bigint(20) NOT NULL AUTO_INCREMENT,
+    `auth_id`       bigint(20) NULL DEFAULT NULL,
+    `creator`       bigint(20) NULL DEFAULT NULL,
+    `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 '出行团号（团队号）',
+    `scenic_id`     bigint(20) NULL DEFAULT NULL COMMENT '景区ID',
+    `arrival_date`  datetime NULL DEFAULT NULL COMMENT '到达时间',
+    `people_num`    int(5) NULL DEFAULT NULL COMMENT '人数',
+    `ticket_price`  decimal(10, 2) NULL DEFAULT 0.00 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='旅行社 景区申报表' ROW_FORMAT=Dynamic;