From 783226a366fafa2e4fb05b2aa06a6c2ccc08c017 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 30 Jul 2025 12:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java | 9 +++++++++
 .../java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java  | 4 ++--
 src/main/resources/mapper/FxfxdxMapper.xml               | 7 +++++--
 src/main/resources/mapper/ZypSingleQueryMapper.xml       | 2 ++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java
index c05b2a4..31c4254 100644
--- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java
+++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java
@@ -69,8 +69,17 @@ public class Sxkjzy {
     private String guanliandeqitateshuz;
     private String shifouweiqiyetuisong;
     private String shouxiankongjianming;
+    private String zuoyeshenqingshijian;
 
 
+    public String getZuoyeshenqingshijian() {
+        return zuoyeshenqingshijian;
+    }
+
+    public void setZuoyeshenqingshijian(String zuoyeshenqingshijian) {
+        this.zuoyeshenqingshijian = zuoyeshenqingshijian;
+    }
+
     public String getShouxiankongjianming() {
         return shouxiankongjianming;
     }
diff --git a/src/main/java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java b/src/main/java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java
index c3af80f..d6e5a31 100644
--- a/src/main/java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java
+++ b/src/main/java/com/hxjt/dataupload/utils/tszy/SxkjzyUtil.java
@@ -8,7 +8,7 @@ public class SxkjzyUtil {
 
     public static void handle(Sxkjzy sxkjzy, Aqcs aqcs) {
         if(aqcs.getAncuoneirong().startsWith("盛装过有毒、可燃物料的受限空间，所有与受限空间有联系的阀")){
-            sxkjzy.setShifousheji1(aqcs.getShifousheji().equals("Y")?"是":"否");
+            sxkjzy.setShifousheji(aqcs.getShifousheji().equals("Y")?"是":"否");
             sxkjzy.setQuerenren1(aqcs.getQuerenren());
         }else if(aqcs.getAncuoneirong().startsWith("盛装过有毒、可燃物料及其他物料的受限空间，设备已经过置")){
             sxkjzy.setShifousheji2(aqcs.getShifousheji().equals("Y")?"是":"否");
@@ -16,7 +16,7 @@ public class SxkjzyUtil {
         }else if(aqcs.getAncuoneirong().startsWith("设备打开通风孔进行自然通风，温度适宜人员作业；必要时采用")){
             sxkjzy.setShifousheji3(aqcs.getShifousheji().equals("Y")?"是":"否");
             sxkjzy.setQuerenren3(aqcs.getQuerenren());
-        }else if(aqcs.getAncuoneirong().startsWith("带搅拌机的设备、转动设备已切断电源，电源开关处")){
+        }else if(aqcs.getAncuoneirong().startsWith("转动设备已切断电源")){
             sxkjzy.setShifousheji4(aqcs.getShifousheji().equals("Y")?"是":"否");
             sxkjzy.setQuerenren4(aqcs.getQuerenren());
         }else if(aqcs.getAncuoneirong().startsWith("受限空间内部已具备进人作业条件，易燃易爆物料容器内")){
diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index a6f998a..0882422 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -755,8 +755,11 @@
 		--受限空间
 		SELECT
 			--bianhao
-			a.fireworktype as shouxiankongjianming,
-			a.ID as bianhao,
+			FORMAT(A.applytime,
+			'yyyy-MM-dd HH:mm:ss')as zuoyeshenqingshijian,
+
+			A.fireworktype as shouxiankongjianming,
+			A.ID as bianhao,
 			--zuoyeshenqingdanwei
 			(CASE
 				WHEN C.FNAME like '%中碳%' THEN '恒信中碳氢能源科技（山东）有限公司'
diff --git a/src/main/resources/mapper/ZypSingleQueryMapper.xml b/src/main/resources/mapper/ZypSingleQueryMapper.xml
index 8292244..13271c0 100644
--- a/src/main/resources/mapper/ZypSingleQueryMapper.xml
+++ b/src/main/resources/mapper/ZypSingleQueryMapper.xml
@@ -127,6 +127,8 @@
 		--受限空间
 		SELECT
 			--bianhao
+			FORMAT(A.applytime,
+			'yyyy-MM-dd HH:mm:ss')as zuoyeshenqingshijian,
 			a.fireworktype as shouxiankongjianming,
 			a.ID as bianhao,
 			--zuoyeshenqingdanwei