From 02a8520a86675883c0fff9b247b3ebad20bc28b7 Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Tue, 27 Feb 2024 16:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BA=86?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=9A=E8=AE=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=AD=89=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/RoomServeController.java | 8 +- .../admin/domain/meeting/CustomerTicket.java | 14 +++ .../ics/admin/domain/meeting/RoomContent.java | 23 +++++ .../ics/admin/domain/meeting/RoomItem.java | 3 +- .../com/ics/admin/domain/meeting/Ticket.java | 5 +- .../meeting/CustomerTicketServiceImpl.java | 33 +++++++ .../impl/meeting/RoomContentServiceImpl.java | 92 ++++++++++++++++++- .../meeting/ICustomerTicketService.java | 3 + .../service/meeting/IRoomContentService.java | 4 + .../mapper/admin/IcsCustomerStaffMapper.xml | 1 + .../mapper/admin/meeting/RoomItemMapper.xml | 7 +- .../mapper/admin/meeting/TicketMapper.xml | 10 +- .../ics/common/core/domain/BaseEntity.java | 11 ++- .../main/java/com/ics/system/domain/User.java | 3 + .../system/handlers/MyParkLineHandler.java | 3 +- .../system/handlers/MyTenantLineHandler.java | 3 +- .../resources/mapper/system/UserMapper.xml | 10 ++ .../meeting/ApiRoomContentController.java | 52 ++++++++++- 18 files changed, 257 insertions(+), 28 deletions(-) diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java index a34509a..d33a699 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java @@ -38,7 +38,7 @@ public class RoomServeController extends BaseController { /** * 查询服务列表 */ - @RequiresPermissions("meeting:serve:list") + @RequiresPermissions("meeting:roomServe:list") @GetMapping("list") public R list(RoomServe roomServe) { startPage(); @@ -49,7 +49,7 @@ public class RoomServeController extends BaseController { /** * 新增保存服务 */ - @RequiresPermissions("meeting:serve:add") + @RequiresPermissions("meeting:roomServe:add") @PostMapping("save") public R addSave(@RequestBody RoomServe roomServe) { return toAjax(roomServeService.insertRoomServe(roomServe)); @@ -58,7 +58,7 @@ public class RoomServeController extends BaseController { /** * 修改保存服务 */ - @RequiresPermissions("meeting:serve:edit") + @RequiresPermissions("meeting:roomServe:edit") @PostMapping("update") public R editSave(@RequestBody RoomServe roomServe) { return toAjax(roomServeService.updateRoomServe(roomServe)); @@ -67,7 +67,7 @@ public class RoomServeController extends BaseController { /** * 删除服务 */ - @RequiresPermissions("meeting:serve:remove") + @RequiresPermissions("meeting:roomServe:remove") @PostMapping("remove") public R remove(String ids) { return toAjax(roomServeService.deleteRoomServeByIds(ids)); diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/CustomerTicket.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/CustomerTicket.java index b557857..d942b61 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/CustomerTicket.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/CustomerTicket.java @@ -1,9 +1,12 @@ package com.ics.admin.domain.meeting; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.ics.common.core.domain.BaseEntity; import lombok.Data; +import java.util.Date; + /** * 企业优惠卷关联对象 tb_customer_ticket * @@ -27,4 +30,15 @@ public class CustomerTicket extends BaseEntity { /** 是否已经核销 */ private Integer isVerification; + @TableField(exist = false) + private Date startTime; + + /** 结束时间 */ + + @TableField(exist = false) + private Date endDate; + + @TableField(exist = false) + private String ticketName; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java index 0ba65da..3187135 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java @@ -1,9 +1,13 @@ package com.ics.admin.domain.meeting; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.ics.common.core.domain.BaseEntity; import lombok.Data; + +import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 房间主体内容对象 tb_room_content @@ -52,4 +56,23 @@ public class RoomContent extends BaseEntity { /** 形状（U型，O型） */ private String shape; + + @TableField(exist = false) + private List roomItemList; + + @TableField(exist = false) + private String roomName; + + @TableField(exist = false) + private String buildingName; + + @TableField(exist = false) + private List roomServeList; + + @TableField(exist = false) + private BigDecimal area; + + @TableField(exist = false) + private BigDecimal renArea; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomItem.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomItem.java index 4696604..0ed4c75 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomItem.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomItem.java @@ -33,7 +33,6 @@ public class RoomItem extends BaseEntity { /** 备注 */ private String remark; - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java index 8cd9f17..8ab2313 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java @@ -1,6 +1,7 @@ package com.ics.admin.domain.meeting; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ics.common.core.domain.BaseEntity; import lombok.Data; import java.util.Date; @@ -38,10 +39,12 @@ public class Ticket extends BaseEntity { private Integer isShow; /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date startTime; /** 结束时间 */ - private String endTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endDate; /** 备注 */ private String remark; diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java index 7334e6e..a1a505e 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java @@ -2,9 +2,15 @@ package com.ics.admin.service.impl.meeting; import java.util.List; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Assert; 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.domain.IcsCustomerStaff; +import com.ics.admin.domain.meeting.Ticket; +import com.ics.admin.mapper.IcsCustomerStaffMapper; +import com.ics.admin.mapper.meeting.TicketMapper; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ics.admin.mapper.meeting.CustomerTicketMapper; @@ -22,6 +28,12 @@ public class CustomerTicketServiceImpl extends ServiceImpl getCustomerTicket(Long userId) { + + + IcsCustomerStaff icsCustomerStaff = customerStaffMapper.selectById(userId); + Assert.isTrue(icsCustomerStaff != null, "用户不存在，请联系管理员"); + + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("customer_id", icsCustomerStaff.getIcsCustomerId()); + List customerTickets = customerTicketMapper.selectList(wrapper); + for (CustomerTicket customerTicket : customerTickets) { + Ticket ticket = ticketMapper.selectById(customerTicket.getTicketId()); + customerTicket.setTicketName(ticket.getTitle()); + customerTicket.setStartTime(ticket.getStartTime()); + customerTicket.setEndDate(ticket.getEndDate()); + } + + return customerTickets; + } } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java index f1445b7..72c02fd 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java @@ -1,16 +1,23 @@ package com.ics.admin.service.impl.meeting; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Assert; 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.domain.meeting.RoomContent; +import com.ics.admin.domain.BuildingDetail; +import com.ics.admin.domain.Room; +import com.ics.admin.domain.meeting.*; +import com.ics.admin.service.IBuildingDetailService; +import com.ics.admin.service.IRoomService; +import com.ics.admin.service.meeting.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ics.admin.mapper.meeting.RoomContentMapper; import com.ics.admin.domain.meeting.RoomContent; -import com.ics.admin.service.meeting.IRoomContentService; /** * 房间主体内容Service业务层处理 @@ -23,6 +30,24 @@ public class RoomContentServiceImpl extends ServiceImpl selectApiRoomList(RoomContent roomContent) { + + ArrayList items = new ArrayList<>(); + List roomContents = roomContentMapper.selectList(new QueryWrapper<>(roomContent)); + for (RoomContent content : roomContents) { + //查询房间号 + Room room = roomService.selectRoomById(content.getRoomId()); + if (room != null) { + content.setRoomName(room.getName()); + //查询楼层号 + BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId()); + if (buildingDetail != null) { + content.setBuildingName(buildingDetail.getFloorName() +"F"); + } + } + RoomItemByRoom roomItemByRoom = new RoomItemByRoom(); + roomItemByRoom.setRoomContentId(content.getId()); + List roomItemByRooms = roomItemByRoomService.selectRoomItemByRoomList(roomItemByRoom); + if (CollUtil.isNotEmpty(roomItemByRooms)){ + for (RoomItemByRoom itemByRoom : roomItemByRooms) { + RoomItem roomItem = roomItemService.selectRoomItemById(itemByRoom.getItemId()); + items.add(roomItem); + } + content.setRoomItemList(items); + } + } + return roomContents; + } + + @Override + public RoomContent selectInfoById(Long id) { + RoomContent roomContent = roomContentMapper.selectRoomContentById(id); + Assert.isTrue(roomContent != null, "未找到该房间信息"); + //获取房间所有服务信息 + RoomServeByRoom roomServeByRoom = new RoomServeByRoom(); + roomServeByRoom.setRomeContentId(id); + List roomServe1 = new ArrayList<>(); + List roomServeByRooms = iRoomServeByRoomService.selectRoomServeByRoomList(roomServeByRoom); + if (CollUtil.isNotEmpty(roomServeByRooms)){ + for (RoomServeByRoom serveByRoom : roomServeByRooms) { + RoomServe roomServe = iRoomServeService.selectRoomServeById(serveByRoom.getServeId()); + roomServe1.add(roomServe); + } + roomContent.setRoomServeList(roomServe1); + } + // 所在楼层，占地面积，办公面积 + Room room = roomService.selectRoomById(roomContent.getRoomId()); + if (room != null) { + roomContent.setRoomName(room.getName()); + roomContent.setArea(room.getArea()); + roomContent.setRenArea(room.getRentArea()); + //查询楼层号 + BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId()); + if (buildingDetail != null) { + roomContent.setBuildingName(buildingDetail.getFloorName() +"F"); + } + } + + return roomContent; + + } } diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java index 2a2546e..2fcb84d 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java @@ -58,4 +58,7 @@ public interface ICustomerTicketService extends IService { * @return 结果 */ int deleteCustomerTicketById(Long id); + + List getCustomerTicket(Long userId); + } diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java index 1958f26..3b3ecee 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java @@ -58,4 +58,8 @@ public interface IRoomContentService extends IService { * @return 结果 */ int deleteRoomContentById(Long id); + + List selectApiRoomList(RoomContent roomContent); + + RoomContent selectInfoById(Long id); } diff --git a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml index 30555f6..6630cc2 100644 --- a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml @@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND username LIKE CONCAT('%', #{username}, '%') AND ics_customer_id = #{icsCustomerId} + AND mobile = #{mobile} diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/RoomItemMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/RoomItemMapper.xml index 117fc0c..8eff284 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/RoomItemMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/RoomItemMapper.xml @@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT id, name, brand, specification, pic_url, file_url, remark, del_flag, create_by, create_time, update_by, update_time FROM tb_room_item + SELECT id, name, brand, specification, pic_url, file_url, remark, delete_flag, create_by, create_time, update_by, update_time FROM tb_room_item @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_verification, is_show, start_time, - end_time, + end_date, remark, is_default, version, @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isVerification}, #{isShow}, #{startTime}, - #{endTime}, + #{endDate}, #{remark}, #{isDefault}, #{version}, @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_verification = #{isVerification}, is_show = #{isShow}, start_time = #{startTime}, - end_time = #{endTime}, + end_DATE = #{endDate}, remark = #{remark}, is_default = #{isDefault}, version = #{version}, diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java b/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java index f7ee4cf..fbc5ceb 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java @@ -32,8 +32,9 @@ public class BaseEntity implements Serializable { /** * 版本 */ - @Version - @TableField(fill = FieldFill.INSERT_UPDATE) + @TableField(exist = false) +// @Version +// @TableField(fill = FieldFill.INSERT_UPDATE) private Integer version; /** @@ -59,13 +60,13 @@ public class BaseEntity implements Serializable { /** * 更新者 */ - @TableField(fill = FieldFill.UPDATE) + @TableField(fill = FieldFill.UPDATE,exist = false) private String updateBy; /** * 更新时间 */ - @TableField(fill = FieldFill.UPDATE) + @TableField(fill = FieldFill.UPDATE,exist = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; @@ -79,7 +80,7 @@ public class BaseEntity implements Serializable { /** * 关联园区ID */ -// @TableField(fill = FieldFill.INSERT,exist = false) +// @TableField(fill = FieldFill.INSERT) @TableField(exist = false) private Long parkId; diff --git a/ics-system/src/main/java/com/ics/system/domain/User.java b/ics-system/src/main/java/com/ics/system/domain/User.java index 390594e..50aa6b4 100644 --- a/ics-system/src/main/java/com/ics/system/domain/User.java +++ b/ics-system/src/main/java/com/ics/system/domain/User.java @@ -165,6 +165,9 @@ public class User extends BaseEntity { */ private Set buttons; + + private Long staffId; + /** * 在线用户记录 */ diff --git a/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java b/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java index ba08e23..7b63a7d 100644 --- a/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java +++ b/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java @@ -22,7 +22,8 @@ public class MyParkLineHandler implements TenantLineHandler { private static final String[] tableList = {"tables", "columns", "sys_tenant", "ics_park", "sys_config", "sys_dict_type", "sys_dict_data", "sys_districts", "sys_job", "sys_job_log", "sys_login_info", "sys_menu", "sys_notice", "sys_oper_log", "sys_oss", "sys_role", "sys_role_dept", "sys_role_menu", "sys_sn", "sys_user_role", "sys_dept", "ics_customer_contract_room", "ics_park", "ics_apply_room", "ics_customer_contract_refund_room", "ics_apply_park_file", - "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff"}; + "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff", + "tb_room_content","tb_room_item","tb_room_item_by_room"}; /** * 多租户标识 diff --git a/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java b/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java index 4e1c7a4..570b81c 100644 --- a/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java +++ b/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java @@ -22,7 +22,8 @@ public class MyTenantLineHandler implements TenantLineHandler { private static final String[] tableList = {"tables", "columns", "sys_tenant", "sys_config", "sys_role", "sys_dict_type", "sys_dict_data", "sys_districts", "sys_job", "sys_job_log", "sys_login_info", "sys_menu", "sys_notice", "sys_oper_log", "sys_oss", "sys_role_dept", "sys_role_menu", "sys_sn", "sys_user_role", "ics_customer_contract_room", "ics_apply_room", "ics_customer_contract_refund_room", "ics_apply_park_file", - "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff"}; + "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff", + "tb_room_content","tb_room_item","tb_room_item_by_room"}; /** * 多租户标识 diff --git a/ics-system/src/main/resources/mapper/system/UserMapper.xml b/ics-system/src/main/resources/mapper/system/UserMapper.xml index ef9b8f8..e05f2f8 100644 --- a/ics-system/src/main/resources/mapper/system/UserMapper.xml +++ b/ics-system/src/main/resources/mapper/system/UserMapper.xml @@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -72,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" u.create_time, u.tenant_id, u.park_id, + u.staff_id, d.id AS dept_id, d.parent_id, d.dept_name, @@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" u.create_by, u.create_time, u.park_id, + u.staff_id, d.dept_name, NULL AS role_id FROM sys_user u @@ -151,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" u.email, u.mobile, u.status, + u.staff_id, u.create_time FROM sys_user u LEFT JOIN sys_dept d @@ -180,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" u.email, u.mobile, u.status, + u.staff_id, u.create_time FROM sys_user u LEFT JOIN sys_dept d ON u.dept_id = d.id @@ -291,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" salt, status, create_by, + staff_id, version, delete_flag, create_time @@ -311,6 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{salt}, #{status}, #{createBy}, + #{staffId}, 0, 0, sysdate() @@ -335,6 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" salt, status, create_by, + staff_id, version, delete_flag, create_time @@ -355,6 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{salt}, #{status}, #{createBy}, + #{staffId}, 0, 0, sysdate() @@ -380,6 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date = #{loginDate}, update_by = #{updateBy}, delete_flag = #{deleteFlag}, + staff_id = #{staffId}, update_time = sysdate() WHERE id = #{id} diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java index 74cfef6..c36890c 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java @@ -1,32 +1,80 @@ package com.ics.controller.mobile.meeting; +import cn.hutool.core.collection.CollUtil; +import com.ics.admin.domain.meeting.CustomerTicket; import com.ics.admin.domain.meeting.RoomContent; +import com.ics.admin.domain.meeting.RoomItem; +import com.ics.admin.domain.meeting.RoomItemByRoom; +import com.ics.admin.service.IRoomService; +import com.ics.admin.service.meeting.ICustomerTicketService; import com.ics.admin.service.meeting.IRoomContentService; +import com.ics.admin.service.meeting.IRoomItemByRoomService; +import com.ics.admin.service.meeting.IRoomItemService; 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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; @RestController -@RequestMapping("/roomContent") +@RequestMapping("/api/roomContent") public class ApiRoomContentController extends BaseController { @Autowired private IRoomContentService roomContentService; + @Autowired + private IRoomItemByRoomService roomItemByRoomService; + + @Autowired + private IRoomItemService roomItemService; + + @Autowired + private ICustomerTicketService customerTicketService; + /** * 获取房间内容 */ @GetMapping("list") public R list(RoomContent roomContent) { - List roomContents = roomContentService.selectRoomContentList(roomContent); + List roomContents = roomContentService.selectApiRoomList(roomContent); + return result(roomContents); } + + /** + * 获取房间详情信息 + */ + @GetMapping("info/{id}") + public R infoById(@PathVariable("id") Long id) { + RoomContent roomContents = roomContentService.selectInfoById(id); + + + return R.ok().put("roomContent", roomContents); + } + + /** + * 优惠卷列表 + */ + @GetMapping("getCustomerTicket/{userId}") + public R getCustomerTicket(@PathVariable("userId") Long userId) { +// RoomContent roomContents = roomContentService.selectInfoById(id); + + //根据用户获取对应的企业id，查询该企业下对应的优惠卷 + + List list = customerTicketService.getCustomerTicket(userId); + + + return R.ok().put("data",list); + } + }