From e278754b54248cc0a4057eb4e01ab8a26d606d67 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Sun, 23 Nov 2025 11:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/entity/tszy/upload/Dhzy.java | 20 +++++++++++ .../model/entity/tszy/upload/Dlzy.java | 19 +++++++++++ .../model/entity/tszy/upload/Dtzy.java | 15 +++++++++ .../model/entity/tszy/upload/Dzaqzy.java | 15 +++++++++ .../model/entity/tszy/upload/Gczy.java | 17 ++++++++++ .../model/entity/tszy/upload/Lsydzy.java | 16 +++++++++ .../model/entity/tszy/upload/Mbcdzy.java | 17 ++++++++++ .../model/entity/tszy/upload/Sxkjzy.java | 21 +++++++++++- src/main/resources/application.yml | 2 +- src/main/resources/mapper/FxfxdxMapper.xml | 33 ++++++++++++++----- 10 files changed, 165 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dhzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dhzy.java index 08b83a9..6bd9ab2 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dhzy.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dhzy.java @@ -81,6 +81,26 @@ public class Dhzy { private String shifouweiqiyetuisong; + + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + + + + + public String getBianhao() { return bianhao; } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java index f2308a3..12b660c 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dlzy.java @@ -40,6 +40,25 @@ public class Dlzy { private String querenren3; private String qiyebianma; + + + + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + + public String getQiyebianma() { return qiyebianma; } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dtzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dtzy.java index bf1a068..de1e963 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dtzy.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dtzy.java @@ -57,6 +57,21 @@ public class Dtzy { private String qiyebianma; + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + public String getQiyebianma() { return qiyebianma; } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dzaqzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dzaqzy.java index 5cf79f4..6869da1 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dzaqzy.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Dzaqzy.java @@ -77,6 +77,21 @@ public class Dzaqzy { private String shifousheji20; private String querenren20; + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + public String getBianhao() { return bianhao; diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Gczy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Gczy.java index 0ba2c78..31259cf 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Gczy.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Gczy.java @@ -65,6 +65,23 @@ public class Gczy { private String shifouweiqiyetuisong; + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + + + public String getBianhao() { return bianhao; } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Lsydzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Lsydzy.java index 15b1fb6..5e9568f 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Lsydzy.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Lsydzy.java @@ -69,6 +69,22 @@ public class Lsydzy { private String querenren14; + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + + public String getQiyebianma() { return qiyebianma; } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Mbcdzy.java b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Mbcdzy.java index 318142e..aba74c7 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Mbcdzy.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Mbcdzy.java @@ -65,6 +65,23 @@ public class Mbcdzy { private String guanliandeqitateshuz; private String shifouweiqiyetuisong; + + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + + public String getMangbanchouduzuoyedi() { return mangbanchouduzuoyedi; } 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 31c4254..442358e 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 @@ -72,6 +72,23 @@ public class Sxkjzy { private String zuoyeshenqingshijian; + private String zuoyeyanshoushijian; + private String qianfashijian; + public String getQianfashijian() { + return qianfashijian; + } + public void setQianfashijian(String qianfashijian) { + this.qianfashijian = qianfashijian; + } + public String getZuoyeyanshoushijian() { + return zuoyeyanshoushijian; + } + public void setZuoyeyanshoushijian(String zuoyeyanshoushijian) { + this.zuoyeyanshoushijian = zuoyeyanshoushijian; + } + + + public String getZuoyeshenqingshijian() { return zuoyeshenqingshijian; } @@ -79,7 +96,9 @@ public class Sxkjzy { public void setZuoyeshenqingshijian(String zuoyeshenqingshijian) { this.zuoyeshenqingshijian = zuoyeshenqingshijian; } - + /** + * + * */ public String getShouxiankongjianming() { return shouxiankongjianming; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index eb49595..ea88ff2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev + active: prod server: port: 8118 \ No newline at end of file diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 4e017a1..1387e9c 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -697,7 +697,10 @@ A.NAME08 AS guanliandeqitateshuz, d.personname9 AS jieshoujiaodiren, d.firepersonname2 AS anquanjiaodiren, - '是' as shifouweiqiyetuisong + '是' as shifouweiqiyetuisong, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian FROM OTM_OPERATICK A LEFT JOIN ISM_AREA B ON @@ -814,7 +817,9 @@ A.NAME08 AS guanliandeqitateshuz, d.personname9 AS jieshoujiaodiren, d.firepersonname2 AS anquanjiaodiren, - '是' as shifouweiqiyetuisong + '是' as shifouweiqiyetuisong, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian FROM OTM_OPERATICK A LEFT JOIN ISM_AREA B ON @@ -930,7 +935,9 @@ 'BS07', '坍塌'), 'BS08', '高处坠落'), 'BS09', '中毒和窒息'), 'BS10', '锅炉爆炸'), 'BS11', '容器爆炸'), 'BS12', '淹溺'), 'BS13', '其它爆炸'), 'BS14', '其它伤害') AS fengxianbianshijiegu, -- 关联其他作业票需改进 A.NAME08 AS guanliandeqitateshuz, - '是' as shifouweiqiyetuisong + '是' as shifouweiqiyetuisong, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian FROM OTM_OPERATICK A LEFT JOIN ISM_AREA B ON @@ -1047,7 +1054,9 @@ A.NAME08 AS guanlianqitateshuzuo, d.personname9 AS jieshoujiaodiren, '是' as shifouweiqiyetuisong, - d.firepersonname2 AS anquanjiaodiren + d.firepersonname2 AS anquanjiaodiren, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian --添加安措 FROM OTM_OPERATICK A @@ -1161,7 +1170,9 @@ --a.otherhaziden, '是' as shifouweiqiyetuisong, -- 关联其他作业票需改进 - A.NAME08 AS guanlianqitateshuzuo + A.NAME08 AS guanlianqitateshuzuo, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian --添加安措 FROM OTM_OPERATICK A @@ -1270,7 +1281,9 @@ d.OPINION1 as yijian1, d.OPINION2 as yijian2, d.OPINION3 as yijian3, - d.OPINION6 as yijian4 + d.OPINION6 as yijian4, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian FROM OTM_OPERATICK A LEFT JOIN ISM_AREA B ON @@ -1367,7 +1380,9 @@ 'BS07', '坍塌'), 'BS08', '高处坠落'), 'BS09', '中毒和窒息'), 'BS10', '锅炉爆炸'), 'BS11', '容器爆炸'), 'BS12', '淹溺'), 'BS13', '其它爆炸'), 'BS14', '其它伤害') AS fengxianbianshijiegu, -- 关联其他作业票需改进 A.NAME08 AS guanlianqitateshuzuo, - '是' as shifouweiqiyetuisong + '是' as shifouweiqiyetuisong, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian --添加安措 FROM OTM_OPERATICK A @@ -1464,7 +1479,9 @@ 'BS07', '坍塌'), 'BS08', '高处坠落'), 'BS09', '中毒和窒息'), 'BS10', '锅炉爆炸'), 'BS11', '容器爆炸'), 'BS12', '淹溺'), 'BS13', '其它爆炸'), 'BS14', '其它伤害') AS fengxianbianshijiegu, -- 关联其他作业票需改进 A.NAME08 AS guanlianqitateshuzuo, - '是' as shifouweiqiyetuisong + '是' as shifouweiqiyetuisong, + FORMAT(d.CHECKDATE8, 'yyyy-MM-dd HH:mm:ss') as zuoyeyanshoushijian, + FORMAT(d.CHECKDATE7, 'yyyy-MM-dd HH:mm:ss') as qianfashijian --添加安措 FROM OTM_OPERATICK A