Skip to content

C
cloud-fb
Commit ddce64dc by wukaiqiang
Options

项目专题砂石总量数据计算规则调整

parent 5a605e7f
Showing with 4 additions and 7 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/ProjectDinasTypeByTypeStatisticsAdvQuery.jmx
...@@ -12,19 +12,16 @@ ...@@ -12,19 +12,16 @@
<sql-type>SQL</sql-type> <sql-type>SQL</sql-type>
<sql> <sql>
SELECT SELECT
sum( contractDetail.purchaseAmount ) AS weight, sum( projectFiledAssociatedProjectFiledDinasDetail.weight ) AS weight,
CASE CASE
WHEN dinasType.type = 0 THEN WHEN dinasType.type = 0 THEN
'砂' ELSE '石' '砂' ELSE '石'
END AS dinasTypeName END AS dinasTypeName
FROM FROM
ProjectFiled AS projectFiled ProjectFiled AS projectFiled
LEFT JOIN Contract AS contract ON contract.project = projectFiled.id LEFT JOIN ProjectFiledAssociatedProjectFiledDinasDetail AS projectFiledAssociatedProjectFiledDinasDetail
AND contract.approveState = 2 ON projectFiledAssociatedProjectFiledDinasDetail.master = projectFiled.id
AND contract.discard &lt;&gt; 1 LEFT JOIN DinasType AS dinasType ON projectFiledAssociatedProjectFiledDinasDetail.dinasType = dinasType.id
AND contract.contractState &lt;&gt; 'MODIFIED'
LEFT JOIN ContractAssociatedcontractDetail AS contractDetail ON contractDetail.master = contract.id
LEFT JOIN DinasType AS dinasType ON contractDetail.dinasType = dinasType.id
WHERE 1=1 AND dinasType.type IS NOT NULL WHERE 1=1 AND dinasType.type IS NOT NULL
AND projectFiled.regionalCompany = :?regionalCompany AND projectFiled.regionalCompany = :?regionalCompany
AND projectFiled.discard &lt;&gt; 1 AND projectFiled.discard &lt;&gt; 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment