From b0a2b6b3eca007cf257cd186536507f4d74e6f5b Mon Sep 17 00:00:00 2001 From: yangkunan Date: Wed, 9 Oct 2024 16:59:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiazuan/2_operation/项目明细弹窗.sql | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/finereport/xiazuan/2_operation/项目明细弹窗.sql b/finereport/xiazuan/2_operation/项目明细弹窗.sql index e7a7f4d..e5de853 100644 --- a/finereport/xiazuan/2_operation/项目明细弹窗.sql +++ b/finereport/xiazuan/2_operation/项目明细弹窗.sql @@ -485,7 +485,7 @@ SELECT A.ContractArea,-- 合同面积 【建筑面积】 A.TakeOverArea,-- 接管面积 【合约面积】 A.ManageContractArea ManageContractArea,-- 管理口径合同面积 【在管面积】 - A.StateName AS StateName,-- 业态 【项目业态】 + A.StateNameNew AS StateName,-- 业态 【项目业态】 A.ContractName,-- 合同类型 A.GetMethod,-- 项目获取渠道 A.ContractPartyName,-- 合同对方名称 @@ -494,7 +494,9 @@ SELECT END AS 是否成立委员会,-- 是否已成立业主委员会 A.CommitteeTime,-- 业委会成立时间 A.ChargeMode, - CONCAT(DATE_FORMAT(A.CommitteeTermStartDate, '%Y-%m-%d' ) , ' 至 ',DATE_FORMAT(A.CommitteeTermEndDate, '%Y-%m-%d' )) AS 任职天数,-- 任职时间 + CASE WHEN A.IsSetCommittee = '1' THEN CONCAT(DATE_FORMAT(A.CommitteeTermStartDate, '%Y-%m-%d' ) , ' 至 ',DATE_FORMAT(A.CommitteeTermEndDate, '%Y-%m-%d' )) + ELSE NULL END + AS 任职天数,-- 任职时间 C.room_num AS room_num,-- 总户数 B.organ_name AS organ_name,-- erp片区名称 B.comm_name AS comm_name,-- erp项目名称 @@ -524,7 +526,8 @@ SELECT G.厂区物业服务费, G.酒店物业服务费, G.车位管理物业服务费, - G.车位月租费用 + G.车位月租费用, + A.ContractEndTime FROM ( SELECT @@ -570,9 +573,9 @@ AND CASE WHEN (SELECT mang_project FROM ods_one_to_many_perm WHERE username = ' LEFT JOIN ( - SELECT + SELECT a.CommID - ,SUM(CASE WHEN a.roomstate <> 0 THEN 1 ELSE 0 END) AS room_num, -- 项目对应房间数量 + ,SUM(CASE WHEN a.roomstate <> 0 THEN 1 ELSE 0 END) AS room_num, -- 项目对应房间数量 SUM( CASE WHEN a.roomstate IN ( '1', '4', '9', '10', '5', '6' ) THEN a.buildarea ELSE 0 END ) AS 已售面积, SUM( CASE WHEN a.roomstate = '2' THEN a.buildarea ELSE 0 END ) AS 未售面积, SUM( CASE WHEN a.roomstate NOT IN('0','2') THEN 1 ELSE 0 END ) AS 已交付户数, @@ -581,35 +584,34 @@ AND CASE WHEN (SELECT mang_project FROM ods_one_to_many_perm WHERE username = ' SUM( CASE WHEN a.roomstate IN ( '9', '10', '5', '6' ) THEN 1 ELSE 0 END ) AS 已完成装修户数, SUM( CASE WHEN a.roomstate = '5' THEN 1 ELSE 0 END ) AS 已完成装修未入住, SUM( CASE WHEN a.roomstate IN ( '9', '10', '6' ) THEN 1 ELSE 0 END ) AS 已完成装修已入住, - -- SUM(b.CalcArea) AS 收费面积 - -- 2024-09-20更新取数新逻辑：石老师确认 收费面积从房间表取 + -- SUM(b.CalcArea) AS 收费面积 SUM(CASE WHEN a.roomstate IS NOT NULL AND a.roomstate <> '' THEN a.CalcArea ELSE 0 END) AS 收费面积 FROM - ( - SELECT - * - FROM dw.dim_room_d - )a - LEFT JOIN - ( - SELECT - b1.CommId AS CommId - ,b1.RoomID AS RoomID - ,SUM(CalcArea) AS CalcArea - FROM - ( - SELECT - CommId - , CalcArea - , RoomID - FROM ods_erp_tb_hspr_coststansetting_d - WHERE RoomID <> '0' - GROUP BY CommId, CalcArea, RoomID - )b1 - GROUP BY b1.CommId,b1.RoomID - )b - ON a.CommID = b.CommId - AND a.RoomID = b.RoomID + ( + SELECT + * + FROM dw.dim_room_d + )a + LEFT JOIN + ( + SELECT + b1.CommId AS CommId + ,b1.RoomID AS RoomID + ,SUM(CalcArea) AS CalcArea + FROM + ( + SELECT + CommId + , CalcArea + , RoomID + FROM ods_erp_tb_hspr_coststansetting_d + WHERE RoomID <> '0' + GROUP BY CommId, CalcArea, RoomID + )b1 + GROUP BY b1.CommId,b1.RoomID + )b + ON a.CommID = b.CommId + AND a.RoomID = b.RoomID GROUP BY CommID )C ON A.CommId = C.CommID @@ -625,7 +627,7 @@ AND CASE WHEN (SELECT mang_project FROM ods_one_to_many_perm WHERE username = ' CommID )D ON A.COMMID = D.COMMID - LEFT JOIN + LEFT JOIN ( SELECT A.CommId @@ -707,5 +709,4 @@ AND CASE WHEN (SELECT mang_project FROM ods_one_to_many_perm WHERE username = ' GROUP BY A.CommId )G - ON A.COMMID = G.COMMID -; \ No newline at end of file + ON A.COMMID = G.COMMID \ No newline at end of file