Commit de28f7c4 by yanHeng

[修改] 车辆进出场记录

parent 65ffae30
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
AND contract.contractVersion <> 999 AND contract.contractVersion <> 999
LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
AND xystOrganization.discard <> 1 AND xystOrganization.discard <> 1
AND projectFiled.discard <> 1
WHERE 1=1 WHERE 1=1
AND xystOrganization.type <> 'GROUP_COMPANY' AND xystOrganization.type <> 'GROUP_COMPANY'
...@@ -62,6 +63,7 @@ ...@@ -62,6 +63,7 @@
AND contract.contractVersion <> 999 AND contract.contractVersion <> 999
LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
AND xystOrganization.discard <> 1 AND xystOrganization.discard <> 1
AND projectFiled.discard <> 1
WHERE 1=1 WHERE 1=1
AND xystOrganization.type <> 'GROUP_COMPANY' AND xystOrganization.type <> 'GROUP_COMPANY'
) AS project1 ON project.ID = project1.ID ) AS project1 ON project.ID = project1.ID
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
AND salesRecord.syncTime <= :?endDate AND salesRecord.syncTime <= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany AND salesRecord.regionalCompany = :?regionalCompany
GROUP BY salesRecord.project GROUP BY salesRecord.project
ORDER BY salesRecord.amount DESC ORDER BY amount DESC
</sql> </sql>
</template> </template>
......
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