lcj/xny-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

09-23-抢修，报修优化

Browse Source
This commit is contained in:
青云
2025-09-23 15:56:12 +08:00
parent 8cf7b0125d
commit 052c5c8ea0
6 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionRepairBo.java
View File

@ -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; private String reportName;
/** /**
* 报修人联系电话 * 报修人联系电话
*/ */
@NotBlank(message = "报修人联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "报修人联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
private String reportPhone; private String reportPhone;
/** /**

4
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java
View File

@ -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; private String reportName;
/** /**
* 报修人联系电话 * 报修人联系电话
*/ */
@NotBlank(message = "电话不能为空", groups = {AddGroup.class, EditGroup.class}) // @NotBlank(message = "电话不能为空", groups = {AddGroup.class, EditGroup.class})
private String reportPhone; private String reportPhone;
private String reportFinal; private String reportFinal;

1
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionRepairVo.java
View File

@ -138,4 +138,5 @@ public class OpsInspectionRepairVo implements Serializable {
private Date createTime; private Date createTime;
private Long createBy;
} }

2
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java
View File

@ -116,4 +116,6 @@ public class OpsInspectionReportVo implements Serializable {
private Date createTime; private Date createTime;
private Long createBy;
} }

11
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionRepairServiceImpl.java
View File

@ -210,13 +210,22 @@ public class OpsInspectionRepairServiceImpl implements IOpsInspectionRepairServi
vo.setSendPersonVo(opsUserVo); vo.setSendPersonVo(opsUserVo);
//处理分钟数 //处理分钟数
if (vo.getStatus().equals("3")){ if (vo.getStatus().equals("3")){
long time = vo.getReportFinishTime().getTime() - vo.getCreateTime().getTime(); long time = vo.getReportFinishTime().getTime() - vo.getCreateTime().getTime();
vo.setMinute(String.valueOf(TimeUnit.MILLISECONDS.toMinutes( time))); 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());
}
}
} }
} }

9
ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java
View File

@ -223,6 +223,15 @@ public class OpsInspectionReportServiceImpl implements IOpsInspectionReportServi
vo.setSendPersonVo(opsUserVo); 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());
}
}
} }
} }