更新预约表

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/reservat/XiaoyuanReservatConfigController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.reservat;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.system.domain.reservat.bo.XiaoyuanReservatConfigBo;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatConfigVo;
+import org.dromara.system.service.reservat.IXiaoyuanReservatConfigService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 校园预约配置
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/reservatConfig")
+public class XiaoyuanReservatConfigController extends BaseController {
+
+    private final IXiaoyuanReservatConfigService xiaoyuanReservatConfigService;
+
+    /**
+     * 查询校园预约配置列表
+     */
+    @SaCheckPermission("system:reservatConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo<XiaoyuanReservatConfigVo> list(XiaoyuanReservatConfigBo bo, PageQuery pageQuery) {
+        return xiaoyuanReservatConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出校园预约配置列表
+     */
+    @SaCheckPermission("system:reservatConfig:export")
+    @Log(title = "校园预约配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XiaoyuanReservatConfigBo bo, HttpServletResponse response) {
+        List<XiaoyuanReservatConfigVo> list = xiaoyuanReservatConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "校园预约配置", XiaoyuanReservatConfigVo.class, response);
+    }
+
+    /**
+     * 获取校园预约配置详细信息
+     *
+     * @param reservatConfigId 主键
+     */
+    @SaCheckPermission("system:reservatConfig:query")
+    @GetMapping("/{reservatConfigId}")
+    public R<XiaoyuanReservatConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long reservatConfigId) {
+        return R.ok(xiaoyuanReservatConfigService.queryById(reservatConfigId));
+    }
+
+    /**
+     * 新增校园预约配置
+     */
+    @SaCheckPermission("system:reservatConfig:add")
+    @Log(title = "校园预约配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XiaoyuanReservatConfigBo bo) {
+        return toAjax(xiaoyuanReservatConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改校园预约配置
+     */
+    @SaCheckPermission("system:reservatConfig:edit")
+    @Log(title = "校园预约配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XiaoyuanReservatConfigBo bo) {
+        return toAjax(xiaoyuanReservatConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除校园预约配置
+     *
+     * @param reservatConfigIds 主键串
+     */
+    @SaCheckPermission("system:reservatConfig:remove")
+    @Log(title = "校园预约配置", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{reservatConfigIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] reservatConfigIds) {
+        return toAjax(xiaoyuanReservatConfigService.deleteWithValidByIds(List.of(reservatConfigIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/reservat/XiaoyuanReservatController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.reservat;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.system.domain.reservat.bo.XiaoyuanReservatBo;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatVo;
+import org.dromara.system.service.reservat.IXiaoyuanReservatService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 校园预约
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/reservat")
+public class XiaoyuanReservatController extends BaseController {
+
+    private final IXiaoyuanReservatService xiaoyuanReservatService;
+
+    /**
+     * 查询校园预约列表
+     */
+    @SaCheckPermission("system:reservat:list")
+    @GetMapping("/list")
+    public TableDataInfo<XiaoyuanReservatVo> list(XiaoyuanReservatBo bo, PageQuery pageQuery) {
+        return xiaoyuanReservatService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出校园预约列表
+     */
+    @SaCheckPermission("system:reservat:export")
+    @Log(title = "校园预约", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XiaoyuanReservatBo bo, HttpServletResponse response) {
+        List<XiaoyuanReservatVo> list = xiaoyuanReservatService.queryList(bo);
+        ExcelUtil.exportExcel(list, "校园预约", XiaoyuanReservatVo.class, response);
+    }
+
+    /**
+     * 获取校园预约详细信息
+     *
+     * @param reservatId 主键
+     */
+    @SaCheckPermission("system:reservat:query")
+    @GetMapping("/{reservatId}")
+    public R<XiaoyuanReservatVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long reservatId) {
+        return R.ok(xiaoyuanReservatService.queryById(reservatId));
+    }
+
+    /**
+     * 新增校园预约
+     */
+    @SaCheckPermission("system:reservat:add")
+    @Log(title = "校园预约", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XiaoyuanReservatBo bo) {
+        return toAjax(xiaoyuanReservatService.insertByBo(bo));
+    }
+
+    /**
+     * 修改校园预约
+     */
+    @SaCheckPermission("system:reservat:edit")
+    @Log(title = "校园预约", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XiaoyuanReservatBo bo) {
+        return toAjax(xiaoyuanReservatService.updateByBo(bo));
+    }
+
+    /**
+     * 删除校园预约
+     *
+     * @param reservatIds 主键串
+     */
+    @SaCheckPermission("system:reservat:remove")
+    @Log(title = "校园预约", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{reservatIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] reservatIds) {
+        return toAjax(xiaoyuanReservatService.deleteWithValidByIds(List.of(reservatIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/reservat/XiaoyuanReservat.java

@@ -0,0 +1,101 @@
+package org.dromara.system.domain.reservat;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.io.Serial;
+
+/**
+ * 校园预约对象 xiaoyuan_reservat
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xiaoyuan_reservat")
+public class XiaoyuanReservat extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 校园预约ID
+     */
+    @TableId(value = "reservat_id")
+    private Long reservatId;
+
+    /**
+     * 教职工姓名
+     */
+    private String teacherName;
+
+    /**
+     * 教职工手机号
+     */
+    private String teacherPhone;
+
+    /**
+     * 来访者姓名
+     */
+    private String visitName;
+
+    /**
+     * 来访者手机号
+     */
+    private String visitPhone;
+
+    /**
+     * 来访者身份证
+     */
+    private String visitIdCard;
+
+    /**
+     * 来访者事由
+     */
+    private String visitReason;
+
+    /**
+     * 来访者补充事由
+     */
+    private String visitRemark;
+
+    /**
+     * 预约日期
+     */
+    private Date visitDate;
+
+    /**
+     * 预约时间
+     */
+    private Date visitTime;
+
+    /**
+     * 预约时间
+     */
+    private Date visitDateTime;
+
+    /**
+     * 预约二维码
+     */
+    private String visitQr;
+
+    /**
+     * 预约状态 1:等待审核 2:未审核 3:已审核
+     */
+    private String visitType;
+
+    /**
+     * 是否入场 1:未入场 2:已入场
+     */
+    private String visitStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/reservat/XiaoyuanReservatConfig.java

@@ -0,0 +1,81 @@
+package org.dromara.system.domain.reservat;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.io.Serial;
+
+/**
+ * 校园预约配置对象 xiaoyuan_reservat_config
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xiaoyuan_reservat_config")
+public class XiaoyuanReservatConfig extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 校园预约配置ID
+     */
+    @TableId(value = "reservat_config_id")
+    private Long reservatConfigId;
+
+    /**
+     * 教职工姓名
+     */
+    private String teacherName;
+
+    /**
+     * 教职工id
+     */
+    private Long teacherId;
+
+    /**
+     * 教职工手机号
+     */
+    private String teacherPhone;
+
+    /**
+     * 教职工可预约日期
+     */
+    private String reservatConfigDate;
+
+    /**
+     * 教职工可预约时间上午开始
+     */
+    private Date reservatConfigTimeAmBegin;
+
+    /**
+     * 教职工可预约时间上午结束
+     */
+    private Date reservatConfigTimeAmEnd;
+
+    /**
+     * 教职工可预约时间下午开始
+     */
+    private Date reservatConfigTimePmBegin;
+
+    /**
+     * 教职工可预约时间下午结束
+     */
+    private Date reservatConfigTimePmEnd;
+
+    /**
+     * 可预约次数
+     */
+    private Long reservatConfigNum;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/reservat/bo/XiaoyuanReservatBo.java

@@ -0,0 +1,116 @@
+package org.dromara.system.domain.reservat.bo;
+
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import org.dromara.system.domain.reservat.XiaoyuanReservat;
+
+/**
+ * 校园预约业务对象 xiaoyuan_reservat
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XiaoyuanReservat.class, reverseConvertGenerate = false)
+public class XiaoyuanReservatBo extends BaseEntity {
+
+    /**
+     * 校园预约ID
+     */
+    @NotNull(message = "校园预约ID不能为空", groups = { EditGroup.class })
+    private Long reservatId;
+
+    /**
+     * 教职工姓名
+     */
+    @NotBlank(message = "教职工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String teacherName;
+
+    /**
+     * 教职工手机号
+     */
+    @NotBlank(message = "教职工手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String teacherPhone;
+
+    /**
+     * 来访者姓名
+     */
+    @NotBlank(message = "来访者姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitName;
+
+    /**
+     * 来访者手机号
+     */
+    @NotBlank(message = "来访者手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitPhone;
+
+    /**
+     * 来访者身份证
+     */
+    @NotBlank(message = "来访者身份证不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitIdCard;
+
+    /**
+     * 来访者事由
+     */
+    @NotBlank(message = "来访者事由不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitReason;
+
+    /**
+     * 来访者补充事由
+     */
+    @NotBlank(message = "来访者补充事由不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitRemark;
+
+    /**
+     * 预约日期
+     */
+    @NotNull(message = "预约日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date visitDate;
+
+    /**
+     * 预约时间
+     */
+    @NotNull(message = "预约时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date visitTime;
+
+    /**
+     * 预约时间
+     */
+    @NotNull(message = "预约时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date visitDateTime;
+
+    /**
+     * 预约二维码
+     */
+    @NotBlank(message = "预约二维码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitQr;
+
+    /**
+     * 预约状态 1:等待审核 2:未审核 3:已审核
+     */
+    @NotBlank(message = "预约状态 1:等待审核 2:未审核 3:已审核不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitType;
+
+    /**
+     * 是否入场 1:未入场 2:已入场
+     */
+    @NotBlank(message = "是否入场 1:未入场 2:已入场不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String visitStatus;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/reservat/bo/XiaoyuanReservatConfigBo.java

@@ -0,0 +1,92 @@
+package org.dromara.system.domain.reservat.bo;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.reservat.XiaoyuanReservatConfig;
+
+/**
+ * 校园预约配置业务对象 xiaoyuan_reservat_config
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XiaoyuanReservatConfig.class, reverseConvertGenerate = false)
+public class XiaoyuanReservatConfigBo extends BaseEntity {
+
+    /**
+     * 校园预约配置ID
+     */
+    @NotNull(message = "校园预约配置ID不能为空", groups = { EditGroup.class })
+    private Long reservatConfigId;
+
+    /**
+     * 教职工姓名
+     */
+    @NotBlank(message = "教职工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String teacherName;
+
+    /**
+     * 教职工id
+     */
+    @NotNull(message = "教职工id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long teacherId;
+
+    /**
+     * 教职工手机号
+     */
+    @NotBlank(message = "教职工手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String teacherPhone;
+
+    /**
+     * 教职工可预约日期
+     */
+    @NotBlank(message = "教职工可预约日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reservatConfigDate;
+
+    /**
+     * 教职工可预约时间上午开始
+     */
+    @NotNull(message = "教职工可预约时间上午开始不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date reservatConfigTimeAmBegin;
+
+    /**
+     * 教职工可预约时间上午结束
+     */
+    @NotNull(message = "教职工可预约时间上午结束不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date reservatConfigTimeAmEnd;
+
+    /**
+     * 教职工可预约时间下午开始
+     */
+    @NotNull(message = "教职工可预约时间下午开始不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date reservatConfigTimePmBegin;
+
+    /**
+     * 教职工可预约时间下午结束
+     */
+    @NotNull(message = "教职工可预约时间下午结束不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date reservatConfigTimePmEnd;
+
+    /**
+     * 可预约次数
+     */
+    @NotNull(message = "可预约次数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long reservatConfigNum;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/reservat/vo/XiaoyuanReservatConfigVo.java

@@ -0,0 +1,97 @@
+package org.dromara.system.domain.reservat.vo;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.reservat.XiaoyuanReservatConfig;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 校园预约配置视图对象 xiaoyuan_reservat_config
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XiaoyuanReservatConfig.class)
+public class XiaoyuanReservatConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 校园预约配置ID
+     */
+    @ExcelProperty(value = "校园预约配置ID")
+    private Long reservatConfigId;
+
+    /**
+     * 教职工姓名
+     */
+    @ExcelProperty(value = "教职工姓名")
+    private String teacherName;
+
+    /**
+     * 教职工id
+     */
+    @ExcelProperty(value = "教职工id")
+    private Long teacherId;
+
+    /**
+     * 教职工手机号
+     */
+    @ExcelProperty(value = "教职工手机号")
+    private String teacherPhone;
+
+    /**
+     * 教职工可预约日期
+     */
+    @ExcelProperty(value = "教职工可预约日期")
+    private String reservatConfigDate;
+
+    /**
+     * 教职工可预约时间上午开始
+     */
+    @ExcelProperty(value = "教职工可预约时间上午开始")
+    private Date reservatConfigTimeAmBegin;
+
+    /**
+     * 教职工可预约时间上午结束
+     */
+    @ExcelProperty(value = "教职工可预约时间上午结束")
+    private Date reservatConfigTimeAmEnd;
+
+    /**
+     * 教职工可预约时间下午开始
+     */
+    @ExcelProperty(value = "教职工可预约时间下午开始")
+    private Date reservatConfigTimePmBegin;
+
+    /**
+     * 教职工可预约时间下午结束
+     */
+    @ExcelProperty(value = "教职工可预约时间下午结束")
+    private Date reservatConfigTimePmEnd;
+
+    /**
+     * 可预约次数
+     */
+    @ExcelProperty(value = "可预约次数")
+    private Long reservatConfigNum;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/reservat/vo/XiaoyuanReservatVo.java

@@ -0,0 +1,124 @@
+package org.dromara.system.domain.reservat.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.reservat.XiaoyuanReservat;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 校园预约视图对象 xiaoyuan_reservat
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XiaoyuanReservat.class)
+public class XiaoyuanReservatVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 校园预约ID
+     */
+    @ExcelProperty(value = "校园预约ID")
+    private Long reservatId;
+
+    /**
+     * 教职工姓名
+     */
+    @ExcelProperty(value = "教职工姓名")
+    private String teacherName;
+
+    /**
+     * 教职工手机号
+     */
+    @ExcelProperty(value = "教职工手机号")
+    private String teacherPhone;
+
+    /**
+     * 来访者姓名
+     */
+    @ExcelProperty(value = "来访者姓名")
+    private String visitName;
+
+    /**
+     * 来访者手机号
+     */
+    @ExcelProperty(value = "来访者手机号")
+    private String visitPhone;
+
+    /**
+     * 来访者身份证
+     */
+    @ExcelProperty(value = "来访者身份证")
+    private String visitIdCard;
+
+    /**
+     * 来访者事由
+     */
+    @ExcelProperty(value = "来访者事由")
+    private String visitReason;
+
+    /**
+     * 来访者补充事由
+     */
+    @ExcelProperty(value = "来访者补充事由")
+    private String visitRemark;
+
+    /**
+     * 预约日期
+     */
+    @ExcelProperty(value = "预约日期")
+    private Date visitDate;
+
+    /**
+     * 预约时间
+     */
+    @ExcelProperty(value = "预约时间")
+    private Date visitTime;
+
+    /**
+     * 预约时间
+     */
+    @ExcelProperty(value = "预约时间")
+    private Date visitDateTime;
+
+    /**
+     * 预约二维码
+     */
+    @ExcelProperty(value = "预约二维码")
+    private String visitQr;
+
+    /**
+     * 预约状态 1:等待审核 2:未审核 3:已审核
+     */
+    @ExcelProperty(value = "预约状态 1:等待审核 2:未审核 3:已审核")
+    private String visitType;
+
+    /**
+     * 是否入场 1:未入场 2:已入场
+     */
+    @ExcelProperty(value = "是否入场 1:未入场 2:已入场")
+    private String visitStatus;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/reservat/XiaoyuanReservatConfigMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper.reservat;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.reservat.XiaoyuanReservatConfig;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatConfigVo;
+
+/**
+ * 校园预约配置Mapper接口
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+public interface XiaoyuanReservatConfigMapper extends BaseMapperPlus<XiaoyuanReservatConfig, XiaoyuanReservatConfigVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/reservat/XiaoyuanReservatMapper.java

@@ -0,0 +1,16 @@
+package org.dromara.system.mapper.reservat;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.reservat.XiaoyuanReservat;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatVo;
+
+/**
+ * 校园预约Mapper接口
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+public interface XiaoyuanReservatMapper extends BaseMapperPlus<XiaoyuanReservat, XiaoyuanReservatVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/pay/XiaoyuanPayServiceImpl.java

@@ -9,6 +9,7 @@ import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
@@ -119,6 +120,7 @@ public class XiaoyuanPayServiceImpl implements IXiaoyuanPayService {
         lqw.eq(StringUtils.isNotBlank(bo.getPayTime()), XiaoyuanPay::getPayTime, bo.getPayTime());
         lqw.eq(StringUtils.isNotBlank(bo.getYear()), XiaoyuanPay::getYear, bo.getYear());
         lqw.eq(StringUtils.isNotBlank(bo.getMonth()), XiaoyuanPay::getMonth, bo.getMonth());
+        lqw.orderByDesc(XiaoyuanPay::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/reservat/XiaoyuanReservatConfigServiceImpl.java

@@ -0,0 +1,117 @@
+package org.dromara.system.service.impl.reservat;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.reservat.XiaoyuanReservatConfig;
+import org.dromara.system.domain.reservat.bo.XiaoyuanReservatConfigBo;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatConfigVo;
+import org.dromara.system.mapper.reservat.XiaoyuanReservatConfigMapper;
+import org.dromara.system.service.reservat.IXiaoyuanReservatConfigService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 校园预约配置Service业务层处理
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@RequiredArgsConstructor
+@Service
+public class XiaoyuanReservatConfigServiceImpl implements IXiaoyuanReservatConfigService {
+
+    private final XiaoyuanReservatConfigMapper baseMapper;
+
+    /**
+     * 查询校园预约配置
+     */
+    @Override
+    public XiaoyuanReservatConfigVo queryById(Long reservatConfigId){
+        return baseMapper.selectVoById(reservatConfigId);
+    }
+
+    /**
+     * 查询校园预约配置列表
+     */
+    @Override
+    public TableDataInfo<XiaoyuanReservatConfigVo> queryPageList(XiaoyuanReservatConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XiaoyuanReservatConfig> lqw = buildQueryWrapper(bo);
+        Page<XiaoyuanReservatConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询校园预约配置列表
+     */
+    @Override
+    public List<XiaoyuanReservatConfigVo> queryList(XiaoyuanReservatConfigBo bo) {
+        LambdaQueryWrapper<XiaoyuanReservatConfig> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XiaoyuanReservatConfig> buildQueryWrapper(XiaoyuanReservatConfigBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XiaoyuanReservatConfig> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getTeacherName()), XiaoyuanReservatConfig::getTeacherName, bo.getTeacherName());
+        lqw.eq(bo.getTeacherId() != null, XiaoyuanReservatConfig::getTeacherId, bo.getTeacherId());
+        lqw.eq(StringUtils.isNotBlank(bo.getTeacherPhone()), XiaoyuanReservatConfig::getTeacherPhone, bo.getTeacherPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getReservatConfigDate()), XiaoyuanReservatConfig::getReservatConfigDate, bo.getReservatConfigDate());
+        lqw.eq(bo.getReservatConfigTimeAmBegin() != null, XiaoyuanReservatConfig::getReservatConfigTimeAmBegin, bo.getReservatConfigTimeAmBegin());
+        lqw.eq(bo.getReservatConfigTimeAmEnd() != null, XiaoyuanReservatConfig::getReservatConfigTimeAmEnd, bo.getReservatConfigTimeAmEnd());
+        lqw.eq(bo.getReservatConfigTimePmBegin() != null, XiaoyuanReservatConfig::getReservatConfigTimePmBegin, bo.getReservatConfigTimePmBegin());
+        lqw.eq(bo.getReservatConfigTimePmEnd() != null, XiaoyuanReservatConfig::getReservatConfigTimePmEnd, bo.getReservatConfigTimePmEnd());
+        lqw.eq(bo.getReservatConfigNum() != null, XiaoyuanReservatConfig::getReservatConfigNum, bo.getReservatConfigNum());
+        return lqw;
+    }
+
+    /**
+     * 新增校园预约配置
+     */
+    @Override
+    public Boolean insertByBo(XiaoyuanReservatConfigBo bo) {
+        XiaoyuanReservatConfig add = MapstructUtils.convert(bo, XiaoyuanReservatConfig.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setReservatConfigId(add.getReservatConfigId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改校园预约配置
+     */
+    @Override
+    public Boolean updateByBo(XiaoyuanReservatConfigBo bo) {
+        XiaoyuanReservatConfig update = MapstructUtils.convert(bo, XiaoyuanReservatConfig.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XiaoyuanReservatConfig entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除校园预约配置
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/reservat/XiaoyuanReservatServiceImpl.java

@@ -0,0 +1,120 @@
+package org.dromara.system.service.impl.reservat;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.reservat.XiaoyuanReservat;
+import org.dromara.system.domain.reservat.bo.XiaoyuanReservatBo;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatVo;
+import org.dromara.system.mapper.reservat.XiaoyuanReservatMapper;
+import org.dromara.system.service.reservat.IXiaoyuanReservatService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 校园预约Service业务层处理
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+@RequiredArgsConstructor
+@Service
+public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
+
+    private final XiaoyuanReservatMapper baseMapper;
+
+    /**
+     * 查询校园预约
+     */
+    @Override
+    public XiaoyuanReservatVo queryById(Long reservatId){
+        return baseMapper.selectVoById(reservatId);
+    }
+
+    /**
+     * 查询校园预约列表
+     */
+    @Override
+    public TableDataInfo<XiaoyuanReservatVo> queryPageList(XiaoyuanReservatBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XiaoyuanReservat> lqw = buildQueryWrapper(bo);
+        Page<XiaoyuanReservatVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询校园预约列表
+     */
+    @Override
+    public List<XiaoyuanReservatVo> queryList(XiaoyuanReservatBo bo) {
+        LambdaQueryWrapper<XiaoyuanReservat> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XiaoyuanReservat> buildQueryWrapper(XiaoyuanReservatBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XiaoyuanReservat> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getTeacherName()), XiaoyuanReservat::getTeacherName, bo.getTeacherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getTeacherPhone()), XiaoyuanReservat::getTeacherPhone, bo.getTeacherPhone());
+        lqw.like(StringUtils.isNotBlank(bo.getVisitName()), XiaoyuanReservat::getVisitName, bo.getVisitName());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitPhone()), XiaoyuanReservat::getVisitPhone, bo.getVisitPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitIdCard()), XiaoyuanReservat::getVisitIdCard, bo.getVisitIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitReason()), XiaoyuanReservat::getVisitReason, bo.getVisitReason());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitRemark()), XiaoyuanReservat::getVisitRemark, bo.getVisitRemark());
+        lqw.eq(bo.getVisitDate() != null, XiaoyuanReservat::getVisitDate, bo.getVisitDate());
+        lqw.eq(bo.getVisitTime() != null, XiaoyuanReservat::getVisitTime, bo.getVisitTime());
+        lqw.eq(bo.getVisitDateTime() != null, XiaoyuanReservat::getVisitDateTime, bo.getVisitDateTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitQr()), XiaoyuanReservat::getVisitQr, bo.getVisitQr());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitType()), XiaoyuanReservat::getVisitType, bo.getVisitType());
+        lqw.eq(StringUtils.isNotBlank(bo.getVisitStatus()), XiaoyuanReservat::getVisitStatus, bo.getVisitStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增校园预约
+     */
+    @Override
+    public Boolean insertByBo(XiaoyuanReservatBo bo) {
+        XiaoyuanReservat add = MapstructUtils.convert(bo, XiaoyuanReservat.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setReservatId(add.getReservatId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改校园预约
+     */
+    @Override
+    public Boolean updateByBo(XiaoyuanReservatBo bo) {
+        XiaoyuanReservat update = MapstructUtils.convert(bo, XiaoyuanReservat.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XiaoyuanReservat entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除校园预约
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/reservat/IXiaoyuanReservatConfigService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service.reservat;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.reservat.bo.XiaoyuanReservatConfigBo;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatConfigVo;
+import java.util.Collection;
+import java.util.List;
+
+
+/**
+ * 校园预约配置Service接口
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+public interface IXiaoyuanReservatConfigService {
+
+    /**
+     * 查询校园预约配置
+     */
+    XiaoyuanReservatConfigVo queryById(Long reservatConfigId);
+
+    /**
+     * 查询校园预约配置列表
+     */
+    TableDataInfo<XiaoyuanReservatConfigVo> queryPageList(XiaoyuanReservatConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询校园预约配置列表
+     */
+    List<XiaoyuanReservatConfigVo> queryList(XiaoyuanReservatConfigBo bo);
+
+    /**
+     * 新增校园预约配置
+     */
+    Boolean insertByBo(XiaoyuanReservatConfigBo bo);
+
+    /**
+     * 修改校园预约配置
+     */
+    Boolean updateByBo(XiaoyuanReservatConfigBo bo);
+
+    /**
+     * 校验并批量删除校园预约配置信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/reservat/IXiaoyuanReservatService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service.reservat;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.reservat.bo.XiaoyuanReservatBo;
+import org.dromara.system.domain.reservat.vo.XiaoyuanReservatVo;
+import java.util.Collection;
+import java.util.List;
+
+
+/**
+ * 校园预约Service接口
+ *
+ * @author boman
+ * @date 2023-09-12
+ */
+public interface IXiaoyuanReservatService {
+
+    /**
+     * 查询校园预约
+     */
+    XiaoyuanReservatVo queryById(Long reservatId);
+
+    /**
+     * 查询校园预约列表
+     */
+    TableDataInfo<XiaoyuanReservatVo> queryPageList(XiaoyuanReservatBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询校园预约列表
+     */
+    List<XiaoyuanReservatVo> queryList(XiaoyuanReservatBo bo);
+
+    /**
+     * 新增校园预约
+     */
+    Boolean insertByBo(XiaoyuanReservatBo bo);
+
+    /**
+     * 修改校园预约
+     */
+    Boolean updateByBo(XiaoyuanReservatBo bo);
+
+    /**
+     * 校验并批量删除校园预约信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/resources/mapper/reservat/XiaoyuanReservatConfigMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.reservat.XiaoyuanReservatConfigMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/reservat/XiaoyuanReservatMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.reservat.XiaoyuanReservatMapper">
+
+</mapper>