预约核销

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

@@ -102,4 +102,16 @@ public class XiaoyuanReservatController extends BaseController {
                           @PathVariable Long[] reservatIds) {
         return toAjax(xiaoyuanReservatService.deleteWithValidByIds(List.of(reservatIds), true));
     }
+
+    /**
+     * 校园预约核销
+     *
+     * @param reservatId
+     */
+    @SaCheckPermission("system:reservat:cav")
+    @Log(title = "校园预约", businessType = BusinessType.DELETE)
+    @GetMapping("/cav")
+    public R<Void> cav(Long reservatId) {
+        return xiaoyuanReservatService.cav(reservatId);
+    }
 }

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

@@ -27,6 +27,11 @@ public class XiaoyuanReservat extends TenantEntity {
     @TableId(value = "reservat_id")
     private Long reservatId;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 教职工姓名
      */

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

@@ -50,22 +50,22 @@ public class XiaoyuanReservatConfig extends TenantEntity {
     /**
      * 教职工可预约时间上午开始
      */
-    private Date reservatConfigTimeAmBegin;
+    private String reservatConfigTimeAmBegin;
 
     /**
      * 教职工可预约时间上午结束
      */
-    private Date reservatConfigTimeAmEnd;
+    private String reservatConfigTimeAmEnd;
 
     /**
      * 教职工可预约时间下午开始
      */
-    private Date reservatConfigTimePmBegin;
+    private String reservatConfigTimePmBegin;
 
     /**
      * 教职工可预约时间下午结束
      */
-    private Date reservatConfigTimePmEnd;
+    private String reservatConfigTimePmEnd;
 
     /**
      * 可预约次数

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

@@ -25,91 +25,96 @@ public class XiaoyuanReservatBo extends BaseEntity {
     /**
      * 校园预约ID
      */
-    @NotNull(message = "校园预约ID不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "校园预约ID不能为空", groups = { EditGroup.class })
     private Long reservatId;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 教职工姓名
      */
-    @NotBlank(message = "教职工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "教职工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String teacherName;
 
     /**
      * 教职工手机号
      */
-    @NotBlank(message = "教职工手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "教职工手机号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String teacherPhone;
 
     /**
      * 来访者姓名
      */
-    @NotBlank(message = "来访者姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "来访者姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitName;
 
     /**
      * 来访者手机号
      */
-    @NotBlank(message = "来访者手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "来访者手机号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitPhone;
 
     /**
      * 来访者身份证
      */
-    @NotBlank(message = "来访者身份证不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "来访者身份证不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitIdCard;
 
     /**
      * 来访者事由
      */
-    @NotBlank(message = "来访者事由不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "来访者事由不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitReason;
 
     /**
      * 来访者补充事由
      */
-    @NotBlank(message = "来访者补充事由不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "来访者补充事由不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitRemark;
 
     /**
      * 预约日期
      */
-    @NotNull(message = "预约日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "预约日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date visitDate;
 
     /**
      * 预约时间
      */
-    @NotNull(message = "预约时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "预约时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date visitTime;
 
     /**
      * 预约时间
      */
-    @NotNull(message = "预约时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "预约时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date visitDateTime;
 
     /**
      * 预约二维码
      */
-    @NotBlank(message = "预约二维码不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "预约二维码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitQr;
 
     /**
      * 预约状态 1:等待审核 2:未审核 3:已审核
      */
-    @NotBlank(message = "预约状态 1:等待审核 2:未审核 3:已审核不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "预约状态 1:等待审核 2:未审核 3:已审核不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitType;
 
     /**
      * 是否入场 1:未入场 2:已入场
      */
-    @NotBlank(message = "是否入场 1:未入场 2:已入场不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "是否入场 1:未入场 2:已入场不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitStatus;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@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

@@ -25,67 +25,72 @@ public class XiaoyuanReservatConfigBo extends BaseEntity {
     /**
      * 校园预约配置ID
      */
-    @NotNull(message = "校园预约配置ID不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "校园预约配置ID不能为空", groups = { EditGroup.class })
     private Long reservatConfigId;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 教职工姓名
      */
-    @NotBlank(message = "教职工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "教职工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String teacherName;
 
     /**
      * 教职工id
      */
-    @NotNull(message = "教职工id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "教职工id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long teacherId;
 
     /**
      * 教职工手机号
      */
-    @NotBlank(message = "教职工手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "教职工手机号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String teacherPhone;
 
     /**
      * 教职工可预约日期
      */
-    @NotBlank(message = "教职工可预约日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@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 String reservatConfigTimeAmBegin;
 
     /**
      * 教职工可预约时间上午结束
      */
-    @NotNull(message = "教职工可预约时间上午结束不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date reservatConfigTimeAmEnd;
+    //@NotNull(message = "教职工可预约时间上午结束不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reservatConfigTimeAmEnd;
 
     /**
      * 教职工可预约时间下午开始
      */
-    @NotNull(message = "教职工可预约时间下午开始不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date reservatConfigTimePmBegin;
+    //@NotNull(message = "教职工可预约时间下午开始不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reservatConfigTimePmBegin;
 
     /**
      * 教职工可预约时间下午结束
      */
-    @NotNull(message = "教职工可预约时间下午结束不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date reservatConfigTimePmEnd;
+    //@NotNull(message = "教职工可预约时间下午结束不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reservatConfigTimePmEnd;
 
     /**
      * 可预约次数
      */
-    @NotNull(message = "可预约次数不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "可预约次数不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long reservatConfigNum;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@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

@@ -33,6 +33,11 @@ public class XiaoyuanReservatConfigVo implements Serializable {
     @ExcelProperty(value = "校园预约配置ID")
     private Long reservatConfigId;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 教职工姓名
      */
@@ -61,25 +66,25 @@ public class XiaoyuanReservatConfigVo implements Serializable {
      * 教职工可预约时间上午开始
      */
     @ExcelProperty(value = "教职工可预约时间上午开始")
-    private Date reservatConfigTimeAmBegin;
+    private String reservatConfigTimeAmBegin;
 
     /**
      * 教职工可预约时间上午结束
      */
     @ExcelProperty(value = "教职工可预约时间上午结束")
-    private Date reservatConfigTimeAmEnd;
+    private String reservatConfigTimeAmEnd;
 
     /**
      * 教职工可预约时间下午开始
      */
     @ExcelProperty(value = "教职工可预约时间下午开始")
-    private Date reservatConfigTimePmBegin;
+    private String reservatConfigTimePmBegin;
 
     /**
      * 教职工可预约时间下午结束
      */
     @ExcelProperty(value = "教职工可预约时间下午结束")
-    private Date reservatConfigTimePmEnd;
+    private String reservatConfigTimePmEnd;
 
     /**
      * 可预约次数

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

@@ -36,6 +36,11 @@ public class XiaoyuanReservatVo implements Serializable {
     @ExcelProperty(value = "校园预约ID")
     private Long reservatId;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 教职工姓名
      */

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

@@ -1,5 +1,8 @@
 package org.dromara.system.service.impl.reservat;
 
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+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.page.TableDataInfo;
@@ -8,6 +11,7 @@ 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.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.reservat.XiaoyuanReservat;
 import org.dromara.system.domain.reservat.bo.XiaoyuanReservatBo;
 import org.dromara.system.domain.reservat.vo.XiaoyuanReservatVo;
@@ -62,6 +66,7 @@ public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
         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.eq(StringUtils.isNotBlank(bo.getTenantId()), XiaoyuanReservat::getTenantId, bo.getTenantId());
         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());
@@ -117,4 +122,35 @@ public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 校园预约核销
+     *
+     * @param reservatId
+     */
+    @Override
+    public R<Void> cav(Long reservatId) {
+        LoginUser user = LoginHelper.getLoginUser();
+        //查询数据库是否存在数据
+        XiaoyuanReservatBo bo = new XiaoyuanReservatBo();
+        bo.setReservatId(reservatId);
+        bo.setTenantId(user.getTenantId());
+        LambdaQueryWrapper<XiaoyuanReservat> lqw = buildQueryWrapper(bo);
+        List<XiaoyuanReservatVo> reservatVoList = baseMapper.selectVoList(lqw);
+        if(reservatVoList==null || reservatVoList.size()<=0){
+            return R.fail("无当前学校预约，核销失败");
+        }
+        int i = 0;
+        for (XiaoyuanReservatVo xiaoyuanReservatVo : reservatVoList) {
+            XiaoyuanReservat update = new XiaoyuanReservat();
+            update.setReservatId(xiaoyuanReservatVo.getReservatId());
+            update.setVisitStatus("2");
+            i = baseMapper.updateById(update);
+        }
+        if(i>0){
+            return R.ok("核销成功");
+        }else{
+            return R.fail("核销失败");
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package org.dromara.system.service.reservat;
 
 
+import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.system.domain.reservat.bo.XiaoyuanReservatBo;
@@ -46,4 +47,11 @@ public interface IXiaoyuanReservatService {
      * 校验并批量删除校园预约信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 校园预约核销
+     *
+     * @param bo
+     */
+    R<Void> cav(Long reservatId);
 }