From d1449d026b407792e7f89cf0fcaa0d21f4531ff9 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 13 May 2024 10:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=AF=84=E5=88=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DangerousEngineeringSideStationController.java   | 2 +-
 .../service/impl/DangerousEngineeringRecordServiceImpl.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java
index 4f0d64aec..5ce8924f5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java
@@ -70,7 +70,7 @@ public class DangerousEngineeringSideStationController {
     public Result<DangerousEngineeringSideStation> add(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) {
         Result<DangerousEngineeringSideStation> result = new Result<DangerousEngineeringSideStation>();
         try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             dangerousEngineeringSideStation.setCreateTime(sdf.format(new Date()));
             dangerousEngineeringSideStationService.save(dangerousEngineeringSideStation);
             result.successMsg(MessageUtil.get("addSucess"));
diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
index a01c03b3f..2441aa12e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
@@ -240,7 +240,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
                     .between(DangerousEngineeringSideStation::getCreateTime, DateUtil.beginOfMonth(date), DateUtil.endOfMonth(date)));
             Set<String> sideList = new HashSet<>();
             for (DangerousEngineeringSideStation dangerousEngineeringSideStation : list3) {
-                sideList.add(dangerousEngineeringSideStation.getDangerousEngineeringId() + "-" + DateUtil.format(DateUtil.parseDateTime(dangerousEngineeringSideStation.getSideStationTime()), "yyyy-MM-dd"));
+                sideList.add(dangerousEngineeringSideStation.getDangerousEngineeringId() + "-" + DateUtil.format(DateUtil.parseDateTime(dangerousEngineeringSideStation.getCreateTime()), "yyyy-MM-dd"));
             }
             BigDecimal bigDecima2 = new BigDecimal(list3.size());
             BigDecimal result2 = new BigDecimal(0.4);