From 8524b37dba10f3efc7c8f7a0626551c8ee798f38 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sat, 18 May 2024 11:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=87=BA=E5=85=A5=E5=9C=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/xz/controller/XzMaterialController.java | 11 +++++++++-- .../com/zhgd/xmgl/modules/xz/entity/XzMaterial.java | 8 +++++++- .../controller/XzBlindPlatePlugSafeController.java | 2 +- .../special/controller/XzGroundSafetController.java | 2 +- .../special/controller/XzHighJobSafeController.java | 2 +- .../controller/XzHoistSafetyWorkController.java | 2 +- .../controller/XzLimitSpaceSafeController.java | 2 +- .../controller/XzOpenCircuitSafeController.java | 2 +- .../XzSpecialOperationFireSafetyController.java | 2 +- .../XzTemporaryElectricitySafeController.java | 2 +- 10 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java index 759ca5456..9d032e225 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.controller; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -99,7 +100,7 @@ public class XzMaterialController { map.remove("enterpriseId"); QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzMaterial.class, map); Page page = PageUtil.getPage(map); - queryWrapper.orderByDesc("entry_time"); + queryWrapper.orderByDesc("entry_begin_time"); if (enterpriseId != null && StringUtils.isNotBlank(enterpriseId.toString())) { List enterpriseIds = new ArrayList<>(); String projectSn = map.get("projectSn").toString(); @@ -196,7 +197,13 @@ public class XzMaterialController { } xzMaterial.setNum(index); } - xzMaterial.setEntryTime(obj.getDate("entryTime")); + JSONArray entryTime = obj.getJSONArray("entryTime"); + if (entryTime != null) { + String begin = entryTime.getString(0); + String end = entryTime.getString(1); + xzMaterial.setEntryBeginTime(DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); + xzMaterial.setEntryEndTime(DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); + } JSONArray detail = obj.getJSONArray("detail"); if (detail != null) { for (int i = 0; i < detail.size(); i++) { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java index b04c6218b..72a61ed2c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java @@ -56,7 +56,13 @@ public class XzMaterial implements Serializable { */ @Excel(name = "入场时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "入场时间") - private Date entryTime; + private Date entryBeginTime; + /** + * 入场时间 + */ + @Excel(name = "入场时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "入场时间") + private Date entryEndTime; /** * 项目sn */ 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 0a6681f96..f32cc67fe 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 @@ -99,7 +99,7 @@ public class XzBlindPlatePlugSafeController { JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); if (hotWorkExecutionBeginTime != null) { String begin = hotWorkExecutionBeginTime.getString(0); - String end = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(1); paramMap.put("hotWorkExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("hotWorkExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java index 3cce8542c..5294fd77b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java @@ -99,7 +99,7 @@ public class XzGroundSafetController { JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); if (hotWorkExecutionBeginTime != null) { String begin = hotWorkExecutionBeginTime.getString(0); - String end = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(1); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java index f46b8bda6..cfa93ba6e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java @@ -99,7 +99,7 @@ public class XzHighJobSafeController { JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); if (hotWorkExecutionBeginTime != null) { String begin = hotWorkExecutionBeginTime.getString(0); - String end = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(1); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java index 4111d0e10..fe8095ab6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java @@ -99,7 +99,7 @@ public class XzHoistSafetyWorkController { JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); if (hotWorkExecutionBeginTime != null) { String begin = hotWorkExecutionBeginTime.getString(0); - String end = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(1); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java index 9d13a2f9e..536148c55 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java @@ -96,7 +96,7 @@ public class XzLimitSpaceSafeController { JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); if (hotWorkExecutionBeginTime != null) { String begin = hotWorkExecutionBeginTime.getString(0); - String end = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(1); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java index 627109bfa..b2aeedafe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java @@ -97,7 +97,7 @@ public class XzOpenCircuitSafeController { JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); if (hotWorkExecutionBeginTime != null) { String begin = hotWorkExecutionBeginTime.getString(0); - String end = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(1); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java index 804451be1..73fe1b3a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java @@ -100,7 +100,7 @@ public class XzSpecialOperationFireSafetyController { JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); if (hotWorkExecutionBeginTime != null) { String begin = hotWorkExecutionBeginTime.getString(0); - String end = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(1); paramMap.put("hotWorkExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("hotWorkExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java index 0f91fbd69..9de733538 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java @@ -99,7 +99,7 @@ public class XzTemporaryElectricitySafeController { JSONArray workExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); if (workExecutionBeginTime != null) { String begin = workExecutionBeginTime.getString(0); - String end = workExecutionBeginTime.getString(0); + String end = workExecutionBeginTime.getString(1); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); }