Commit bdb8ba91 by 史文博

Merge branch 'feature/form_statistics_05' into 'develop'

合同专题,近6个月合同数量趋势分析 增加 区域公司条件

See merge request kunlun/xyst_dinas/xyst_dinas_backend!67
parents 894aebbe 96491029
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
where 1=1 where 1=1
AND contract1.approveState = 2 AND contract1.approveState = 2
AND contract1.discard <> 1 AND contract1.discard <> 1
AND contract1.regionalCompany = :?regionalCompany
)AS contract )AS contract
RIGHT JOIN PlanningCycle AS planningCycle ON 1=1 RIGHT JOIN PlanningCycle AS planningCycle ON 1=1
AND yearof(contract.createTime) = yearof(planningCycle.startTime) AND yearof(contract.createTime) = yearof(planningCycle.startTime)
......
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