增加两个时间字段

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;
     }

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;
     }

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;
     }

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;

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;
     }

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;
     }

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;
     }

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;
     }

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: prod
 server:
   port: 8118

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