From 052c5c8ea09e0f843f91c87a92ada78100add5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Tue, 23 Sep 2025 15:56:12 +0800 Subject: [PATCH] =?UTF-8?q?09-23-=E6=8A=A2=E4=BF=AE=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/domain/bo/OpsInspectionRepairBo.java | 4 ++-- .../inspection/domain/bo/OpsInspectionReportBo.java | 4 ++-- .../inspection/domain/vo/OpsInspectionRepairVo.java | 1 + .../inspection/domain/vo/OpsInspectionReportVo.java | 2 ++ .../service/impl/OpsInspectionRepairServiceImpl.java | 11 ++++++++++- .../service/impl/OpsInspectionReportServiceImpl.java | 9 +++++++++ 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionRepairBo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionRepairBo.java index 98b00be..2b312ca 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionRepairBo.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionRepairBo.java @@ -87,13 +87,13 @@ public class OpsInspectionRepairBo extends BaseEntity { /** * 报修人姓名 */ - @NotBlank(message = "报修人姓名不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotBlank(message = "报修人姓名不能为空", groups = { AddGroup.class, EditGroup.class }) private String reportName; /** * 报修人联系电话 */ - @NotBlank(message = "报修人联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotBlank(message = "报修人联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) private String reportPhone; /** diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java index 28cd03e..5c175dc 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java @@ -88,13 +88,13 @@ public class OpsInspectionReportBo extends BaseEntity { /** * 报修人姓名 */ - @NotBlank(message = "姓名不能为空", groups = {AddGroup.class, EditGroup.class}) +// @NotBlank(message = "姓名不能为空", groups = {AddGroup.class, EditGroup.class}) private String reportName; /** * 报修人联系电话 */ - @NotBlank(message = "电话不能为空", groups = {AddGroup.class, EditGroup.class}) +// @NotBlank(message = "电话不能为空", groups = {AddGroup.class, EditGroup.class}) private String reportPhone; private String reportFinal; diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionRepairVo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionRepairVo.java index 84bba78..f22a071 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionRepairVo.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionRepairVo.java @@ -138,4 +138,5 @@ public class OpsInspectionRepairVo implements Serializable { private Date createTime; + private Long createBy; } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java index 60ebc9a..f0bd64a 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java @@ -116,4 +116,6 @@ public class OpsInspectionReportVo implements Serializable { private Date createTime; + private Long createBy; + } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionRepairServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionRepairServiceImpl.java index 5e5df29..89ab3c2 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionRepairServiceImpl.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionRepairServiceImpl.java @@ -210,13 +210,22 @@ public class OpsInspectionRepairServiceImpl implements IOpsInspectionRepairServi vo.setSendPersonVo(opsUserVo); - //处理分钟数 if (vo.getStatus().equals("3")){ long time = vo.getReportFinishTime().getTime() - vo.getCreateTime().getTime(); vo.setMinute(String.valueOf(TimeUnit.MILLISECONDS.toMinutes( time))); } + opsUserVo = opsUserService.queryById(vo.getCreateBy()); + if (opsUserVo != null){ + if (opsUserVo.getUserName()!=null) { + vo.setName(opsUserVo.getUserName()); + } + if (opsUserVo.getPhone()!=null){ + vo.setReportPhone(opsUserVo.getPhone()); + } + } + } } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java index 661ee38..cd8eabe 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java @@ -223,6 +223,15 @@ public class OpsInspectionReportServiceImpl implements IOpsInspectionReportServi vo.setSendPersonVo(opsUserVo); + opsUserVo = opsUserService.queryById(vo.getCreateBy()); + if (opsUserVo != null){ + if (opsUserVo.getUserName()!=null) { + vo.setName(opsUserVo.getUserName()); + } + if (opsUserVo.getPhone()!=null){ + vo.setReportPhone(opsUserVo.getPhone()); + } + } } }