diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 6c13967..8beaf92 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -1180,7 +1180,7 @@ ELSE '山东恒信高科能源有限公司' END) AS shenqingdanwei, --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, 'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi, FORMAT(A.PEDATE, @@ -1200,7 +1200,7 @@ '已验收' AS zuoyezhuangtai, 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, -- 通过机构路径改进 @@ -1209,7 +1209,7 @@ else '否' 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 WHEN (F.MOBILE IS NULL OR F.MOBILE = '') THEN '13053831511' diff --git a/src/main/resources/mapper/ZypSingleQueryMapper.xml b/src/main/resources/mapper/ZypSingleQueryMapper.xml index 8833d97..19eef6c 100644 --- a/src/main/resources/mapper/ZypSingleQueryMapper.xml +++ b/src/main/resources/mapper/ZypSingleQueryMapper.xml @@ -565,7 +565,7 @@ ELSE '山东恒信高科能源有限公司' END) AS shenqingdanwei, --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, 'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi, FORMAT(A.PEDATE, @@ -585,7 +585,7 @@ '已验收' AS zuoyezhuangtai, 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, -- 通过机构路径改进 @@ -594,7 +594,7 @@ else '否' 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 WHEN (F.MOBILE IS NULL OR F.MOBILE = '') THEN '13053831511'