From c9b270dae703ee077a4e41013d7662c5e61afd29 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 五月 2025 23:02:15 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 ++++-
src/main/webapp/views/index.html | 8 ++++++++
src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java | 4 ++++
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java b/src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java
index b454541..5d6e104 100644
--- a/src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java
@@ -28,6 +28,8 @@
private String modiTime;
//鏇存柊鏃堕棿
private String appeTime;
+ private String crnStrTime;
+ private String crnEndTime;
private String rgvSts;
public RgvWrkMastParam(){};
@@ -42,5 +44,7 @@
this.wrkSts$ = wrkMast.getWrkSts$();
this.modiTime = wrkMast.getModiTime$();
this.appeTime = wrkMast.getAppeTime$();
+ this.crnStrTime = wrkMast.getCrnStrTime$();
+ this.crnEndTime = wrkMast.getCrnEndTime$();
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a9bf2ea..bb21ce1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -344,7 +344,9 @@
wrkMast.setWrkSts(2L);
wrkMast.setRgvNo(rgvProtocol.getRgvNo());
- wrkMast.setAppeTime(new Date());
+ Date now = new Date();
+ wrkMast.setAppeTime(now);
+ wrkMast.setCrnStrTime(now);
try {
wrkMastService.updateById(wrkMast);
break;
@@ -396,6 +398,7 @@
wrkMast.setWrkSts(3L);
Date now = new Date();
wrkMast.setAppeTime(now);
+ wrkMast.setCrnEndTime(now);
try{
try{
if (reportSwitch){
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 55f2291..7f035d3 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -286,6 +286,14 @@
prop="modiTime"
label="涓嬪彂鏃堕棿">
</el-table-column>
+ <el-table-column
+ prop="crnStrTime"
+ label="寮�濮嬫墽琛屾椂闂�">
+ </el-table-column>
+ <el-table-column
+ prop="crnEndTime"
+ label="鎵ц缁撴潫鏃堕棿">
+ </el-table-column>
<!-- <el-table-column-->
<!-- prop="modiTime"-->
<!-- label="鏇存柊鏃堕棿">-->
--
Gitblit v1.9.1