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 0000000..98947bf Binary files /dev/null and b/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls differ diff --git a/shoot-hand/ics-admin/src/main/resources/excel/工单导出模版.xls b/shoot-hand/ics-admin/src/main/resources/excel/工单导出模版.xls index b39c71f..7060cda 100644 Binary files a/shoot-hand/ics-admin/src/main/resources/excel/工单导出模版.xls and b/shoot-hand/ics-admin/src/main/resources/excel/工单导出模版.xls differ 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; /** * 不设置过期时长