mirror of
https://gitee.com/elegant_wings/xiongan-meeting.git
synced 2025-06-21 09:39:37 +08:00
访客预约功能,和小程序api 接口
This commit is contained in:
parent
02a8520a86
commit
b91cc06d22
@ -1,5 +1,6 @@
|
||||
package com.ics.admin.controller.meeting;
|
||||
|
||||
import com.ics.admin.service.meeting.IVisitorPersonService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
@ -10,29 +11,28 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.ics.common.core.domain.R;
|
||||
import com.ics.common.core.controller.BaseController;
|
||||
import com.ics.admin.domain.meeting.ReservationPerson;
|
||||
import com.ics.admin.service.meeting.IReservationPersonService;
|
||||
import com.ics.admin.domain.meeting.VisitorPerson;
|
||||
import org.wf.jwtp.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* 预约参观人员 提供者
|
||||
* 访客预约表 提供者
|
||||
*
|
||||
* @author chen
|
||||
* @date 2024-02-25
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/meeting/reservationPerson")
|
||||
public class ReservationPersonController extends BaseController {
|
||||
@RequestMapping("/meeting/visitorPerson")
|
||||
public class VisitorPersonController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private IReservationPersonService reservationPersonService;
|
||||
private IVisitorPersonService visitorPersonService;
|
||||
|
||||
/**
|
||||
* 查询预约参观人员
|
||||
*/
|
||||
@GetMapping("get/{id}")
|
||||
public ReservationPerson get(@PathVariable("id") Long id) {
|
||||
return reservationPersonService.selectReservationPersonById(id);
|
||||
public VisitorPerson get(@PathVariable("id") Long id) {
|
||||
return visitorPersonService.selectReservationPersonById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -40,9 +40,9 @@ public class ReservationPersonController extends BaseController {
|
||||
*/
|
||||
@RequiresPermissions("meeting:person:list")
|
||||
@GetMapping("list")
|
||||
public R list(ReservationPerson reservationPerson) {
|
||||
public R list(VisitorPerson visitorPerson) {
|
||||
startPage();
|
||||
return result(reservationPersonService.selectReservationPersonList(reservationPerson));
|
||||
return result(visitorPersonService.selectReservationPersonList(visitorPerson));
|
||||
}
|
||||
|
||||
|
||||
@ -51,8 +51,8 @@ public class ReservationPersonController extends BaseController {
|
||||
*/
|
||||
@RequiresPermissions("meeting:person:add")
|
||||
@PostMapping("save")
|
||||
public R addSave(@RequestBody ReservationPerson reservationPerson) {
|
||||
return toAjax(reservationPersonService.insertReservationPerson(reservationPerson));
|
||||
public R addSave(@RequestBody VisitorPerson visitorPerson) {
|
||||
return toAjax(visitorPersonService.insertReservationPerson(visitorPerson));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -60,8 +60,8 @@ public class ReservationPersonController extends BaseController {
|
||||
*/
|
||||
@RequiresPermissions("meeting:person:edit")
|
||||
@PostMapping("update")
|
||||
public R editSave(@RequestBody ReservationPerson reservationPerson) {
|
||||
return toAjax(reservationPersonService.updateReservationPerson(reservationPerson));
|
||||
public R editSave(@RequestBody VisitorPerson visitorPerson) {
|
||||
return toAjax(visitorPersonService.updateReservationPerson(visitorPerson));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -70,7 +70,7 @@ public class ReservationPersonController extends BaseController {
|
||||
@RequiresPermissions("meeting:person:remove")
|
||||
@PostMapping("remove")
|
||||
public R remove(String ids) {
|
||||
return toAjax(reservationPersonService.deleteReservationPersonByIds(ids));
|
||||
return toAjax(visitorPersonService.deleteReservationPersonByIds(ids));
|
||||
}
|
||||
|
||||
}
|
@ -73,4 +73,7 @@ public class Reservation extends BaseEntity<Reservation> {
|
||||
/** 备注 */
|
||||
private String remake;
|
||||
|
||||
|
||||
private Long serveId;
|
||||
|
||||
}
|
||||
|
@ -1,34 +0,0 @@
|
||||
package com.ics.admin.domain.meeting;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.ics.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 预约参观人员对象 tb_reservation_person
|
||||
*
|
||||
* @author chen
|
||||
* @date 2024-02-25
|
||||
*/
|
||||
@Data
|
||||
@TableName("tb_reservation_person")
|
||||
public class ReservationPerson extends BaseEntity<ReservationPerson> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 用户id */
|
||||
private Long userId;
|
||||
|
||||
/** 预约记录id */
|
||||
private Long reservationId;
|
||||
|
||||
/** 姓名 */
|
||||
private String name;
|
||||
|
||||
/** 手机号 */
|
||||
private Integer phone;
|
||||
|
||||
/** 加入时间 */
|
||||
private Date joinTime;
|
||||
|
||||
}
|
@ -0,0 +1,55 @@
|
||||
package com.ics.admin.domain.meeting;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.ics.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 访客预约人员对象 tb_reservation_person
|
||||
*
|
||||
* @author chen
|
||||
* @date 2024-02-25
|
||||
*/
|
||||
@Data
|
||||
@TableName("tb_visitor_person")
|
||||
public class VisitorPerson extends BaseEntity<VisitorPerson> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 访客id */
|
||||
private Long userId;
|
||||
|
||||
/** 被访人id */
|
||||
private Long intervieweeId;
|
||||
|
||||
/** 姓名 */
|
||||
private String name;
|
||||
|
||||
/** 手机号 */
|
||||
private Integer phone;
|
||||
|
||||
/** 加入时间 */
|
||||
private Date joinTime;
|
||||
|
||||
/** 到访时间 */
|
||||
private Date visitTime;
|
||||
|
||||
/** 离开时间 */
|
||||
private Date leaveTime;
|
||||
|
||||
/** 来访是由 */
|
||||
private String visitContent;
|
||||
|
||||
/** 证件类型 */
|
||||
private String cardType;
|
||||
|
||||
/** 证件号码 */
|
||||
private String cardNo;
|
||||
|
||||
/** 状态 */
|
||||
private Integer status;
|
||||
|
||||
|
||||
private String photo;
|
||||
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
package com.ics.admin.mapper.meeting;
|
||||
|
||||
import com.ics.admin.domain.meeting.ReservationPerson;
|
||||
import com.ics.admin.domain.meeting.VisitorPerson;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@ -13,38 +13,38 @@ import java.util.List;
|
||||
* @date 2024-02-25
|
||||
*/
|
||||
@Mapper
|
||||
public interface ReservationPersonMapper extends BaseMapper<ReservationPerson> {
|
||||
public interface VisitorPersonMapper extends BaseMapper<VisitorPerson> {
|
||||
/**
|
||||
* 查询预约参观人员
|
||||
*
|
||||
* @param id 预约参观人员ID
|
||||
* @return 预约参观人员
|
||||
*/
|
||||
ReservationPerson selectReservationPersonById(Long id);
|
||||
VisitorPerson selectReservationPersonById(Long id);
|
||||
|
||||
/**
|
||||
* 查询预约参观人员列表
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 预约参观人员集合
|
||||
*/
|
||||
List<ReservationPerson> selectReservationPersonList(ReservationPerson reservationPerson);
|
||||
List<VisitorPerson> selectReservationPersonList(VisitorPerson visitorPerson);
|
||||
|
||||
/**
|
||||
* 新增预约参观人员
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
int insertReservationPerson(ReservationPerson reservationPerson);
|
||||
int insertReservationPerson(VisitorPerson visitorPerson);
|
||||
|
||||
/**
|
||||
* 修改预约参观人员
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
int updateReservationPerson(ReservationPerson reservationPerson);
|
||||
int updateReservationPerson(VisitorPerson visitorPerson);
|
||||
|
||||
/**
|
||||
* 删除预约参观人员
|
@ -71,4 +71,5 @@ public interface IIcsCustomerStaffService extends IService<IcsCustomerStaff> {
|
||||
|
||||
IcsCustomerStaff selectUserByOpenid(String openid);
|
||||
|
||||
List<IcsCustomerStaff> selectUserByCustomer(Long customerId);
|
||||
}
|
||||
|
@ -100,4 +100,12 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl<IcsCustomerStaffMap
|
||||
|
||||
return icsCustomerStaffMapper.selectUserByOpenid(openid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<IcsCustomerStaff> selectUserByCustomer(Long customerId) {
|
||||
|
||||
IcsCustomerStaff icsCustomerStaff = new IcsCustomerStaff();
|
||||
icsCustomerStaff.setIcsCustomerId(customerId);
|
||||
return icsCustomerStaffMapper.selectIcsCustomerStaffList(icsCustomerStaff);
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,108 @@
|
||||
package com.ics.admin.service.impl.meeting;
|
||||
|
||||
import java.util.List;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ics.admin.service.meeting.IVisitorPersonService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ics.admin.mapper.meeting.VisitorPersonMapper;
|
||||
import com.ics.admin.domain.meeting.VisitorPerson;
|
||||
|
||||
/**
|
||||
* 预约参观人员Service业务层处理
|
||||
*
|
||||
* @author chen
|
||||
* @date 2024-02-25
|
||||
*/
|
||||
@Service
|
||||
public class IVisitorPersonServiceImpl extends ServiceImpl<VisitorPersonMapper, VisitorPerson> implements IVisitorPersonService {
|
||||
@Autowired
|
||||
private VisitorPersonMapper visitorPersonMapper;
|
||||
|
||||
/**
|
||||
* 查询预约参观人员
|
||||
*
|
||||
* @param id 预约参观人员ID
|
||||
* @return 预约参观人员
|
||||
*/
|
||||
@Override
|
||||
public VisitorPerson selectReservationPersonById(Long id) {
|
||||
return visitorPersonMapper.selectById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询预约参观人员列表
|
||||
*
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 预约参观人员
|
||||
*/
|
||||
@Override
|
||||
public List<VisitorPerson> selectReservationPersonList(VisitorPerson visitorPerson) {
|
||||
QueryWrapper queryWrapper = new QueryWrapper();
|
||||
return visitorPersonMapper.selectList(queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增预约参观人员
|
||||
*
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertReservationPerson(VisitorPerson visitorPerson) {
|
||||
return visitorPersonMapper.insert(visitorPerson);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改预约参观人员
|
||||
*
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateReservationPerson(VisitorPerson visitorPerson) {
|
||||
return visitorPersonMapper.updateById(visitorPerson);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除预约参观人员对象
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReservationPersonByIds(String ids) {
|
||||
String[] idsArray = StrUtil.split(ids,",");
|
||||
return visitorPersonMapper.deleteBatchIds(CollUtil.toList(idsArray));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除预约参观人员信息
|
||||
*
|
||||
* @param id 预约参观人员ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReservationPersonById(Long id) {
|
||||
return visitorPersonMapper.deleteReservationPersonById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<VisitorPerson> selectVisitorRecord(Long customerId) {
|
||||
return visitorPersonMapper.selectList(new QueryWrapper<VisitorPerson>().eq("user_id", customerId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<VisitorPerson> selectVisitorRecordByIntervieweeId(Long intervieweeId) {
|
||||
|
||||
return visitorPersonMapper.selectList(new QueryWrapper<VisitorPerson>().eq("interviewee_id", intervieweeId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateVisitorPersonStatus(VisitorPerson person) {
|
||||
return visitorPersonMapper.updateById(person);
|
||||
}
|
||||
}
|
@ -1,92 +0,0 @@
|
||||
package com.ics.admin.service.impl.meeting;
|
||||
|
||||
import java.util.List;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ics.admin.mapper.meeting.ReservationPersonMapper;
|
||||
import com.ics.admin.domain.meeting.ReservationPerson;
|
||||
import com.ics.admin.service.meeting.IReservationPersonService;
|
||||
|
||||
/**
|
||||
* 预约参观人员Service业务层处理
|
||||
*
|
||||
* @author chen
|
||||
* @date 2024-02-25
|
||||
*/
|
||||
@Service
|
||||
public class ReservationPersonServiceImpl extends ServiceImpl<ReservationPersonMapper, ReservationPerson> implements IReservationPersonService {
|
||||
@Autowired
|
||||
private ReservationPersonMapper reservationPersonMapper;
|
||||
|
||||
/**
|
||||
* 查询预约参观人员
|
||||
*
|
||||
* @param id 预约参观人员ID
|
||||
* @return 预约参观人员
|
||||
*/
|
||||
@Override
|
||||
public ReservationPerson selectReservationPersonById(Long id) {
|
||||
return reservationPersonMapper.selectById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询预约参观人员列表
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @return 预约参观人员
|
||||
*/
|
||||
@Override
|
||||
public List<ReservationPerson> selectReservationPersonList(ReservationPerson reservationPerson) {
|
||||
QueryWrapper queryWrapper = new QueryWrapper();
|
||||
return reservationPersonMapper.selectList(queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增预约参观人员
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertReservationPerson(ReservationPerson reservationPerson) {
|
||||
return reservationPersonMapper.insert(reservationPerson);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改预约参观人员
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateReservationPerson(ReservationPerson reservationPerson) {
|
||||
return reservationPersonMapper.updateById(reservationPerson);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除预约参观人员对象
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReservationPersonByIds(String ids) {
|
||||
String[] idsArray = StrUtil.split(ids,",");
|
||||
return reservationPersonMapper.deleteBatchIds(CollUtil.toList(idsArray));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除预约参观人员信息
|
||||
*
|
||||
* @param id 预约参观人员ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteReservationPersonById(Long id) {
|
||||
return reservationPersonMapper.deleteReservationPersonById(id);
|
||||
}
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
package com.ics.admin.service.meeting;
|
||||
|
||||
import com.ics.admin.domain.meeting.ReservationPerson;
|
||||
import com.ics.admin.domain.meeting.VisitorPerson;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
@ -10,38 +10,38 @@ import java.util.List;
|
||||
* @author chen
|
||||
* @date 2024-02-25
|
||||
*/
|
||||
public interface IReservationPersonService extends IService<ReservationPerson> {
|
||||
public interface IVisitorPersonService extends IService<VisitorPerson> {
|
||||
/**
|
||||
* 查询预约参观人员
|
||||
*
|
||||
* @param id 预约参观人员ID
|
||||
* @return 预约参观人员
|
||||
*/
|
||||
ReservationPerson selectReservationPersonById(Long id);
|
||||
VisitorPerson selectReservationPersonById(Long id);
|
||||
|
||||
/**
|
||||
* 查询预约参观人员列表
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 预约参观人员集合
|
||||
*/
|
||||
List<ReservationPerson> selectReservationPersonList(ReservationPerson reservationPerson);
|
||||
List<VisitorPerson> selectReservationPersonList(VisitorPerson visitorPerson);
|
||||
|
||||
/**
|
||||
* 新增预约参观人员
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
int insertReservationPerson(ReservationPerson reservationPerson);
|
||||
int insertReservationPerson(VisitorPerson visitorPerson);
|
||||
|
||||
/**
|
||||
* 修改预约参观人员
|
||||
*
|
||||
* @param reservationPerson 预约参观人员
|
||||
* @param visitorPerson 预约参观人员
|
||||
* @return 结果
|
||||
*/
|
||||
int updateReservationPerson(ReservationPerson reservationPerson);
|
||||
int updateReservationPerson(VisitorPerson visitorPerson);
|
||||
|
||||
/**
|
||||
* 批量删除预约参观人员
|
||||
@ -58,4 +58,10 @@ public interface IReservationPersonService extends IService<ReservationPerson> {
|
||||
* @return 结果
|
||||
*/
|
||||
int deleteReservationPersonById(Long id);
|
||||
|
||||
List<VisitorPerson> selectVisitorRecord(Long customerId);
|
||||
|
||||
List<VisitorPerson> selectVisitorRecordByIntervieweeId(Long intervieweeId);
|
||||
|
||||
int updateVisitorPersonStatus(VisitorPerson person);
|
||||
}
|
@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="ticketId" column="ticket_id" />
|
||||
<result property="customerId" column="customer_id" />
|
||||
<result property="serveId" column="serve_id" />
|
||||
<result property="title" column="title" />
|
||||
<result property="stauts" column="stauts" />
|
||||
<result property="isAfterSale" column="is_after_sale" />
|
||||
@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectReservationVo">
|
||||
SELECT id, room_content_id, user_id, ticket_id, customer_id, title, stauts, is_after_sale, oder_number, order_money, cancel_time, cancel_resaon, visit_type, explain_need_type, meeting_need_type, meeting_id, photograph_type, start_time, end_time, delete_flag, create_by, create_time, update_by, update_time, remake FROM tb_reservation
|
||||
SELECT id, room_content_id, user_id, ticket_id, customer_id, title, stauts,serve_id, is_after_sale, oder_number, order_money, cancel_time, cancel_resaon, visit_type, explain_need_type, meeting_need_type, meeting_id, photograph_type, start_time, end_time, delete_flag, create_by, create_time, update_by, update_time, remake FROM tb_reservation
|
||||
</sql>
|
||||
|
||||
<select id="selectReservationList" parameterType="Reservation" resultMap="ReservationResult">
|
||||
@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="userId != null ">user_id,</if>
|
||||
<if test="ticketId != null ">ticket_id,</if>
|
||||
<if test="customerId != null ">customer_id,</if>
|
||||
<if test="serveId != null ">serve_id,</if>
|
||||
<if test="title != null and title != ''">title,</if>
|
||||
<if test="stauts != null ">stauts,</if>
|
||||
<if test="isAfterSale != null and isAfterSale != ''">is_after_sale,</if>
|
||||
@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="userId != null ">#{userId},</if>
|
||||
<if test="ticketId != null ">#{ticketId},</if>
|
||||
<if test="customerId != null ">#{customerId},</if>
|
||||
<if test="serveId != null ">#{serveId},</if>
|
||||
<if test="title != null and title != ''">#{title},</if>
|
||||
<if test="stauts != null ">#{stauts},</if>
|
||||
<if test="isAfterSale != null and isAfterSale != ''">#{isAfterSale},</if>
|
||||
@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="userId != null ">user_id = #{userId},</if>
|
||||
<if test="ticketId != null ">ticket_id = #{ticketId},</if>
|
||||
<if test="customerId != null ">customer_id = #{customerId},</if>
|
||||
<if test="serveId != null ">serve_id = #{serveId},</if>
|
||||
<if test="title != null and title != ''">title = #{title},</if>
|
||||
<if test="stauts != null ">stauts = #{stauts},</if>
|
||||
<if test="isAfterSale != null and isAfterSale != ''">is_after_sale = #{isAfterSale},</if>
|
||||
|
@ -1,75 +0,0 @@
|
||||
<?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="com.ics.admin.mapper.meeting.ReservationPersonMapper">
|
||||
|
||||
<resultMap type="com.ics.admin.domain.meeting.ReservationPerson" id="ReservationPersonResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="reservationId" column="reservation_id" />
|
||||
<result property="name" column="name" />
|
||||
<result property="phone" column="phone" />
|
||||
<result property="joinTime" column="join_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectReservationPersonVo">
|
||||
SELECT id, user_id, reservation_id, name, phone, join_time FROM tb_reservation_person
|
||||
</sql>
|
||||
|
||||
<select id="selectReservationPersonList" parameterType="ReservationPerson" resultMap="ReservationPersonResult">
|
||||
<include refid="selectReservationPersonVo"/>
|
||||
<where>
|
||||
<if test="name != null and name != ''"> AND name LIKE CONCAT('%', #{name}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectReservationPersonById" parameterType="Long" resultMap="ReservationPersonResult">
|
||||
<include refid="selectReservationPersonVo"/>
|
||||
WHERE id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertReservationPerson" parameterType="ReservationPerson">
|
||||
INSERT INTO tb_reservation_person
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null ">id,</if>
|
||||
<if test="userId != null ">user_id,</if>
|
||||
<if test="reservationId != null ">reservation_id,</if>
|
||||
<if test="name != null and name != ''">name,</if>
|
||||
<if test="phone != null ">phone,</if>
|
||||
<if test="joinTime != null ">join_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null ">#{id},</if>
|
||||
<if test="userId != null ">#{userId},</if>
|
||||
<if test="reservationId != null ">#{reservationId},</if>
|
||||
<if test="name != null and name != ''">#{name},</if>
|
||||
<if test="phone != null ">#{phone},</if>
|
||||
<if test="joinTime != null ">#{joinTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateReservationPerson" parameterType="ReservationPerson">
|
||||
UPDATE tb_reservation_person
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="userId != null ">user_id = #{userId},</if>
|
||||
<if test="reservationId != null ">reservation_id = #{reservationId},</if>
|
||||
<if test="name != null and name != ''">name = #{name},</if>
|
||||
<if test="phone != null ">phone = #{phone},</if>
|
||||
<if test="joinTime != null ">join_time = #{joinTime},</if>
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteReservationPersonById" parameterType="Long">
|
||||
DELETE FROM tb_reservation_person WHERE id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteReservationPersonByIds" parameterType="String">
|
||||
DELETE FROM tb_reservation_person where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
@ -0,0 +1,103 @@
|
||||
<?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="com.ics.admin.mapper.meeting.VisitorPersonMapper">
|
||||
|
||||
<resultMap type="com.ics.admin.domain.meeting.VisitorPerson" id="ReservationPersonResult">
|
||||
<result property="id" column="id"/>
|
||||
<result property="userId" column="user_id"/>
|
||||
<result property="intervieweeId" column="interviewee_id"/>
|
||||
<result property="name" column="name"/>
|
||||
<result property="phone" column="phone"/>
|
||||
<result property="joinTime" column="join_time"/>
|
||||
<result property="visitTime" column="visit_time"/>
|
||||
<result property="leaveTime" column="leave_time"/>
|
||||
<result property="visitContent" column="visit_content"/>
|
||||
<result property="cardType" column="card_type"/>
|
||||
<result property="cardNo" column="card_no"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="photo" column="photo"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectReservationPersonVo">
|
||||
SELECT id, user_id, interviewee_id, name, phone, join_time, visit_time,photo, leave_time, visit_content, card_type, card_no, status FROM tb_visitor_person
|
||||
</sql>
|
||||
|
||||
<select id="selectReservationPersonList" parameterType="VisitorPerson" resultMap="ReservationPersonResult">
|
||||
<include refid="selectReservationPersonVo"/>
|
||||
<where>
|
||||
<if test="name != null and name != ''"> AND name LIKE CONCAT('%', #{name}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectReservationPersonById" parameterType="Long" resultMap="ReservationPersonResult">
|
||||
<include refid="selectReservationPersonVo"/>
|
||||
WHERE id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertReservationPerson" parameterType="VisitorPerson">
|
||||
INSERT INTO tb_visitor_person
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null ">id,</if>
|
||||
<if test="userId != null ">user_id,</if>
|
||||
<if test="intervieweeId != null ">interviewee_id,</if>
|
||||
<if test="name != null and name != ''">name,</if>
|
||||
<if test="phone != null ">phone,</if>
|
||||
<if test="joinTime != null ">join_time,</if>
|
||||
<if test="visitTime != null ">visit_time,</if>
|
||||
<if test="leaveTime != null ">leave_time,</if>
|
||||
<if test="visitContent != null and visitContent != ''">visit_content,</if>
|
||||
<if test="cardType != null and cardType != ''">card_type,</if>
|
||||
<if test="cardNo != null and cardNo != ''">card_no,</if>
|
||||
<if test="status != null ">status,</if>
|
||||
<if test="photo != null ">photo,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null ">#{id},</if>
|
||||
<if test="userId != null ">#{userId},</if>
|
||||
<if test="intervieweeId != null ">#{intervieweeId},</if>
|
||||
<if test="name != null and name != ''">#{name},</if>
|
||||
<if test="phone != null ">#{phone},</if>
|
||||
<if test="joinTime != null ">#{joinTime},</if>
|
||||
<if test="visitTime != null ">#{visitTime},</if>
|
||||
<if test="leaveTime != null ">#{leaveTime},</if>
|
||||
<if test="visitContent != null and visitContent != ''">#{visitContent},</if>
|
||||
<if test="cardType != null and cardType != ''">#{cardType},</if>
|
||||
<if test="cardNo != null and cardNo != ''">#{cardNo},</if>
|
||||
<if test="status != null ">#{status},</if>
|
||||
<if test="photo != null ">#{photo},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateReservationPerson" parameterType="VisitorPerson">
|
||||
UPDATE tb_visitor_person
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="userId != null ">user_id = #{userId},</if>
|
||||
<if test="intervieweeId != null ">interviewee_id = #{intervieweeId},</if>
|
||||
<if test="name != null and name != ''">name = #{name},</if>
|
||||
<if test="phone != null ">phone = #{phone},</if>
|
||||
<if test="joinTime != null ">join_time = #{joinTime},</if>
|
||||
<if test="visitTime != null ">visit_time = #{visitTime},</if>
|
||||
<if test="leaveTime != null ">leave_time = #{leaveTime},</if>
|
||||
<if test="visitContent != null and visitContent != ''">visit_content = #{visitContent},</if>
|
||||
<if test="cardType != null and cardType != ''">card_type = #{cardType},</if>
|
||||
<if test="cardNo != null and cardNo != ''">card_no = #{cardNo},</if>
|
||||
<if test="status != null ">status = #{status},</if>
|
||||
<if test="photo != null ">photo = #{photo},</if>
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteReservationPersonById" parameterType="Long">
|
||||
DELETE FROM tb_visitor_person WHERE id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteReservationPersonByIds" parameterType="String">
|
||||
DELETE FROM tb_visitor_person where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
@ -29,11 +29,6 @@ public class ApiRoomContentController extends BaseController {
|
||||
@Autowired
|
||||
private IRoomContentService roomContentService;
|
||||
|
||||
@Autowired
|
||||
private IRoomItemByRoomService roomItemByRoomService;
|
||||
|
||||
@Autowired
|
||||
private IRoomItemService roomItemService;
|
||||
|
||||
@Autowired
|
||||
private ICustomerTicketService customerTicketService;
|
||||
@ -54,7 +49,7 @@ public class ApiRoomContentController extends BaseController {
|
||||
/**
|
||||
* 获取房间详情信息
|
||||
*/
|
||||
@GetMapping("info/{id}")
|
||||
@GetMapping("/info/{id}")
|
||||
public R infoById(@PathVariable("id") Long id) {
|
||||
RoomContent roomContents = roomContentService.selectInfoById(id);
|
||||
|
||||
@ -65,16 +60,21 @@ public class ApiRoomContentController extends BaseController {
|
||||
/**
|
||||
* 优惠卷列表
|
||||
*/
|
||||
@GetMapping("getCustomerTicket/{userId}")
|
||||
@GetMapping("/getCustomerTicket/{userId}")
|
||||
public R getCustomerTicket(@PathVariable("userId") Long userId) {
|
||||
// RoomContent roomContents = roomContentService.selectInfoById(id);
|
||||
|
||||
//根据用户获取对应的企业id,查询该企业下对应的优惠卷
|
||||
|
||||
List<CustomerTicket> list = customerTicketService.getCustomerTicket(userId);
|
||||
|
||||
|
||||
return R.ok().put("data",list);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -0,0 +1,98 @@
|
||||
package com.ics.controller.mobile.meeting;
|
||||
|
||||
|
||||
import com.ics.admin.domain.Customer;
|
||||
import com.ics.admin.domain.IcsCustomerStaff;
|
||||
import com.ics.admin.domain.meeting.RoomContent;
|
||||
import com.ics.admin.domain.meeting.VisitorPerson;
|
||||
import com.ics.admin.service.ICustomerService;
|
||||
import com.ics.admin.service.IIcsCustomerStaffService;
|
||||
import com.ics.admin.service.meeting.IRoomContentService;
|
||||
import com.ics.admin.service.meeting.IVisitorPersonService;
|
||||
import com.ics.common.core.controller.BaseController;
|
||||
import com.ics.common.core.domain.R;
|
||||
import org.checkerframework.checker.units.qual.A;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 访客管理模块
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/visitor")
|
||||
public class ApiVisitorController extends BaseController {
|
||||
|
||||
|
||||
@Autowired
|
||||
private ICustomerService customerService;
|
||||
|
||||
@Autowired
|
||||
private IIcsCustomerStaffService customerStaffService;
|
||||
|
||||
@Autowired
|
||||
private IVisitorPersonService visitorPersonService;
|
||||
|
||||
/**
|
||||
* 获取所有的企业
|
||||
*/
|
||||
|
||||
@GetMapping("list")
|
||||
public R list(Customer customer) {
|
||||
List<Customer> customers = customerService.selectCustomerList(customer);
|
||||
return result(customers);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取企业下的所有用户
|
||||
*/
|
||||
@GetMapping("selectUserByCustomer/{customerId}")
|
||||
public R selectUserByCustomer(@PathVariable("customerId") Long customerId) {
|
||||
List<IcsCustomerStaff> customers = customerStaffService.selectUserByCustomer(customerId);
|
||||
return result(customers);
|
||||
}
|
||||
|
||||
/**
|
||||
* 访客预约 ,用户自己预约
|
||||
*/
|
||||
@PostMapping("VisitorPerson")
|
||||
public R selectUserByCustomer(@RequestBody VisitorPerson person) {
|
||||
person.setStatus(0);
|
||||
boolean save = visitorPersonService.save(person);
|
||||
return toAjax(save);
|
||||
}
|
||||
|
||||
/**
|
||||
* 访客记录
|
||||
*/
|
||||
@GetMapping("selectVisitorRecord/{userId}")
|
||||
public R selectVisitorPerson(@PathVariable("userId") Long userId) {
|
||||
List<VisitorPerson> visitorPersons = visitorPersonService.selectVisitorRecord(userId);
|
||||
return result(visitorPersons);
|
||||
}
|
||||
|
||||
/**
|
||||
* 被访客 记录
|
||||
* @param intervieweeId
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("selectVisitorRecordByIntervieweeId/{intervieweeId}")
|
||||
public R selectVisitorRecordByIntervieweeId(@PathVariable("intervieweeId") Long intervieweeId) {
|
||||
List<VisitorPerson> visitorPersons = visitorPersonService.selectVisitorRecordByIntervieweeId(intervieweeId);
|
||||
return result(visitorPersons);
|
||||
}
|
||||
|
||||
/**
|
||||
* 被访人审核功能
|
||||
*/
|
||||
@PostMapping("updateVisitorPersonStatus")
|
||||
public R updateVisitorPersonStatus(@RequestBody VisitorPerson person) {
|
||||
int update = visitorPersonService.updateVisitorPersonStatus(person);
|
||||
return toAjax(update);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user