Browse Source

修复临时用电作业票上传县平台有时缺失作业人等字段的bug

master
liwenxuan 6 months ago
parent
commit
bfcddb17c1
  1. 6
      src/main/resources/mapper/FxfxdxMapper.xml
  2. 6
      src/main/resources/mapper/ZypSingleQueryMapper.xml

6
src/main/resources/mapper/FxfxdxMapper.xml

@ -1180,7 +1180,7 @@
ELSE '山东恒信高科能源有限公司' ELSE '山东恒信高科能源有限公司'
END) AS shenqingdanwei, END) AS shenqingdanwei,
--qiyebianma --qiyebianma
--(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma, (CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
FORMAT(A.PBDATE, FORMAT(A.PBDATE,
'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi, 'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi,
FORMAT(A.PEDATE, FORMAT(A.PEDATE,
@ -1200,7 +1200,7 @@
'已验收' AS zuoyezhuangtai, '已验收' AS zuoyezhuangtai,
A.GUARDNAME AS jianhuren, A.GUARDNAME AS jianhuren,
--作业人 --作业人
f.EMPNAME AS zuoyeren, CASE WHEN f.EMPNAME IS NULL OR f.EMPNAME = '' THEN a.ELECNAME ELSE f.EMPNAME END AS zuoyeren,
--作业单位 --作业单位
A.SDUNITNAME AS zuoyedanwei, A.SDUNITNAME AS zuoyedanwei,
-- 通过机构路径改进 -- 通过机构路径改进
@ -1209,7 +1209,7 @@
else '否' else '否'
end) as shifouchengbaoshangz, end) as shifouchengbaoshangz,
--作业负责人 --作业负责人
D.FIREPERSONNAME1 AS zuoyefuzeren, CASE WHEN D.FIREPERSONNAME1 IS NULL OR D.FIREPERSONNAME1 = '' THEN a.FACHEADER ELSE D.FIREPERSONNAME1 END AS zuoyefuzeren,
(CASE (CASE
WHEN (F.MOBILE IS NULL WHEN (F.MOBILE IS NULL
OR F.MOBILE = '') THEN '13053831511' OR F.MOBILE = '') THEN '13053831511'

6
src/main/resources/mapper/ZypSingleQueryMapper.xml

@ -565,7 +565,7 @@
ELSE '山东恒信高科能源有限公司' ELSE '山东恒信高科能源有限公司'
END) AS shenqingdanwei, END) AS shenqingdanwei,
--qiyebianma --qiyebianma
--(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma, (CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
FORMAT(A.PBDATE, FORMAT(A.PBDATE,
'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi, 'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi,
FORMAT(A.PEDATE, FORMAT(A.PEDATE,
@ -585,7 +585,7 @@
'已验收' AS zuoyezhuangtai, '已验收' AS zuoyezhuangtai,
A.GUARDNAME AS jianhuren, A.GUARDNAME AS jianhuren,
--作业人 --作业人
f.EMPNAME AS zuoyeren, CASE WHEN f.EMPNAME IS NULL OR f.EMPNAME = '' THEN a.ELECNAME ELSE f.EMPNAME END AS zuoyeren,
--作业单位 --作业单位
A.SDUNITNAME AS zuoyedanwei, A.SDUNITNAME AS zuoyedanwei,
-- 通过机构路径改进 -- 通过机构路径改进
@ -594,7 +594,7 @@
else '否' else '否'
end) as shifouchengbaoshangz, end) as shifouchengbaoshangz,
--作业负责人 --作业负责人
D.FIREPERSONNAME1 AS zuoyefuzeren, CASE WHEN D.FIREPERSONNAME1 IS NULL OR D.FIREPERSONNAME1 = '' THEN a.FACHEADER ELSE D.FIREPERSONNAME1 END AS zuoyefuzeren,
(CASE (CASE
WHEN (F.MOBILE IS NULL WHEN (F.MOBILE IS NULL
OR F.MOBILE = '') THEN '13053831511' OR F.MOBILE = '') THEN '13053831511'

Loading…
Cancel
Save