From 684005186e2eac8d4fabc8bdd8deca5e87db48b9 Mon Sep 17 00:00:00 2001 From: lujiang Date: Tue, 15 Oct 2024 10:04:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D=E5=BB=B6?= =?UTF-8?q?=E9=95=BF=E8=87=B314=E5=A4=A9=EF=BC=9B=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9A?= =?UTF-8?q?=E2=80=9C=E6=95=85=E9=9A=9C=E5=9C=B0=E7=82=B9=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E2=80=9C=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B=E2=80=9D=EF=BC=9B?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=B7=A5=E5=8D=95=E5=A2=9E=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=9B=E6=8C=89=E5=A4=A9=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84=E7=BA=A6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=9B=E5=8F=96=E6=B6=88=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=8A=9F=E8=83=BD=E5=8F=98=E6=9B=B4=EF=BC=9B=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=89=80=E6=9C=89=E4=BC=9A=E8=AE=AE=E5=AE=A4=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E5=8F=98=E6=9B=B4=EF=BC=9B=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingReservationController.java | 38 +++- .../MeetingReservationIOController.java | 66 +++++++ .../admin/controller/RepairIOController.java | 36 +++- .../mapper/MeetingReservationIOMapper.java | 24 +++ .../ics/admin/mapper/RepairCheckMapper.java | 5 +- .../service/IMeetingReservationIOService.java | 15 ++ .../ics/admin/service/IRepairIOSerice.java | 4 +- .../IMeetingReservationIOServiceImpl.java | 30 +++ .../impl/MeetingReservationServiceImpl.java | 10 +- .../service/impl/RepairIOSericeImpl.java | 4 +- .../ics/admin/vo/MeetingRecordExportVo.java | 180 ++++++++++++++++++ .../com/ics/admin/vo/MeetingRecordVo.java | 10 + .../java/com/ics/admin/vo/MeetingRoomVo.java | 9 + .../java/com/ics/admin/vo/RepairExportVo.java | 8 +- .../main/resources/excel/会情表导出模版.xls | Bin 0 -> 23552 bytes .../src/main/resources/excel/工单导出模版.xls | Bin 24064 -> 24576 bytes .../admin/MeetingReservationIOMapper.xml | 24 +++ .../mapper/admin/MeetingReservationMapper.xml | 7 +- .../mapper/admin/RepairCheckMapper.xml | 28 ++- .../com/ics/common/redis/util/RedisUtils.java | 4 +- 20 files changed, 465 insertions(+), 37 deletions(-) create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationIOController.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationIOMapper.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationIOService.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingReservationIOServiceImpl.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordExportVo.java create mode 100644 shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls create mode 100644 shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java index 6e0c20b..e77b15f 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java @@ -87,8 +87,9 @@ public class MeetingReservationController extends BaseController { * startTime：预约开始时间，格式：2024-09-23 14:00:00 * endTime：预约结束时间，格式：2024-09-23 16:00:00 * mrdate：预约日期，格式：2024-09-23 - * timeFormat：预约时间格式：0 任意时间（管理员），1上午，2下午，3晚上 4 全天。 - * 值为0时，读取startTime和endTime为预约会议时间范围；其他值读取mrdate，再拼接时间为预约会议时间范围。 + * timeFormat：预约时间格式：0 任意时间（管理员），读取startTime和endTime为预约会议时间范围；1则读取mrdate值，列举预约日期上午、下午、晚上 是否可以预约。 + * 返回值读取：为0时；任然读取status 0可预约 1不可预约 + * 为1时；读取 am，上午 0可预约 1不可预约 pm，下午 0可预约 1不可预约 night，晚上 0可预约 1不可预约 * * * floor 所属楼层名称，精确查询 * * name 会议室名称，模糊查询 @@ -101,11 +102,39 @@ public class MeetingReservationController extends BaseController { @PostMapping("getAllRoom") public R getAllRoom(@RequestBody MeetingRoomVo meetingRoomVo) { if (meetingRoomVo.getTimeFormat() > 0) {//非任意时间 - Date start = convert(meetingRoomVo.getMrdate(), meetingRoomVo.getTimeFormat(), true); - Date end = convert(meetingRoomVo.getMrdate(), meetingRoomVo.getTimeFormat(), false); + Date start = convert(meetingRoomVo.getMrdate(), 1, true); + Date end = convert(meetingRoomVo.getMrdate(), 1, false); if (start == null || end == null) return R.error("预约时间解析错误"); meetingRoomVo.setStartTime(start); meetingRoomVo.setEndTime(end); + List am = meetingReservationService.getAllRoom(meetingRoomVo);//上午 + start = convert(meetingRoomVo.getMrdate(), 2, true); + end = convert(meetingRoomVo.getMrdate(), 2, false); + meetingRoomVo.setStartTime(start); + meetingRoomVo.setEndTime(end); + List pm = meetingReservationService.getAllRoom(meetingRoomVo);//下午 + start = convert(meetingRoomVo.getMrdate(), 3, true); + end = convert(meetingRoomVo.getMrdate(), 3, false); + meetingRoomVo.setStartTime(start); + meetingRoomVo.setEndTime(end); + List night = meetingReservationService.getAllRoom(meetingRoomVo);//晚上 + for (MeetingRoomVo mro : am) { + mro.setAm(mro.getStatus());//设置上午状态 + mro.setStatus(-1); + for (MeetingRoomVo pmro : pm) { + if (mro.getId() == pmro.getId()) { + mro.setPm(pmro.getStatus());//设置下午状态 + break; + } + } + for (MeetingRoomVo nmro : night) { + if (mro.getId() == nmro.getId()) { + mro.setNight(nmro.getStatus());//设置晚上状态 + break; + } + } + } + return R.ok().put("data", am); } return R.ok().put("data", meetingReservationService.getAllRoom(meetingRoomVo)); } @@ -384,6 +413,7 @@ public class MeetingReservationController extends BaseController { * capacityNum，容纳人数，精确查询 * status，预约状态，精确查询 * filterDate，预约日期查询，以预约开始时间为准；查询指定日期的所有预约。 + * sort,排序， create 以创建时间倒序排列；start 以预约会议开始时间倒序排列（默认） * */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationIOController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationIOController.java new file mode 100644 index 0000000..6b29925 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationIOController.java @@ -0,0 +1,66 @@ +package com.ics.admin.controller; + +import com.ics.admin.service.IMeetingReservationIOService; +import com.ics.admin.utils.ExcelView; +import com.ics.admin.vo.MeetingRecordExportVo; +import com.ics.common.core.controller.BaseController; +import com.ics.common.utils.DateUtils; +import org.jxls.common.Context; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.wf.jwtp.annotation.RequiresPermissions; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +/** + * 会议记录导出 + * created at 2024-10-14 9:58 + * + * @author lujiang + * @version 1.0.0 + * @since 1.0.0 + */ +@RestController +@RequestMapping("admin/mr/io") +public class MeetingReservationIOController extends BaseController { + + @Autowired + private IMeetingReservationIOService meetingReservationIOService; + + private final static String WEEK = "日一二三四五六"; + + /** + * 导出会议室预约记录列表 + *

+ * title，会议标题，模糊查询 + * userOrg，部门名称，模糊查询 + * floor，楼层名称，精确查询 + * name，会议室名称，模糊查询 + * typeName，会议室类型名称，精确查询 + * device，设备，模糊查询 + * capacityNum，容纳人数，精确查询 + * filterDate，预约日期查询，以预约开始时间为准；查询指定日期的所有预约。格式：2024-10-14。必填 + */ + @RequiresPermissions(value = {"mr:manage:operator"}) + @PostMapping("exportDayMR") + public void exportMR(MeetingRecordExportVo meetingRecordExportVo) { + try { + Date day = DateUtils.dateTime(DateUtils.YYYY_MM_DD, meetingRecordExportVo.getFilterDate()); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(day); + int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK) - 1; + List list = meetingReservationIOService.getMeetingReservationList(meetingRecordExportVo); + Context context = new Context(); + context.putVar("day", DateUtils.parseDateToStr("yyyy年MM月dd日", day)); + context.putVar("dayOfWeek", WEEK.charAt(dayOfWeek)); + context.putVar("list", list); + new ExcelView("excel/会情表导出模版.xls", "会议中心会情表.xls", context); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java index d060210..5dd0f42 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java @@ -45,6 +45,7 @@ import org.wf.jwtp.annotation.RequiresPermissions; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -285,24 +286,43 @@ public class RepairIOController extends BaseController { /** * 工单导出 - * @param startDate 日期范围 - * @param endDate 日期范围 + * 【查询条件】 + * sn： 单号，模糊查询 + * repairLevel：故障等级，模糊查询 + * typeId：设备类别id，精确查询 + * deviceId：设备id，精确查询 + * name：报修人，模糊查询 + * phone：联系电话，模糊查询 + * addressId：报修地点id，精确查询 + * floorId：报修楼层id，精确查询 + * room：门牌号，模糊查询 + * explain：描述，模糊查询 + * failureTypeId：故障类型id，精确查询 + * remark: yes 5110工单 no 普通工单 + * evalService: 1 好评 2 中评 3 差评，其他值无效 + * timeout: 9 查询超时工单，其他值无效 + * beginTime : 工单创建日期范围；开始时间;格式示例 2024-08-22；成对出现 + * endTime : 工单创建日期范围；结束时间;格式示例 2024-08-25；成对出现 */ @RequiresPermissions(value = {"repair:manage:operator"}) @RequestMapping("/exportRepair") - public void exportData(String startDate, String endDate) { + public void exportData(Repair repair) { // Long userId = getLoginStaffId(); // IcsCustomerStaff customerStaff = customerStaffService.selectIcsCustomerStaffById(userId); // if (!"7".equals(customerStaff.getDataType())) return;//管理员角色验证 Date start, end; try { - start = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, startDate + " 00:00:00"); - end = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, endDate + " 23:59:59"); - List list = repairIOSerice.exportRepair(start, end); + start = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repair.getBeginTime() + " 00:00:00"); + end = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repair.getEndTime() + " 23:59:59"); + repair.getParams().put("beginTime", start); + repair.getParams().put("endTime", end); + List list = repairIOSerice.exportRepair(repair); + SimpleDateFormat dateFormat = new SimpleDateFormat("MM月dd日 HH:mm"); Context context = new Context(); - context.putVar("startDate", startDate); - context.putVar("endDate", endDate); + context.putVar("startDate", repair.getBeginTime()); + context.putVar("endDate", repair.getEndTime()); context.putVar("list", list); + context.putVar("dateFormat", dateFormat); new ExcelView("excel/工单导出模版.xls", "零星维修进度情况跟踪表.xls", context); } catch (Exception e) { e.printStackTrace(); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationIOMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationIOMapper.java new file mode 100644 index 0000000..41d0b0c --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationIOMapper.java @@ -0,0 +1,24 @@ +package com.ics.admin.mapper; + +import com.ics.admin.vo.MeetingRecordExportVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 会议室预约记录Mapper接口 + * + * @author ics + * @date 2024-09-18 + */ +@Mapper +public interface MeetingReservationIOMapper { + + + /** + * 查询会议室预约记录列表 + * + */ + List getMeetingReservationList(MeetingRecordExportVo meetingRecordExportVo); + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java index 9e34113..04e4180 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java @@ -1,5 +1,6 @@ package com.ics.admin.mapper; +import com.ics.admin.domain.Repair; import com.ics.admin.vo.RepairCheckVo; import com.ics.admin.vo.RepairExportVo; import org.apache.ibatis.annotations.Mapper; @@ -38,9 +39,7 @@ public interface RepairCheckMapper { /** * 导出工单列表 - * @param startTime - * @param endTime * @return */ - List exportList(@Param("startTime") Date startTime, @Param("endTime") Date endTime); + List exportList(Repair repair); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationIOService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationIOService.java new file mode 100644 index 0000000..189b3a7 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationIOService.java @@ -0,0 +1,15 @@ +package com.ics.admin.service; + +import com.ics.admin.vo.MeetingRecordExportVo; + +import java.util.List; + +public interface IMeetingReservationIOService { + + /** + * 查询预约记录列表 + * @param meetingRecordExportVo + * @return + */ + List getMeetingReservationList(MeetingRecordExportVo meetingRecordExportVo); +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java index ac83e6e..ed1f420 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java @@ -32,9 +32,7 @@ public interface IRepairIOSerice { /** * 查询工单导出 列表 * - * @param startTime 时间范围，开始 - * @param endTime 时间范围，结束 * @return */ - List exportRepair(Date startTime, Date endTime); + List exportRepair(Repair repair); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingReservationIOServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingReservationIOServiceImpl.java new file mode 100644 index 0000000..ff1c555 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingReservationIOServiceImpl.java @@ -0,0 +1,30 @@ +package com.ics.admin.service.impl; + +import com.ics.admin.mapper.MeetingReservationIOMapper; +import com.ics.admin.service.IMeetingReservationIOService; +import com.ics.admin.vo.MeetingRecordExportVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * created at 2024-10-14 10:26 + * + * @author lujiang + * @version 1.0.0 + * @since 1.0.0 + */ +@Service +public class IMeetingReservationIOServiceImpl implements IMeetingReservationIOService { + + @Autowired + private MeetingReservationIOMapper meetingReservationIOMapper; + + + @Override + public List getMeetingReservationList(MeetingRecordExportVo meetingRecordExportVo) { + return meetingReservationIOMapper.getMeetingReservationList(meetingRecordExportVo); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java index 847ebf2..47d130e 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java @@ -173,11 +173,13 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService if (MrOperate.CANCEL.equals(operate) && (meetingReservation.getStatus() < 5 || meetingReservation.getStatus() > 7)) { return "预约记录不能" + operate.getValue(); } - if (!MrOperate.CANCEL.equals(operate) && meetingReservation.getStatus() != 5) { - return "预约记录不能" + operate.getValue(); +// if (!MrOperate.CANCEL.equals(operate) && meetingReservation.getStatus() != 5) { +// return "预约记录不能" + operate.getValue(); +// } + if (MrOperate.CANCEL.equals(operate) && !meetingReservation.getCreateBy().equals(currentUserId.toString())) { + IcsCustomerStaff customerStaff = customerStaffService.selectIcsCustomerStaffById(currentUserId); + if (customerStaff.getRoomRole() != 5) return "不能取消非本人的预约记录或者您不是会议室管理员"; } - if (MrOperate.CANCEL.equals(operate) && !meetingReservation.getCreateBy().equals(currentUserId.toString())) - return "不能取消非本人的预约记录"; Date now = new Date(); meetingReservation.setStatus(operate.getStatus()); meetingReservation.setUpdateBy(currentUserId.toString()); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java index 8684737..dbd70da 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java @@ -81,8 +81,8 @@ public class RepairIOSericeImpl implements IRepairIOSerice { } @Override - public List exportRepair(Date startTime, Date endTime) { - List list = repairCheckMapper.exportList(startTime, endTime); + public List exportRepair(Repair repair) { + List list = repairCheckMapper.exportList(repair); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { list.get(i).setNumber(i + 1); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordExportVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordExportVo.java new file mode 100644 index 0000000..6095ea4 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordExportVo.java @@ -0,0 +1,180 @@ +package com.ics.admin.vo; + +import com.alibaba.fastjson.JSONArray; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRawValue; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * created at 2024-9-22 16:34 + * + * @author lujiang + * @version 1.0.0 + * @since 1.0.0 + */ +@Data +public class MeetingRecordExportVo implements Serializable { + private static final long serialVersionUID = -202409221634L; + /**1.普通用户, 3.会议服务人员 ,5.会议管理员*/ + private Integer role; + /** 后台传入当前用户 */ + private Long userId; + /** + * 日期查询；格式 2024-09-22 + */ + private String filterDate; + + private Long id; + + /** 预约号 */ + private String sn; + + /** 会议室id */ + private Long roomId; + + /** 预约-开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date start; + + /** 特殊格式-开始时间 */ + private String startStr; + + /** 预约-结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date end; + + /** 预约时间格式：0 任意时间，1上午，2下午，3晚上 4 全天*/ + private Integer timeFormat; + + /** 会议名称 */ + private String title; + + /** 参与人数 */ + private Long personNum; + + /** 参会领导 */ + private String leader; + + /** 预约人姓名 */ + private String bookingUserName; + + /** 预约人联系电话 */ + private String bookingUserPhone; + + /** 预约用户单位id */ + private Long userOrgId; + + /** 预约用户单位名称 */ + private String userOrg; + + /** 预约状态，1 取消 3 驳回 4 占用 5 待审核 7 审核通过，待开始 9 进行中 11已结束 */ + private Integer status; + + /** 操作记录，json 格式 */ + @JsonRawValue + private String operate; + + /** 备注 */ + private String remark; + + /** 扩展1 */ + private String ext1; + + /** 扩展2 */ + private String ext2; + + /** 扩展3 */ + private String ext3; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 所属楼层值 + */ + private String floorId; + + /** + * 所属楼层名称 + */ + private String floor; + + /** + * 会议室名称 + */ + private String name; + + /** + * 会议室形式值 + */ + private String typeId; + + /** + * 会议室形式 + */ + private String typeName; + + /** + * 设备 格式： #设备1 #设备2 #设备3 + */ + private String device; + + /** + * 房间号 + */ + private String roomNum; + + /** + * 会议室面积 + */ + private String area; + + /** + * 容纳人数 + */ + private Long capacityNum; + + /** + * 会议描述 + */ + private String content; + + /** + * 是否启用 0 启用 1禁用 + */ + private Integer enable; + + /** + * 扩展1 + */ + private String roomExt1; + + /** + * 扩展2 + */ + private String roomExt2; + + /** + * 扩展3 + */ + private String roomExt3; + + /** + * 备注 + */ + private String roomRemark; + + + private JSONArray imgs; + + /** + * 排序，create 以创建时间倒序排列；start 以预约会议开始时间倒序排列（默认）； + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String sort; + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java index d507b13..cdc67bc 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java @@ -2,6 +2,7 @@ package com.ics.admin.vo; import com.alibaba.fastjson.JSONArray; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRawValue; import lombok.Data; @@ -86,6 +87,9 @@ public class MeetingRecordVo implements Serializable { /** 扩展3 */ private String ext3; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** * 所属楼层值 */ @@ -164,4 +168,10 @@ public class MeetingRecordVo implements Serializable { private JSONArray imgs; + /** + * 排序，create 以创建时间倒序排列；start 以预约会议开始时间倒序排列（默认）； + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String sort; + } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java index eb60fab..4051a19 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java @@ -110,6 +110,15 @@ public class MeetingRoomVo implements Serializable { /** 会议室状态 0可预约 1不可预约 */ private Integer status; + /** 上午是否可以预约， 0可预约 1不可预约 */ + private Integer am = -1; + + /** 下午是否可以预约， 0可预约 1不可预约 */ + private Integer pm = -1; + + /** 晚上是否可以预约， 0可预约 1不可预约 */ + private Integer night = -1; + /** * 扩展1 */ diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairExportVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairExportVo.java index 7caf86c..dabd621 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairExportVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairExportVo.java @@ -1,12 +1,8 @@ package com.ics.admin.vo; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 工单导出 @@ -47,4 +43,8 @@ public class RepairExportVo implements Serializable { private String status; private String resolve; + + private String address; + + private String typeName; } diff --git a/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls b/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls new file mode 100644 index 0000000000000000000000000000000000000000..98947bf2058e52f5958bea9c35b422b267367f10 GIT binary patch literal 23552 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 AP5=M^ literal 0 HcmV?d00001 diff --git a/shoot-hand/ics-admin/src/main/resources/excel/工单导出模版.xls b/shoot-hand/ics-admin/src/main/resources/excel/工单导出模版.xls index b39c71fb3383e5a94f1f057cec1a4389061ea524..7060cda4702b4a6aca892c836c8ac803bfc18d8d 100644 GIT binary patch delta 1191 zcmbu9T}TvB7>3_7J3Bk>x;wk-`mx(S}HhyGvd_=q~;63#zh5KyejG|rNv|VyFtL1>TBIE@~|lLfwlpcg5TII25BzHU$>nt z6~WpwlQ%A09P3*dhWnlksr%Y{7z^+Z(@_0yydV^~*I zEjq<)L44*Tv1Z{^OnneL%(CB#q7WeB5(;6bKIgYsf`r-=T+c{kiy9QRrQ9(bTtS*$?8r!^aT$@sjlgRZrFVIO?RJ1s6k5pu+< z2^FIWn%qH7F2{$dcA6YB7y?xiSx`=TqbbM&)zuikvFYztrWhJCv>8FyG}dNlI)ri1 z&{pI0Me8-a#OpP?rFqOlBwge~U6m}vuXR-=?EY1(bE3--R2>3%* zGaAJyW|b5oJ%L$7jZZX<|LaZ0DSC$8S(^LZS^Oxsk#~lRQM#M6=|aK(3|GLvFpJ zRNhjGqi97P`@(N^|8!1KluX{X*f>w*SyF9DK4dJ(zot$w@OZj$lg;>O7;MxXjtSaN zlNXGN&{Ap&zn#vg!AO8j^^^<<{zTiLTyYCE1oLWTASLYNfWh1^dO?B(5rt6Y9b<7 zPu4kzf?yHBLoe+@5n4*Hf<3B;N)=CvAReL@LA3Gh)^2J&y2I|w?|X0Oz4?|cmZ&&O zH#(?wa_3W`Ez%)w`Ijn{ig~vIi18gaCPjwEjw&~mVP`S;;W551(q?%^xguuzjUUP) zDHB7(&Bhybk1pE-K^X~zWxP?72LtPs`S%O;#<{=?ul&;Nqd{5Tw3V{*d2{UkbW2zi zyX2!?T}{^%FHkNjTnuVCZ_cd(*A0K?enk#`KZhJ33;JE zR7fyu!pBb_ftNMr+(}+bBTJhVrdFbEOEV#Xyrr$=nJ=x?Osm&wj(;`NHBOY_RK&4? zS0p=AA$K1uFYA;Vq(zt}P2Rf?l4Tl!LvTFbU diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml new file mode 100644 index 0000000..56b06b7 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml index e3ce6f7..04cf254 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml @@ -72,7 +72,7 @@ - + and rep.create_time between #{params.beginTime} and #{params.endTime} + AND rep.sn LIKE CONCAT('%', #{sn}, '%') + AND rep.repair_level LIKE CONCAT('%', #{repairLevel}, '%') + AND rep.type_id = #{typeId} + AND rep.device_id = #{deviceId} + AND rep.name LIKE CONCAT('%', #{name}, '%') + AND rep.phone LIKE CONCAT('%', #{phone}, '%') + AND rep.address_id = #{addressId} + AND rep.floor_id = #{floorId} + AND rep.room LIKE CONCAT('%', #{room}, '%') + AND rep.`explain` LIKE CONCAT('%', #{explain}, '%') + AND rep.failure_type_id = #{failureTypeId} + AND rep.remark = '5110' + AND rep.remark is null + AND rep.eval_service >= 4 + AND rep.eval_service = 3 + AND rep.eval_service <= 2 + and predate is not null and predate < now() and status < 9 + order by rep.create_time \ No newline at end of file diff --git a/shoot-hand/ics-common/ics-common-redis/src/main/java/com/ics/common/redis/util/RedisUtils.java b/shoot-hand/ics-common/ics-common-redis/src/main/java/com/ics/common/redis/util/RedisUtils.java index 91c5f3d..f7e5a6d 100644 --- a/shoot-hand/ics-common/ics-common-redis/src/main/java/com/ics/common/redis/util/RedisUtils.java +++ b/shoot-hand/ics-common/ics-common-redis/src/main/java/com/ics/common/redis/util/RedisUtils.java @@ -26,9 +26,9 @@ public class RedisUtils { private ValueOperations valueOperations; /** - * 默认过期时长，单位：秒 + * 默认过期时长，单位：秒；14天过期 */ - public final static long DEFAULT_EXPIRE = 60 * 60 * 12; + public final static long DEFAULT_EXPIRE = 60 * 60 * 24 * 14; /** * 不设置过期时长