diff --git a/src/main/resources/mapper/ZypSingleQueryMapper.xml b/src/main/resources/mapper/ZypSingleQueryMapper.xml index 13271c0..ccf079f 100644 --- a/src/main/resources/mapper/ZypSingleQueryMapper.xml +++ b/src/main/resources/mapper/ZypSingleQueryMapper.xml @@ -86,7 +86,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 @@ -183,7 +186,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 @@ -299,7 +305,10 @@ '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 @@ -415,7 +424,10 @@ -- 关联其他作业票需改进 A.NAME08 AS guanlianqitateshuzuo, d.personname9 AS jieshoujiaodiren, - '是' 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, d.firepersonname2 AS anquanjiaodiren --添加安措 FROM @@ -528,7 +540,10 @@ (a.haziden, 'BS01', '物体打击'), 'BS02', '机械伤害'), 'BS03', '起重伤害'), 'BS04', '触电'), 'BS05', '灼烫'), 'BS06', '火灾'), 'BS07', '坍塌'), 'BS08', '高处坠落'), 'BS09', '中毒和窒息'), 'BS10', '锅炉爆炸'), 'BS11', '容器爆炸'), 'BS12', '淹溺'), 'BS13', '其它爆炸'), 'BS14', '其它伤害') AS fengxianbianshijiegu, --a.otherhaziden, - '是' 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, -- 关联其他作业票需改进 A.NAME08 AS guanlianqitateshuzuo --添加安措 @@ -633,7 +648,10 @@ REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE (a.haziden, 'BS01', '物体打击'), 'BS02', '机械伤害'), 'BS03', '起重伤害'), 'BS04', '触电'), 'BS05', '灼烫'), 'BS06', '火灾'), 'BS07', '坍塌'), 'BS08', '高处坠落'), 'BS09', '中毒和窒息'), 'BS10', '锅炉爆炸'), 'BS11', '容器爆炸'), 'BS12', '淹溺'), 'BS13', '其它爆炸'), 'BS14', '其它伤害') AS fengxianbianshijiegu, - '是' 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, -- 关联其他作业票需改进 A.NAME08 AS guanlianqitateshuzuo, d.OPINION1 as yijian1, @@ -737,7 +755,10 @@ '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 @@ -834,7 +855,10 @@ '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