diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java index 88a2afae..53cf2f3c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java @@ -56,7 +56,22 @@ public class CleanOrder extends TenantEntity { * 单价 */ private Double prices; - + /** + * 保洁类型 + */ + private String type; + /** + * 评价 + */ + private Integer serviceEvalua; + /** + * 评价文本 + */ + private String serviceEvaluaText; + /** + * 图片 + */ + private String imgUrl; /** * 总价 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Meet.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Meet.java index 0262f96e..f321bb21 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Meet.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Meet.java @@ -32,6 +32,16 @@ public class Meet extends TenantEntity { * 会议室名称 */ private String name; + /** + * 会议室类型( + * 1标准会议室 + * 2培训会议室 + * 3治谈会议室 + * 4多媒体会议室 + * 5圆形会议室 + * 6贵宾会议室) + */ + private String meetingRoomType; /** * 位置 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java index fb90a2d4..d3313a71 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java @@ -1,5 +1,6 @@ package org.dromara.property.domain; +import cn.idev.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -38,7 +39,10 @@ public class ServiceWorkOrders extends TenantEntity { * 工单名称 */ private String orderName; - + /** + * 权重 + */ + private String processingWeight; /** * 工单类型 */ @@ -74,6 +78,7 @@ public class ServiceWorkOrders extends TenantEntity { */ private String location; + /** * 计划完成时间 */ @@ -88,6 +93,18 @@ public class ServiceWorkOrders extends TenantEntity { * 评价 */ private Integer serviceEvalua; + /** + * 评价文本 + */ + private String serviceEvaluaText; + /** + * 图片 + */ + private String imgUrl; + /** + * 备注 + */ + private String remark; /** * 是否超时 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoom.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoom.java index 0c6536b0..9df7bc42 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoom.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoom.java @@ -84,6 +84,13 @@ public class TbRoom extends TenantEntity { * 状态（'空置','已售','已租','自用'） */ private Integer status; + /** + * 是否重要(1非常重要、2重要、3一般) + */ + private String isMatter; - + /** + * 是否重要(1非常重要、2重要、3一般) + */ + private String imgUrl; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java index a7f43f2e..056fa091 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java @@ -44,7 +44,11 @@ public class CleanOrderBo extends BaseEntity { * 面积 */ private Double area; - + /** + * 保洁类型 + */ + @NotBlank(message = "保洁类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String type; /** * 保洁id */ @@ -91,6 +95,18 @@ public class CleanOrderBo extends BaseEntity { * 单位id */ @NotNull(message = "单位id不能为空", groups = {AddGroup.class, EditGroup.class}) + /** + * 评价 + */ + private Integer serviceEvalua; + /** + * 评价文本 + */ + private String serviceEvaluaText; + /** + * 图片 + */ + private String imgUrl; private Long unitId; // /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java index 65e01988..1c4cd02a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBo.java @@ -1,5 +1,6 @@ package org.dromara.property.domain.bo; +import cn.idev.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import org.dromara.property.domain.Meet; import org.dromara.common.mybatis.core.domain.BaseEntity; @@ -35,7 +36,17 @@ public class MeetBo extends BaseEntity { */ @NotBlank(message = "会议室名称不能为空") private String name; - + /** + * 会议室类型( + * 1标准会议室 + * 2培训会议室 + * 3治谈会议室 + * 4多媒体会议室 + * 5圆形会议室 + * 6贵宾会议室) + */ + @NotBlank(message = "会议室类型不能为空") + private String meetingRoomType; /** * 位置 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java index dc33ecea..c7c27efe 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java @@ -1,6 +1,7 @@ package org.dromara.property.domain.bo; +import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -38,7 +39,11 @@ public class ServiceWorkOrdersBo extends BaseEntity { */ @NotNull(message = "工单名称不能为空", groups = { EditGroup.class }) private String orderName; - + /** + * 权重 + */ + @ExcelProperty(value = "权重") + private String processingWeight; /** * 工单类型 */ @@ -76,7 +81,7 @@ public class ServiceWorkOrdersBo extends BaseEntity { /** * 计划完成时间 */ - @NotNull(message = "计划完成时间不能为空", groups = { EditGroup.class }) + //@NotNull(message = "计划完成时间不能为空", groups = { EditGroup.class }) private Date planCompleTime; /** @@ -88,6 +93,18 @@ public class ServiceWorkOrdersBo extends BaseEntity { * 评价 */ private Integer serviceEvalua; + /** + * 评价文本 + */ + private String serviceEvaluaText; + /** + * 图片 + */ + private String imgUrl; + /** + * 备注 + */ + private String remark; /** * 是否超时 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBo.java index bd2a9c6a..bfc8aeeb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBo.java @@ -71,5 +71,12 @@ public class TbRoomBo extends BaseEntity { */ private Integer status; - + /** + * 是否重要(1非常重要、2重要、3一般) + */ + private String isMatter; + /** + * 是否重要(1非常重要、2重要、3一般) + */ + private String imgUrl; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java index 2017848a..e078a789 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java @@ -51,7 +51,22 @@ public class CleanOrderVo implements Serializable { */ @ExcelProperty(value = "面积") private Long area; - + /** + * 保洁类型 + */ + private String type; + /** + * 评价 + */ + private Integer serviceEvalua; + /** + * 评价文本 + */ + private String serviceEvaluaText; + /** + * 图片 + */ + private String imgUrl; // /** // * 保洁id // */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetVo.java index fd2c71ff..a0b2335c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MeetVo.java @@ -37,7 +37,17 @@ public class MeetVo implements Serializable { */ @ExcelProperty(value = "会议室名称") private String name; - + /** + * 会议室类型( + * 1标准会议室 + * 2培训会议室 + * 3治谈会议室 + * 4多媒体会议室 + * 5圆形会议室 + * 6贵宾会议室) + */ + @ExcelProperty(value = "会议室类型") + private String meetingRoomType; /** * 会议室位置 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrderAnalysisVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrderAnalysisVo.java index 9687a5db..6c63a297 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrderAnalysisVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrderAnalysisVo.java @@ -39,6 +39,20 @@ public class ServiceWorkOrderAnalysisVo { this.orderCount = orderCount; } } + + /** + *获取不满意工单名称 + */ + @Data + @Accessors(chain = true) + public static class DissatisfactionVo { + private String orderName; // 工单名称 + private Long id; // 工单id + public DissatisfactionVo(String orderName, Long id) { + this.orderName = orderName; + this.id = id; + } + } /** * 满意度图表数据对象 */ @@ -86,6 +100,7 @@ public class ServiceWorkOrderAnalysisVo { private List satisfactionRateList; private List satisfactionChartList; private List recentSixMonthWorkOrders; + private List dissatisfactionVos; // 私有构造函数，确保使用Builder模式构建对象 private ServiceWorkOrderAnalysisVo() {} @@ -107,6 +122,7 @@ public class ServiceWorkOrderAnalysisVo { private List satisfactionRateList; private List satisfactionChartList; private List recentSixMonthWorkOrders; + private List dissatisfactionVos; public ServiceWorkOrderAnalysisVo build() { ServiceWorkOrderAnalysisVo vo = new ServiceWorkOrderAnalysisVo(); @@ -123,6 +139,7 @@ public class ServiceWorkOrderAnalysisVo { vo.satisfactionRateList = this.satisfactionRateList; vo.satisfactionChartList = this.satisfactionChartList; vo.recentSixMonthWorkOrders = this.recentSixMonthWorkOrders; + vo.dissatisfactionVos = this.dissatisfactionVos; return vo; } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java index ac45e2f2..f8d2f936 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java @@ -37,6 +37,11 @@ public class ServiceWorkOrdersVo implements Serializable { */ @ExcelProperty(value = "工单编号") private String orderNo; + /** + * 权重 + */ + @ExcelProperty(value = "权重") + private String processingWeight; /** * 工单名称 @@ -123,14 +128,20 @@ public class ServiceWorkOrdersVo implements Serializable { private String isTimeOut; /** - * 搜索值 + * 评价文本 */ - @ExcelProperty(value = "搜索值") - private String searchValue; + private String serviceEvaluaText; + /** + * 图片 + */ + private String imgUrl; + /** + * 备注 + */ + private String remark; /** * 创建时间 */ - @ExcelProperty(value = "创建时间") private Date createTime; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomVo.java index 533b7dba..4290fc39 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomVo.java @@ -112,5 +112,12 @@ public class TbRoomVo implements Serializable { @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "status", other = "wy_fjzt") private String statusName; - + /** + * 是否重要(1非常重要、2重要、3一般) + */ + private String isMatter; + /** + * 图片 + */ + private String imgUrl; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java index 2c80ce61..9e7c4419 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java @@ -70,7 +70,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService { */ @Override public List queryList(MeetAttachBo bo) { - bo.setState(0); + bo.setState(1); LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); }