Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -62,17 +62,7 @@ import com.xjrsoft.module.organization.service.IUserRoleRelationService;
 import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.organization.service.IUserStudentService;
 import com.xjrsoft.module.organization.utils.OrganizationUtil;
-import com.xjrsoft.module.organization.vo.PendingCountDto;
-import com.xjrsoft.module.organization.vo.ResetUserPageVo;
-import com.xjrsoft.module.organization.vo.ResetUserRoleVo;
-import com.xjrsoft.module.organization.vo.UserDeptVo;
-import com.xjrsoft.module.organization.vo.UserInfoVo;
-import com.xjrsoft.module.organization.vo.UserListVo;
-import com.xjrsoft.module.organization.vo.UserPageVo;
-import com.xjrsoft.module.organization.vo.UserPostVo;
-import com.xjrsoft.module.organization.vo.UserRoleVo;
-import com.xjrsoft.module.organization.vo.UserStudentVo;
-import com.xjrsoft.module.organization.vo.UserVo;
+import com.xjrsoft.module.organization.vo.*;
 import com.xjrsoft.module.oss.factory.OssFactory;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.system.entity.File;
@@ -281,6 +271,23 @@ public class UserController {
         return R.ok(userVo);
     }
 
+    @GetMapping(value = "/detail")
+    @ApiOperation(value = "根据id查询用户信息")
+    public RT<UserDetailVo> detail(@RequestParam Long id) {
+        User user = userService.getById(id);
+        if (user == null) {
+            R.error("找不到此用户！");
+        }
+        UserDetailVo userVo = BeanUtil.toBean(user, UserDetailVo.class);
+        List<Long> deptIds = userDeptRelationService.list(Wrappers.lambdaQuery(UserDeptRelation.class)
+                        .eq(UserDeptRelation::getUserId, user.getId()))
+                .stream().map(UserDeptRelation::getDeptId).collect(Collectors.toList());
+        String allDeptIdStr = StrUtil.join(StringPool.COMMA, deptIds);
+        userVo.setDepartmentIds(allDeptIdStr);
+
+        return RT.ok(userVo);
+    }
+
     @PostMapping
     @ApiOperation(value = "新增用户")
     public R add(@Valid @RequestBody AddUserDto dto) {

src/main/java/com/xjrsoft/module/organization/vo/UserDetailVo.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.organization.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class UserDetailVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    private String id;
+    /**
+     * 账户
+     */
+    @ApiModelProperty("账户")
+    private String userName;
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String mobile;
+    /**
+     * 邮箱
+     */
+    @ApiModelProperty("邮箱")
+    private String email;
+    /**
+     * 部门
+     */
+    @ApiModelProperty("部门")
+    private String departmentIds;
+    /**
+     * 身份证
+     */
+    @ApiModelProperty("身份证")
+    private String credentialNumber;
+}

src/main/java/com/xjrsoft/module/personnel/controller/CarMessageApplyController.java

