From 8cd2d2d8c805be35db8f697926aea59792e80b36 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 18 八月 2025 09:07:56 +0800
Subject: [PATCH] 维修工单修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 8 ++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 9 +++++----
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 6 ++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderExport.java | 7 +++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java | 8 ++++----
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java | 5 +++--
6 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderExport.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderExport.java
index 177e94c..724ebd6 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderExport.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderExport.java
@@ -95,6 +95,13 @@
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String reportPerson;
+ /**鏁呴殰寮�濮嬫椂闂�*/
+ @Excel(name = "鏁呴殰寮�濮嬫椂闂�", width = 15,format = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(name = "鏁呴殰寮�濮嬫椂闂�",notes = "")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date faultStartTime;
+
/** 缁翠慨寮�濮嬫椂闂� */
@Excel(name = "缁翠慨寮�濮嬫椂闂�", width = 15,format = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(name = "缁翠慨寮�濮嬫椂闂�",notes = "")
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java
index af2f859..7f4dad5 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java
@@ -51,8 +51,9 @@
@Dict(dicCode = "is_processed")
private String isProcessed;
/**鏁呴殰寮�濮嬫椂闂�*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(name = "鏁呴殰寮�濮嬫椂闂�",notes = "")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date faultStartTime;
/**鏄惁鍋滄満*/
@Dict(dicCode = "yn")
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
index 655ca3f..f63f994 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -94,6 +94,12 @@
@ApiModelProperty(value = "鎶ヤ慨浜�")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String reportPerson;
+ /**鏁呴殰寮�濮嬫椂闂�*/
+ @Excel(name = "鏁呴殰寮�濮嬫椂闂�", width = 15,format = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(name = "鏁呴殰寮�濮嬫椂闂�",notes = "")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date faultStartTime;
/** 缁翠慨寮�濮嬫椂闂� */
@ApiModelProperty(name = "缁翠慨寮�濮嬫椂闂�",notes = "")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
index 5a2a066..2406197 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
@@ -68,10 +68,10 @@
@Dict(dicCode = "is_processed")
private String isProcessed;
/**鏁呴殰寮�濮嬫椂闂�*/
- @Excel(name = "鏁呴殰寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏁呴殰寮�濮嬫椂闂�")
+ @Excel(name = "鏁呴殰寮�濮嬫椂闂�", width = 15,format = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(name = "鏁呴殰寮�濮嬫椂闂�",notes = "")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date faultStartTime;
/**鏄惁鍋滄満*/
@Excel(name = "鏄惁鍋滄満", width = 15)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 1f74848..1ef4f8e 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -216,14 +216,15 @@
endTime=eamRepairOrder.getActualEndTime();
eamRepairOrder.setRepairDuration(TimeUtil.howLong(startTime,endTime,2));
//缁翠慨缁撴潫鏃堕棿-鏁呴殰鎶ヤ慨鏃堕棿=鏁呴殰鏃堕暱
- startTime=eamRepairOrder.getCreateTime();
- endTime=eamRepairOrder.getActualEndTime();
- eamRepairOrder.setFaultDuration(TimeUtil.howLong(startTime,endTime,2));
- this.updateById(eamRepairOrder);
EamReportRepair eamReportRepair=eamReportRepairService.getById(eamRepairOrder.getReportId());
if (eamReportRepair==null){
return false;
}
+ startTime=eamReportRepair.getFaultStartTime();
+ endTime=eamRepairOrder.getActualEndTime();
+ eamRepairOrder.setFaultDuration(TimeUtil.howLong(startTime,endTime,2));
+ eamRepairOrder.setFaultStartTime(new Date());
+ this.updateById(eamRepairOrder);
eamReportRepair.setReportStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
eamReportRepairService.updateById(eamReportRepair);
List<EamRepairPerson> eamRepairPersonList=new ArrayList<>();
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index c2a3a21..331183b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -250,6 +250,8 @@
eamRepairOrder.setReportId(eamReportRepair.getId());
eamRepairOrder.setReportPerson(eamReportRepair.getCreateBy());
eamRepairOrder.setFaultPhenomenon(eamReportRepair.getFaultDescription());
+ eamRepairOrder.setFaultStartTime(eamReportRepair.getFaultStartTime());
+ eamRepairOrder.setClaimStatus("0");
eamRepairOrder.setRepairStatus(EamRepairOrderRepairStatusEnum.PENDING_REPAIR.name());
iEamRepairOrderService.save(eamRepairOrder);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -300,6 +302,12 @@
}
updateWrapper.eq(EamReportRepair::getId,eamReportRepairDto.getId());
this.update(eamReportRepair,updateWrapper);
+ //淇敼缁翠慨宸ュ崟
+ EamRepairOrder eamRepairOrder=iEamRepairOrderService.
+ getOne(new QueryWrapper<EamRepairOrder>().eq("report_id",eamReportRepairDto.getId()));
+ eamRepairOrder.setFaultStartTime(eamReportRepairDto.getFaultStartTime());
+ eamRepairOrder.setFaultPhenomenon(eamReportRepairDto.getFaultDescription());
+ iEamRepairOrderService.updateById(eamRepairOrder);
return true;
}
--
Gitblit v1.9.3