From 4ac6d0f8db6ccaedfa2c0287f170a2351a3a6dd0 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 14 Jun 2024 19:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B2=E6=9D=BF=E6=8A=BD=E5=A0=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzBlindPlatePlugSafeController.java | 7 +++++++ .../modules/xz/special/entity/XzBlindPlatePlugSafe.java | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java index ba8019288..37b7ec2d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java @@ -104,6 +104,13 @@ public class XzBlindPlatePlugSafeController { paramMap.put("hotWorkExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("hotWorkExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } + JSONArray actualJobBeginTime = paramMap.getJSONArray("actualJobBeginTime"); + if (actualJobBeginTime != null) { + String begin = actualJobBeginTime.getString(0); + String end = actualJobBeginTime.getString(1); + paramMap.put("actualJobBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); + paramMap.put("actualJobEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); + } JSONArray operatingUnit = paramMap.getJSONArray("operatingUnit"); if (operatingUnit != null) { paramMap.put("operatingUnit", operatingUnit.get(0)); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java index 7a5e201e6..172132297 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java @@ -58,6 +58,15 @@ public class XzBlindPlatePlugSafe implements Serializable { @ApiModelProperty(value = "实际作业开始时间") private java.util.Date actualJobBeginTime; + /** + * 实际作业结束时间 + */ + @Excel(name = "实际作业结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "实际作业结束时间") + private java.util.Date actualJobEndTime; + /** * 作业单位 */