@@ -0,0 +1,149 @@
+package com.xjrsoft.module.personnel.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
+import com.xjrsoft.module.app.entity.AppFuncDesign;
+import com.xjrsoft.module.app.entity.AppMenu;
+import com.xjrsoft.module.personnel.dto.AddCarMessageApplyDto;
+import com.xjrsoft.module.personnel.dto.UpdateCarMessageApplyDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.personnel.dto.CarMessageApplyPageDto;
+import com.xjrsoft.module.personnel.entity.CarMessageApply;
+import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
+import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
+import com.xjrsoft.module.personnel.service.ICarMessageApplyService;
+import com.xjrsoft.module.personnel.vo.CarMessageApplyPageVo;
+
+import com.xjrsoft.module.personnel.vo.CarMessageApplyVo;
+import com.xjrsoft.module.personnel.vo.StundentFaceProcessPageVo;
+import com.xjrsoft.module.personnel.vo.TeacherFaceProcessPageVo;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 车辆信息审核
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/personnel" + "/carMessageApply")
+@Api(value = "/personnel"  + "/carMessageApply",tags = "车辆信息审核代码")
+@AllArgsConstructor
+public class CarMessageApplyController {
+
+
+    private final ICarMessageApplyService carMessageApplyService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="车辆信息审核列表(分页)")
+    @SaCheckPermission("carmessageapply:detail")
+    public RT<PageOutput<CarMessageApplyPageVo>> page(@Valid CarMessageApplyPageDto dto){
+        IPage<CarMessageApplyPageVo> page = carMessageApplyService.selectJoinListPage(ConventPage.getPage(dto), CarMessageApplyPageVo.class,
+                MPJWrappers.<CarMessageApply>lambdaJoin()
+                        .orderByDesc(CarMessageApply::getId)
+                        .disableSubLogicDel()
+                        .like(StrUtil.isNotBlank(dto.getName()), XjrUser::getName,dto.getName())
+                        .eq(StrUtil.isNotBlank(dto.getUserName()), XjrUser::getUserName,dto.getUserName())
+                        .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
+                        .eq(ObjectUtil.isNotNull(dto.getDepId())&&dto.getDepId()!=0, CarMessageApply::getDeptId,dto.getDepId())
+                        .eq(ObjectUtil.isNotNull(dto.getStatus())&&dto.getStatus()!=0, CarMessageApply::getStatus,dto.getStatus())
+                        .select(CarMessageApply.class,x -> VoToColumnUtil.fieldsToColumns(CarMessageApplyPageVo.class).contains(x.getProperty()))
+                        .select(CarMessageApply::getId)
+                        .leftJoin(XjrUser.class,XjrUser::getId,CarMessageApply::getUserId, ext->ext.selectAs(XjrUser::getUserName, CarMessageApplyPageVo::getUserName).select(XjrUser::getMobile))
+                        .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,CarMessageApply::getGender, ext->ext.selectAs(DictionaryDetail::getName, CarMessageApplyPageVo::getGender))
+                );
+        PageOutput<CarMessageApplyPageVo> pageOutput = ConventPage.getPageOutput(page, CarMessageApplyPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/mobile-list")
+    @ApiOperation(value="我的车辆(列表)")
+    @SaCheckPermission("carmessageapply:detail")
+    public RT<List<CarMessageApplyPageVo>> mobileList(){
+        List<CarMessageApplyPageVo> list = carMessageApplyService.selectJoinList(CarMessageApplyPageVo.class,
+                MPJWrappers.<CarMessageApply>lambdaJoin()
+                        .orderByDesc(CarMessageApply::getId)
+                        .eq(CarMessageApply::getUserId, StpUtil.getLoginIdAsLong())
+                        .eq(CarMessageApply::getStatus,1)
+                        .select(CarMessageApply::getId)
+                        .select(CarMessageApply.class,x -> VoToColumnUtil.fieldsToColumns(CarMessageApplyPageVo.class).contains(x.getProperty())));
+        return RT.ok(list);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询车辆信息审核信息")
+    @SaCheckPermission("carmessageapply:detail")
+    public RT<CarMessageApplyVo> info(@RequestParam Long id){
+        CarMessageApply carMessageApply = carMessageApplyService.getById(id);
+        if (carMessageApply == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(carMessageApply, CarMessageApplyVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增车辆信息审核")
+    @SaCheckPermission("carmessageapply:add")
+    public RT<Boolean> add(@Valid @RequestBody AddCarMessageApplyDto dto){
+        CarMessageApply carMessageApply = BeanUtil.toBean(dto, CarMessageApply.class);
+        boolean isSuccess = carMessageApplyService.save(carMessageApply);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改车辆信息审核")
+    @SaCheckPermission("carmessageapply:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateCarMessageApplyDto dto){
+
+        CarMessageApply carMessageApply = BeanUtil.toBean(dto, CarMessageApply.class);
+        return RT.ok(carMessageApplyService.updateById(carMessageApply));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除车辆信息审核")
+    @SaCheckPermission("carmessageapply:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(carMessageApplyService.removeBatchByIds(ids));
+
+    }
+
+    @PutMapping("/update-continue")
+    @ApiOperation(value = "修改续期状态")
+    @SaCheckPermission("carmessageapply:update-continue")
+    public R updateContinue(@Valid @RequestBody UpdateEnableMarkDto dto) {
+        CarMessageApply carMessageApply=new CarMessageApply();
+        carMessageApply.setId(dto.getId());
+        carMessageApply.setIsContinue(dto.getEnabledMark());
+        carMessageApplyService.updateById(carMessageApply);
+        return R.ok(true);
+    }
+
+}

src/main/java/com/xjrsoft/module/personnel/controller/ReservationSchoolController.java

@@ -0,0 +1,200 @@
+package com.xjrsoft.module.personnel.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.QrCodeUtil;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.config.CommonPropertiesConfig;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.personnel.dto.AddReservationSchoolDto;
+import com.xjrsoft.module.personnel.dto.ReservationSchoolVisitorPageDto;
+import com.xjrsoft.module.personnel.dto.UpdateReservationSchoolDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.personnel.dto.ReservationSchoolPageDto;
+import com.xjrsoft.module.personnel.entity.ReservationSchool;
+import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
+import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
+import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
+import com.xjrsoft.module.personnel.service.IReservationSchoolService;
+import com.xjrsoft.module.personnel.vo.ReservationSchoolPageVo;
+
+import com.xjrsoft.module.personnel.vo.ReservationSchoolVisitorPageVo;
+import com.xjrsoft.module.personnel.vo.ReservationSchoolVo;
+import com.xjrsoft.module.personnel.vo.StundentFaceProcessPageVo;
+import com.xjrsoft.module.room.entity.RoomValueWeek;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 预约进校
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/personnel" + "/reservationSchool")
+@Api(value = "/personnel"  + "/reservationSchool",tags = "预约进校代码")
+@AllArgsConstructor
+public class ReservationSchoolController {
+
+
+    private final IReservationSchoolService reservationSchoolService;
+    private final CommonPropertiesConfig commonPropertiesConfig;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="预约进校列表(分页)")
+    @SaCheckPermission("reservationschool:detail")
+    public RT<PageOutput<ReservationSchoolPageVo>> page(@Valid ReservationSchoolPageDto dto){
+
+        LambdaQueryWrapper<ReservationSchool> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(ReservationSchool::getId)
+                .select(ReservationSchool.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolPageVo.class).contains(x.getProperty()));
+
+        if(ObjectUtil.isNotNull(dto.getType())) {
+            Date date = new Date();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            if (dto.getType() == 1) {
+                queryWrapper.le(ReservationSchool::getStartTime, sdf.format(date))
+                        .ge(ReservationSchool::getEndTime, sdf.format(date));
+            }
+            if (dto.getType() == 2) {
+                queryWrapper.and(ext->ext.ge(ReservationSchool::getStartTime, sdf.format(date)).or(eee->eee.le(ReservationSchool::getEndTime, sdf.format(date))));
+            }
+        }
+
+        IPage<ReservationSchool> page = reservationSchoolService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<ReservationSchoolPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/my-visitor-page")
+    @ApiOperation(value="我的访客(分页)")
+    @SaCheckPermission("reservationschool:detail")
+    public RT<PageOutput<ReservationSchoolVisitorPageVo>> myVisitorPage(@Valid ReservationSchoolVisitorPageDto dto){
+        IPage<ReservationSchoolVisitorPageVo> page = reservationSchoolService.selectJoinListPage(ConventPage.getPage(dto),
+                ReservationSchoolVisitorPageVo.class
+                , MPJWrappers.<ReservationSchool>lambdaJoin()
+                        .orderByDesc(ReservationSchoolPeople::getId)
+                        .disableSubLogicDel()
+                         .eq(ReservationSchool::getRespondentUserId,StpUtil.getLoginIdAsLong())
+                        .le(ObjectUtil.isNotNull(dto.getVisitTime()),ReservationSchool::getStartTime,dto.getVisitTime())
+                        .ge(ObjectUtil.isNotNull(dto.getVisitTime()),ReservationSchool::getEndTime,dto.getVisitTime())
+                        .like(ObjectUtil.isNotNull(dto.getName()),ReservationSchoolPeople::getName,dto.getName())
+                        .select(ReservationSchoolPeople::getId)
+                        .select(ReservationSchool.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
+                        .leftJoin(ReservationSchoolPeople.class,ReservationSchoolPeople::getReservationSchooId,ReservationSchool::getId)
+                        .select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
+        );
+        PageOutput<ReservationSchoolVisitorPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolVisitorPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/visitor-page")
+    @ApiOperation(value="访客记录(分页)")
+    @SaCheckPermission("reservationschool:detail")
+    public RT<PageOutput<ReservationSchoolVisitorPageVo>> visitorPage(@Valid ReservationSchoolVisitorPageDto dto){
+        IPage<ReservationSchoolVisitorPageVo> page = reservationSchoolService.selectJoinListPage(ConventPage.getPage(dto),
+                ReservationSchoolVisitorPageVo.class
+                , MPJWrappers.<ReservationSchool>lambdaJoin()
+                        .orderByDesc(ReservationSchoolPeople::getId)
+                        .disableSubLogicDel()
+                        .le(ObjectUtil.isNotNull(dto.getVisitTime()),ReservationSchool::getStartTime,dto.getVisitTime())
+                        .ge(ObjectUtil.isNotNull(dto.getVisitTime()),ReservationSchool::getEndTime,dto.getVisitTime())
+                        .like(!StrUtil.isEmpty(dto.getName()),ReservationSchoolPeople::getName,dto.getName())
+                        .like(ObjectUtil.isNotNull(dto.getIdentityCard()),ReservationSchoolPeople::getIdentityCard,dto.getIdentityCard())
+                        .eq(ObjectUtil.isNotEmpty(dto.getDeptId())&&dto.getDeptId()!=0,ReservationSchool::getDeptId,dto.getDeptId())
+                        .select(ReservationSchoolPeople::getId)
+                        .selectAs(ReservationSchoolPeople::getReservationSchooId,ReservationSchoolVisitorPageVo::getPId)
+                        .select(ReservationSchool.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
+                        .leftJoin(ReservationSchoolPeople.class,ReservationSchoolPeople::getReservationSchooId,ReservationSchool::getId)
+                        .leftJoin(Department.class,Department::getId,ReservationSchool::getDeptId,ext->ext.selectAs(Department::getName,ReservationSchoolVisitorPageVo::getDeptCn))
+                        .leftJoin(XjrUser.class,XjrUser::getId,ReservationSchool::getRespondentUserId,ext->ext.selectAs(XjrUser::getName,ReservationSchoolVisitorPageVo::getRespondentUserCn))
+                        .select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
+                        .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, ReservationSchoolPeople::getGender, ext->ext.selectAs(DictionaryDetail::getName, ReservationSchoolVisitorPageVo::getGender))
+        );
+        PageOutput<ReservationSchoolVisitorPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolVisitorPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询预约进校信息")
+    @SaCheckPermission("reservationschool:detail")
+    public RT<ReservationSchoolVo> info(@RequestParam Long id){
+        ReservationSchool reservationSchool = reservationSchoolService.getByIdDeep(id);
+        if (reservationSchool == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(reservationSchool, ReservationSchoolVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增预约进校")
+    @SaCheckPermission("reservationschool:add")
+    public RT<Boolean> add(@Valid @RequestBody AddReservationSchoolDto dto){
+        ReservationSchool reservationSchool = BeanUtil.toBean(dto, ReservationSchool.class);
+        boolean isSuccess = reservationSchoolService.add(reservationSchool);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改预约进校")
+    @SaCheckPermission("reservationschool:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateReservationSchoolDto dto){
+
+        ReservationSchool reservationSchool = BeanUtil.toBean(dto, ReservationSchool.class);
+        return RT.ok(reservationSchoolService.update(reservationSchool));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除预约进校")
+    @SaCheckPermission("reservationschool:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(reservationSchoolService.delete(ids));
+
+    }
+
+    @GetMapping(value = "/info-qrcode")
+    @ApiOperation(value="预约进校-生成二维码")
+    @SaCheckPermission("reservationschool:detail")
+    public RT<String> qrcode(@RequestParam Long id) throws Exception {
+        String url = "接口生成二维码";
+        int width = 200;
+        int height = 200;
+        int margin = 1;
+
+        try {
+            String base64 = QrCodeUtil.createBase64(url, width, height, margin);
+            return RT.ok(base64);
+        } catch (Exception e) {
+            throw e;
+        }
+
+    }
+
+}

src/main/java/com/xjrsoft/module/personnel/dto/AddCarMessageApplyDto.java

@@ -0,0 +1,85 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 车辆信息审核
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+@Data
+public class AddCarMessageApplyDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+    /**
+    * 有效期开始日期
+    */
+    @ApiModelProperty("有效期开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+    /**
+    * 有效期结束日期
+    */
+    @ApiModelProperty("有效期结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+    * 车辆类型
+    */
+    @ApiModelProperty("车辆类型")
+    private String vehicleType;
+    /**
+    * 车牌号
+    */
+    @ApiModelProperty("车牌号")
+    private String carNumber;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 部门审核人用户id
+    */
+    @ApiModelProperty("部门审核人用户id")
+    private Long deptLederUserId;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
+    private  Long userId;
+
+}

src/main/java/com/xjrsoft/module/personnel/dto/AddReservationSchoolDto.java

@@ -0,0 +1,74 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
+
+
+
+/**
+* @title: 预约进校
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Data
+public class AddReservationSchoolDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 进校事由
+    */
+    @ApiModelProperty("进校事由")
+    private String reason;
+    /**
+    * 到访部门id
+    */
+    @ApiModelProperty("到访部门id")
+    private Long deptId;
+    /**
+    * 被访人用户id
+    */
+    @ApiModelProperty("被访人用户id")
+    private Long respondentUserId;
+    /**
+    * 进校时间
+    */
+    @ApiModelProperty("进校时间")
+    private Date startTime;
+    /**
+    * 离校时间
+    */
+    @ApiModelProperty("离校时间")
+    private Date endTime;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 拜访时间
+    */
+    @ApiModelProperty("拜访时间")
+    private Integer time;
+    /**
+    * 部门负责人id
+    */
+    @ApiModelProperty("部门负责人id")
+    private Long  deptUserId;
+
+    /**
+    * reservationSchoolPeople
+    */
+    @ApiModelProperty("reservationSchoolPeople子表")
+    private List<AddReservationSchoolPeopleDto> reservationSchoolPeopleList;
+}

src/main/java/com/xjrsoft/module/personnel/dto/AddStundentFaceProcessDto.java.1715339624539.bak → src/main/java/com/xjrsoft/module/personnel/dto/AddReservationSchoolPeopleDto.java

@@ -14,60 +14,50 @@ import java.util.Date;
 
 
 /**
-* @title: 学生人脸信息审核
+* @title: 预约进校-进校人员
 * @Author dzx
-* @Date: 2024-05-10
+* @Date: 2024-05-11
 * @Version 1.0
 */
 @Data
-public class AddStundentFaceProcessDto implements Serializable {
+public class AddReservationSchoolPeopleDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-    * 用户id
+    * 预约进校编号
     */
-    @ApiModelProperty("用户id")
-    private Long userId;
+    @ApiModelProperty("预约进校编号")
+    private Long reservationSchooId;
     /**
-    * 
+    * 姓名
     */
-    @ApiModelProperty("")
+    @ApiModelProperty("姓名")
     private String name;
     /**
-    * 班级id
+    * 身份证号
     */
-    @ApiModelProperty("班级id")
-    private Long classId;
+    @ApiModelProperty("身份证号")
+    private String identityCard;
     /**
-    * 
+    * 手机号码
     */
-    @ApiModelProperty("")
-    private String classCn;
+    @ApiModelProperty("手机号码")
+    private Long phone;
     /**
     * 性别
     */
     @ApiModelProperty("性别")
     private String gender;
     /**
-    * 身份证号
-    */
-    @ApiModelProperty("身份证号")
-    private String identityCard;
-    /**
-    * 人脸照片
-    */
-    @ApiModelProperty("人脸照片")
-    private Long facePhoto;
-    /**
-    * 状态(0:未结束 1:结束)
+    * 是否开车
     */
-    @ApiModelProperty("状态(0:未结束 1:结束)")
-    private Integer status;
+    @ApiModelProperty("是否开车")
+    private String isCar;
     /**
-    * 班主任id
+    * 车牌号
     */
-    @ApiModelProperty("班主任id")
-    private Long teacherId;
+    @ApiModelProperty("车牌号")
+    private String plateNumber;
 
 }

src/main/java/com/xjrsoft/module/personnel/dto/CarMessageApplyPageDto.java

@@ -0,0 +1,50 @@
+package com.xjrsoft.module.personnel.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 车辆信息审核分页查询入参
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CarMessageApplyPageDto extends PageInput {
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long depId;
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+     * 账户
+     */
+    @ApiModelProperty("账户")
+    private String userName;
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String mobile;
+    /**
+     * 状态(0:未结束 1:结束)
+     */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+}

src/main/java/com/xjrsoft/module/personnel/dto/StundentFaceProcessPageDto.java.1715339624538.bak → src/main/java/com/xjrsoft/module/personnel/dto/ReservationSchoolPageDto.java

@@ -13,14 +13,17 @@ import java.util.Date;
 
 
 /**
-* @title: 学生人脸信息审核分页查询入参
+* @title: 预约进校分页查询入参
 * @Author dzx
-* @Date: 2024-05-10
+* @Date: 2024-05-11
 * @Version 1.0
 */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class StundentFaceProcessPageDto extends PageInput {
-
-
+public class ReservationSchoolPageDto extends PageInput {
+    /**
+     * 类型 1生效中 2 历史预约
+     */
+    @ApiModelProperty("类型 1生效中 2 历史预约")
+    private Integer type;
 }

src/main/java/com/xjrsoft/module/personnel/dto/ReservationSchoolVisitorPageDto.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.personnel.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ReservationSchoolVisitorPageDto extends PageInput {
+    /**
+     * 访问时间 yyyy-MM-dd
+     */
+    @ApiModelProperty("访问时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime visitTime;
+
+    /**
+     * 访客名称
+     */
+    @ApiModelProperty("访客名称")
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+
+    /**
+     * 到访部门id
+     */
+    @ApiModelProperty("到访部门id")
+    private Long deptId;
+}

src/main/java/com/xjrsoft/module/personnel/dto/UpdateStundentFaceProcessDto.java.1715339624540.bak → src/main/java/com/xjrsoft/module/personnel/dto/UpdateCarMessageApplyDto.java

@@ -14,13 +14,13 @@ import java.util.Date;
 
 
 /**
-* @title: 学生人脸信息审核
+* @title: 车辆信息审核
 * @Author dzx
-* @Date: 2024-05-10
+* @Date: 2024-05-12
 * @Version 1.0
 */
 @Data
-public class UpdateStundentFaceProcessDto extends AddStundentFaceProcessDto {
+public class UpdateCarMessageApplyDto extends AddCarMessageApplyDto {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/xjrsoft/module/personnel/dto/UpdateReservationSchoolDto.java

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
+
+
+
+/**
+* @title: 预约进校
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Data
+public class UpdateReservationSchoolDto extends AddReservationSchoolDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/personnel/entity/CarMessageApply.java

@@ -0,0 +1,136 @@
+package com.xjrsoft.module.personnel.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 车辆信息审核
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+@Data
+@TableName("car_message_apply")
+@ApiModel(value = "car_message_apply", description = "车辆信息审核")
+public class CarMessageApply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人id
+    */
+    @ApiModelProperty("修改人id")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+    /**
+    * 有效期开始日期
+    */
+    @ApiModelProperty("有效期开始日期")
+    private Date startTime;
+    /**
+    * 有效期结束日期
+    */
+    @ApiModelProperty("有效期结束日期")
+    private Date endTime;
+    /**
+    * 车辆类型
+    */
+    @ApiModelProperty("车辆类型")
+    private String vehicleType;
+    /**
+    * 车牌号
+    */
+    @ApiModelProperty("车牌号")
+    private String carNumber;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 部门审核人用户id
+    */
+    @ApiModelProperty("部门审核人用户id")
+    private Long deptLederUserId;
+    /**
+     * 续期 (0:未续期 1:已续期)
+     */
+    @ApiModelProperty("续期 (0:未续期 1:已续期)")
+    private Integer isContinue;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
+    private  Long userId;
+}

src/main/java/com/xjrsoft/module/personnel/entity/ReservationSchool.java

@@ -0,0 +1,125 @@
+package com.xjrsoft.module.personnel.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 预约进校
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Data
+@TableName("reservation_school")
+@ApiModel(value = "reservation_school", description = "预约进校")
+public class ReservationSchool implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人id
+    */
+    @ApiModelProperty("修改人id")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 进校事由
+    */
+    @ApiModelProperty("进校事由")
+    private String reason;
+    /**
+    * 到访部门id
+    */
+    @ApiModelProperty("到访部门id")
+    private Long deptId;
+    /**
+    * 被访人用户id
+    */
+    @ApiModelProperty("被访人用户id")
+    private Long respondentUserId;
+    /**
+    * 进校时间
+    */
+    @ApiModelProperty("进校时间")
+    private Date startTime;
+    /**
+    * 离校时间
+    */
+    @ApiModelProperty("离校时间")
+    private Date endTime;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 拜访时间
+    */
+    @ApiModelProperty("拜访时间")
+    private Integer time;
+    /**
+    * 部门负责人id
+    */
+    @ApiModelProperty("部门负责人id")
+    private Long  deptUserId;
+
+    /**
+    * reservationSchoolPeople
+    */
+    @ApiModelProperty("reservationSchoolPeople子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "reservationSchooId")
+    private List<ReservationSchoolPeople> reservationSchoolPeopleList;
+
+}

src/main/java/com/xjrsoft/module/personnel/entity/ReservationSchoolPeople.java

@@ -0,0 +1,113 @@
+package com.xjrsoft.module.personnel.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 预约进校-进校人员
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Data
+@TableName("reservation_school_people")
+@ApiModel(value = "reservation_school_people", description = "预约进校-进校人员")
+public class ReservationSchoolPeople implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 预约进校编号
+    */
+    @ApiModelProperty("预约进校编号")
+    private Long reservationSchooId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+    /**
+    * 手机号码
+    */
+    @ApiModelProperty("手机号码")
+    private Long phone;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 是否开车
+    */
+    @ApiModelProperty("是否开车")
+    private String isCar;
+    /**
+    * 车牌号
+    */
+    @ApiModelProperty("车牌号")
+    private String plateNumber;
+
+
+}

src/main/java/com/xjrsoft/module/personnel/mapper/StundentFaceProcessMapper.java.1715339624552.bak → src/main/java/com/xjrsoft/module/personnel/mapper/CarMessageApplyMapper.java

@@ -2,16 +2,16 @@ package com.xjrsoft.module.personnel.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
+import com.xjrsoft.module.personnel.entity.CarMessageApply;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
-* @title: 学生人脸信息审核
+* @title: 车辆信息审核
 * @Author dzx
-* @Date: 2024-05-10
+* @Date: 2024-05-12
 * @Version 1.0
 */
 @Mapper
-public interface StundentFaceProcessMapper extends MPJBaseMapper<StundentFaceProcess> {
+public interface CarMessageApplyMapper extends MPJBaseMapper<CarMessageApply> {
 
 }

src/main/java/com/xjrsoft/module/personnel/mapper/ReservationSchoolMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.personnel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.personnel.entity.ReservationSchool;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 预约进校
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Mapper
+public interface ReservationSchoolMapper extends MPJBaseMapper<ReservationSchool> {
+
+}

src/main/java/com/xjrsoft/module/personnel/mapper/ReservationSchoolPeopleMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.personnel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 预约进校-进校人员
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Mapper
+public interface ReservationSchoolPeopleMapper extends MPJBaseMapper<ReservationSchoolPeople> {
+
+}

src/main/java/com/xjrsoft/module/personnel/service/ICarMessageApplyService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.personnel.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.personnel.entity.CarMessageApply;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 车辆信息审核
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+
+public interface ICarMessageApplyService extends MPJBaseService<CarMessageApply> {
+}

src/main/java/com/xjrsoft/module/personnel/service/IReservationSchoolService.java

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.personnel.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.personnel.entity.ReservationSchool;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 预约进校
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+
+public interface IReservationSchoolService extends MPJBaseService<ReservationSchool> {
+    /**
+    * 新增
+    *
+    * @param reservationSchool
+    * @return
+    */
+    Boolean add(ReservationSchool reservationSchool);
+
+    /**
+    * 更新
+    *
+    * @param reservationSchool
+    * @return
+    */
+    Boolean update(ReservationSchool reservationSchool);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

src/main/java/com/xjrsoft/module/personnel/service/impl/CarMessageApplyServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.personnel.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.personnel.entity.CarMessageApply;
+import com.xjrsoft.module.personnel.mapper.CarMessageApplyMapper;
+import com.xjrsoft.module.personnel.service.ICarMessageApplyService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 车辆信息审核
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class CarMessageApplyServiceImpl extends MPJBaseServiceImpl<CarMessageApplyMapper, CarMessageApply> implements ICarMessageApplyService {
+}

src/main/java/com/xjrsoft/module/personnel/service/impl/ReservationSchoolServiceImpl.java

@@ -0,0 +1,88 @@
+package com.xjrsoft.module.personnel.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
+import com.xjrsoft.module.personnel.mapper.ReservationSchoolPeopleMapper;
+import com.xjrsoft.module.personnel.entity.ReservationSchool;
+import com.xjrsoft.module.personnel.mapper.ReservationSchoolMapper;
+import com.xjrsoft.module.personnel.service.IReservationSchoolService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 预约进校
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class ReservationSchoolServiceImpl extends MPJBaseServiceImpl<ReservationSchoolMapper, ReservationSchool> implements IReservationSchoolService {
+    private final ReservationSchoolMapper reservationSchoolReservationSchoolMapper;
+
+    private final ReservationSchoolPeopleMapper reservationSchoolReservationSchoolPeopleMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(ReservationSchool reservationSchool) {
+        reservationSchoolReservationSchoolMapper.insert(reservationSchool);
+        for (ReservationSchoolPeople reservationSchoolPeople : reservationSchool.getReservationSchoolPeopleList()) {
+            reservationSchoolPeople.setReservationSchooId(reservationSchool.getId());
+            reservationSchoolReservationSchoolPeopleMapper.insert(reservationSchoolPeople);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(ReservationSchool reservationSchool) {
+        reservationSchoolReservationSchoolMapper.updateById(reservationSchool);
+        //********************************* ReservationSchoolPeople  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<ReservationSchoolPeople> reservationSchoolPeopleList = reservationSchoolReservationSchoolPeopleMapper.selectList(Wrappers.lambdaQuery(ReservationSchoolPeople.class).eq(ReservationSchoolPeople::getReservationSchooId, reservationSchool.getId()).select(ReservationSchoolPeople::getId));
+            List<Long> reservationSchoolPeopleIds = reservationSchoolPeopleList.stream().map(ReservationSchoolPeople::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> reservationSchoolPeopleOldIds = reservationSchool.getReservationSchoolPeopleList().stream().map(ReservationSchoolPeople::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> reservationSchoolPeopleRemoveIds = reservationSchoolPeopleIds.stream().filter(item -> !reservationSchoolPeopleOldIds.contains(item)).collect(Collectors.toList());
+
+            for (ReservationSchoolPeople reservationSchoolPeople : reservationSchool.getReservationSchoolPeopleList()) {
+                //如果不等于空则修改
+                if (reservationSchoolPeople.getId() != null) {
+                    reservationSchoolReservationSchoolPeopleMapper.updateById(reservationSchoolPeople);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    reservationSchoolPeople.setReservationSchooId(reservationSchool.getId());
+                    reservationSchoolReservationSchoolPeopleMapper.insert(reservationSchoolPeople);
+                }
+            }
+            //已经不存在的id 删除
+            if(reservationSchoolPeopleRemoveIds.size() > 0){
+                reservationSchoolReservationSchoolPeopleMapper.deleteBatchIds(reservationSchoolPeopleRemoveIds);
+            }
+        }
+        //********************************* ReservationSchoolPeople  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        reservationSchoolReservationSchoolMapper.deleteBatchIds(ids);
+        reservationSchoolReservationSchoolPeopleMapper.delete(Wrappers.lambdaQuery(ReservationSchoolPeople.class).in(ReservationSchoolPeople::getReservationSchooId, ids));
+
+        return true;
+    }
+}

src/main/java/com/xjrsoft/module/personnel/vo/CarMessageApplyPageVo.java

@@ -0,0 +1,129 @@
+package com.xjrsoft.module.personnel.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 车辆信息审核分页列表出参
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+@Data
+public class CarMessageApplyPageVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人id
+    */
+    @ApiModelProperty("修改人id")
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    private Integer enabledMark;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+    /**
+    * 有效期开始日期
+    */
+    @ApiModelProperty("有效期开始日期")
+    private Date startTime;
+    /**
+    * 有效期结束日期
+    */
+    @ApiModelProperty("有效期结束日期")
+    private Date endTime;
+    /**
+    * 车辆类型
+    */
+    @ApiModelProperty("车辆类型")
+    private String vehicleType;
+    /**
+    * 车牌号
+    */
+    @ApiModelProperty("车牌号")
+    private String carNumber;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 部门审核人用户id
+    */
+    @ApiModelProperty("部门审核人用户id")
+    private Long deptLederUserId;
+
+    /**
+     * 续期 (0:未续期 1:已续期)
+     */
+    @ApiModelProperty("续期 (0:未续期 1:已续期)")
+    private Integer isContinue;
+    /**
+     * 账户
+     */
+    @ApiModelProperty("账户")
+    private String userName;
+    /**
+     * 手机
+     */
+    @ApiModelProperty("手机")
+    private  String mobile;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
+    private  Long userId;
+}

src/main/java/com/xjrsoft/module/personnel/vo/CarMessageApplyVo.java

@@ -0,0 +1,79 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 车辆信息审核表单出参
+* @Author dzx
+* @Date: 2024-05-12
+* @Version 1.0
+*/
+@Data
+public class CarMessageApplyVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+    /**
+    * 有效期开始日期
+    */
+    @ApiModelProperty("有效期开始日期")
+    private Date startTime;
+    /**
+    * 有效期结束日期
+    */
+    @ApiModelProperty("有效期结束日期")
+    private Date endTime;
+    /**
+    * 车辆类型
+    */
+    @ApiModelProperty("车辆类型")
+    private String vehicleType;
+    /**
+    * 车牌号
+    */
+    @ApiModelProperty("车牌号")
+    private String carNumber;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 部门审核人用户id
+    */
+    @ApiModelProperty("部门审核人用户id")
+    private Long deptLederUserId;
+
+
+
+}

src/main/java/com/xjrsoft/module/personnel/vo/ReservationSchoolPageVo.java

@@ -0,0 +1,99 @@
+package com.xjrsoft.module.personnel.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 预约进校分页列表出参
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Data
+public class ReservationSchoolPageVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人id
+    */
+    @ApiModelProperty("修改人id")
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    private Integer enabledMark;
+    /**
+    * 进校事由
+    */
+    @ApiModelProperty("进校事由")
+    private String reason;
+    /**
+    * 到访部门id
+    */
+    @ApiModelProperty("到访部门id")
+    private Long deptId;
+    /**
+    * 被访人用户id
+    */
+    @ApiModelProperty("被访人用户id")
+    private Long respondentUserId;
+    /**
+    * 进校时间
+    */
+    @ApiModelProperty("进校时间")
+    private Date startTime;
+    /**
+    * 离校时间
+    */
+    @ApiModelProperty("离校时间")
+    private Date endTime;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 拜访时间
+    */
+    @ApiModelProperty("拜访时间")
+    private Integer time;
+    /**
+    * 部门负责人id
+    */
+    @ApiModelProperty("部门负责人id")
+    private Long  deptUserId;
+
+}

src/main/java/com/xjrsoft/module/personnel/vo/ReservationSchoolPeopleVo.java

@@ -0,0 +1,64 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 预约进校-进校人员表单出参
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Data
+public class ReservationSchoolPeopleVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 预约进校编号
+    */
+    @ApiModelProperty("预约进校编号")
+    private Long reservationSchooId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 身份证号
+    */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+    /**
+    * 手机号码
+    */
+    @ApiModelProperty("手机号码")
+    private Long phone;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 是否开车
+    */
+    @ApiModelProperty("是否开车")
+    private String isCar;
+    /**
+    * 车牌号
+    */
+    @ApiModelProperty("车牌号")
+    private String plateNumber;
+
+
+
+}

src/main/java/com/xjrsoft/module/personnel/vo/ReservationSchoolVisitorPageVo.java

@@ -0,0 +1,82 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ReservationSchoolVisitorPageVo {
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    private String id;
+    /**
+     * 主键 主表
+     */
+    @ApiModelProperty("主键 主表")
+    private String pId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+     * 进校事由
+     */
+    @ApiModelProperty("进校事由")
+    private String reason;
+
+    /**
+     * 进校时间
+     */
+    @ApiModelProperty("进校时间")
+    private Date startTime;
+    /**
+     * 离校时间
+     */
+    @ApiModelProperty("离校时间")
+    private Date endTime;
+    /**
+     * 状态(0:未结束 1:结束)
+     */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+     * 拜访时间
+     */
+    @ApiModelProperty("拜访时间")
+    private Integer time;
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty("手机号码")
+    private Long phone;
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+     * 部门
+     */
+    @ApiModelProperty("部门")
+    private String deptCn;
+
+    /**
+     * 被访人用户
+     */
+    @ApiModelProperty("被访人用户")
+    private String respondentUserCn;
+}

src/main/java/com/xjrsoft/module/personnel/vo/ReservationSchoolVo.java

@@ -0,0 +1,75 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.personnel.entity.ReservationSchoolPeople;
+
+/**
+* @title: 预约进校表单出参
+* @Author dzx
+* @Date: 2024-05-11
+* @Version 1.0
+*/
+@Data
+public class ReservationSchoolVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    /**
+    * 进校事由
+    */
+    @ApiModelProperty("进校事由")
+    private String reason;
+    /**
+    * 到访部门id
+    */
+    @ApiModelProperty("到访部门id")
+    private Long deptId;
+    /**
+    * 被访人用户id
+    */
+    @ApiModelProperty("被访人用户id")
+    private Long respondentUserId;
+    /**
+    * 进校时间
+    */
+    @ApiModelProperty("进校时间")
+    private Date startTime;
+    /**
+    * 离校时间
+    */
+    @ApiModelProperty("离校时间")
+    private Date endTime;
+    /**
+    * 状态(0:未结束 1:结束)
+    */
+    @ApiModelProperty("状态(0:未结束 1:结束)")
+    private Integer status;
+    /**
+    * 拜访时间
+    */
+    @ApiModelProperty("拜访时间")
+    private Integer time;
+    /**
+    * 部门负责人id
+    */
+    @ApiModelProperty("部门负责人id")
+    private Long  deptUserId;
+
+
+    /**
+    * reservationSchoolPeople
+    */
+    @ApiModelProperty("reservationSchoolPeople子表")
+    private List<ReservationSchoolPeopleVo> reservationSchoolPeopleList;
+
+}

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -2992,4 +2992,64 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcReservationSchool() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("reservation_school");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("reservation_school_people");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("reservation_school_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("personnel");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+
+    @Test
+    public void gcCarMessageApply() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("car_message_apply");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("personnel");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }