project_group/leading-project
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目基础信息表收费面积取数表修改

Browse Source
This commit is contained in:
yangkunan 2024-09-20 15:32:01 +08:00
parent 81bf975d88
commit ba66d1d761
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/dataSources.xml
View File

@ -5,7 +5,7 @@
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://172.18.96.11:3306</jdbc-url>
<jdbc-url>jdbc:mysql://172.18.96.20:3306</jdbc-url>
<jdbc-additional-properties>
<property name="com.intellij.clouds.kubernetes.db.host.port" />
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />

1
.idea/sqldialects.xml
View File

@ -8,6 +8,7 @@
<file url="file://$PROJECT_DIR$/dw/dim/dim_engine_equipment_d.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/dw/dim/dim_parking_info_d.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/dw/dim/dim_project_base_info_d.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/dw/dim/dim_room_d.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/dw/dwd/dwd_business_contract_info_d.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/dw/dwd/dwd_engine_equipment_inspection_task_d.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/dw/dwd/dwd_engine_equipment_status_d.sql" dialect="MySQL" />

4
finereport/xiazuan/2_operation/项目明细弹窗.sql
View File

@ -581,7 +581,9 @@ 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 收费面积
-- SUM(b.CalcArea) AS 收费面积
-- 2024-09-20更新取数新逻辑：石老师确认 收费面积从房间表取
SUM(a.CalcArea) AS 收费面积
FROM
(
SELECT