From 6e121391242a6c5c5eff5a540aaaa1a718bdbcac Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Mon, 14 Apr 2025 10:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E4=B8=8A=E6=8A=A5,=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=20=E5=B7=A1=E6=A3=80=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/platform/domain/WorkOrderDelay.java | 2 +- .../main/java/org/dromara/platform/domain/WorkOrderInfo.java | 2 +- .../dromara/platform/domain/bo/DailyInspectionReportBo.java | 2 +- .../org/dromara/platform/domain/bo/WorkOrderDelayBo.java | 4 ++-- .../java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java | 4 ++-- .../java/org/dromara/platform/domain/vo/PointInfoVo.java | 3 ++- .../org/dromara/platform/domain/vo/WorkOrderDelayVo.java | 2 +- .../java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java | 2 +- .../dromara/platform/service/impl/PointInfoServiceImpl.java | 4 +++- .../platform/service/impl/WorkOrderDelayServiceImpl.java | 2 +- .../platform/service/impl/WorkOrderInfoServiceImpl.java | 5 ++++- 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderDelay.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderDelay.java index 1f2bfaa..ca2f8ef 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderDelay.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderDelay.java @@ -104,7 +104,7 @@ public class WorkOrderDelay extends TenantEntity { /** * 所属机构 */ - private String institution; + private String organizationName; /** * 故障地点 diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java index 45f608c..2d09037 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java @@ -107,7 +107,7 @@ public class WorkOrderInfo extends TenantEntity { /** * 所属机构 */ - private String institution; + private String organizationName; /** * 故障地点 diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java index e87def7..d73ac00 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java @@ -92,7 +92,7 @@ public class DailyInspectionReportBo extends BaseEntity { /** * 问题处理描述 */ - @NotBlank(message = "问题处理描述不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "问题处理描述不能为空", groups = { AddGroup.class, EditGroup.class }) private String problemHandleDesc; /** diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderDelayBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderDelayBo.java index 7ee3b15..12f0de6 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderDelayBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderDelayBo.java @@ -75,7 +75,7 @@ public class WorkOrderDelayBo extends BaseEntity { /** * 报修人员ID */ - @NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class }) private String repairerId; /** @@ -118,7 +118,7 @@ public class WorkOrderDelayBo extends BaseEntity { * 所属机构 */ @NotBlank(message = "所属机构不能为空", groups = { AddGroup.class, EditGroup.class }) - private String institution; + private String organizationName; /** * 故障地点 diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java index 9bf98ee..bce56e7 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java @@ -48,7 +48,7 @@ public class WorkOrderInfoBo extends BaseEntity { /** * 报修人员ID */ - @NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class }) private String repairerId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -88,7 +88,7 @@ public class WorkOrderInfoBo extends BaseEntity { * 所属机构 */ @NotBlank(message = "所属机构不能为空", groups = { AddGroup.class, EditGroup.class }) - private String institution; + private String organizationName; /** * 故障地点 diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java index 5ec6eae..9ac65d0 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/PointInfoVo.java @@ -118,5 +118,6 @@ public class PointInfoVo implements Serializable { @ExcelProperty(value = "当前状态") private Long status; - + @ExcelProperty(value = "故障地点") + private String faultLocation; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderDelayVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderDelayVo.java index 34dd683..9fae8af 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderDelayVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderDelayVo.java @@ -128,7 +128,7 @@ public class WorkOrderDelayVo implements Serializable { * 所属机构 */ @ExcelProperty(value = "所属机构") - private String institution; + private String organizationName; /** * 故障地点 diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java index cbf0d7c..8a5ac93 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java @@ -93,7 +93,7 @@ public class WorkOrderInfoVo implements Serializable { * 所属机构 */ @ExcelProperty(value = "所属机构") - private String institution; + private String organizationName; /** * 故障地点 diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java index 51b3a13..d2a72f2 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java @@ -39,7 +39,9 @@ public class PointInfoServiceImpl implements IPointInfoService { */ @Override public PointInfoVo queryById(String id){ - return baseMapper.selectVoById(id); + PointInfoVo pointInfoVo = baseMapper.selectVoById(id); + pointInfoVo.setFaultLocation(pointInfoVo.getPointName()); + return pointInfoVo; } /** diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java index f2f2e08..3e6e750 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderDelayServiceImpl.java @@ -85,7 +85,7 @@ public class WorkOrderDelayServiceImpl implements IWorkOrderDelayService { lqw.eq(bo.getResponseTime() != null, WorkOrderDelay::getResponseTime, bo.getResponseTime()); lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), WorkOrderDelay::getFaultCategory, bo.getFaultCategory()); lqw.eq(bo.getFaultSubcategory() != null, WorkOrderDelay::getFaultSubcategory, bo.getFaultSubcategory()); - lqw.eq(StringUtils.isNotBlank(bo.getInstitution()), WorkOrderDelay::getInstitution, bo.getInstitution()); + lqw.eq(StringUtils.isNotBlank(bo.getOrganizationName()), WorkOrderDelay::getOrganizationName, bo.getOrganizationName()); lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderDelay::getFaultLocation, bo.getFaultLocation()); lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderDelay::getFaultDescription, bo.getFaultDescription()); lqw.eq(StringUtils.isNotBlank(bo.getFaultImage()), WorkOrderDelay::getFaultImage, bo.getFaultImage()); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java index f25204c..2132176 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java @@ -81,7 +81,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { lqw.eq(bo.getResponseTime() != null, WorkOrderInfo::getResponseTime, bo.getResponseTime()); lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), WorkOrderInfo::getFaultCategory, bo.getFaultCategory()); lqw.eq(bo.getFaultSubcategory() != null, WorkOrderInfo::getFaultSubcategory, bo.getFaultSubcategory()); - lqw.eq(StringUtils.isNotBlank(bo.getInstitution()), WorkOrderInfo::getInstitution, bo.getInstitution()); + lqw.eq(StringUtils.isNotBlank(bo.getOrganizationName()), WorkOrderInfo::getOrganizationName, bo.getOrganizationName()); lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderInfo::getFaultLocation, bo.getFaultLocation()); lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderInfo::getFaultDescription, bo.getFaultDescription()); lqw.eq(StringUtils.isNotBlank(bo.getFaultImage()), WorkOrderInfo::getFaultImage, bo.getFaultImage()); @@ -91,6 +91,9 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), WorkOrderInfo::getLatitude, bo.getLatitude()); lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), WorkOrderInfo::getLongitude, bo.getLongitude()); lqw.eq(bo.getStatus() != null, WorkOrderInfo::getStatus, bo.getStatus()); + + // 添加按创建时间降序排序 + lqw.orderByDesc(WorkOrderInfo::getCreateTime); return lqw; }