[修改] 车辆进出场记录

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/RegionalCompanyProjectStatisticsAdvQuery.jmx

@@ -42,7 +42,8 @@
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 
 						AND contract.contractVersion  <> 999
 						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  
 						AND xystOrganization.type <> 'GROUP_COMPANY'
 						
@@ -61,7 +62,8 @@
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id  
 						AND contract.contractVersion  <> 999
 						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 
 						AND xystOrganization.type <> 'GROUP_COMPANY' 
 					) AS project1 ON project.ID = project1.ID 

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesProjectAmountTopStatisticsAdvQuery.jmx

@@ -24,8 +24,8 @@
 						AND salesRecord.syncTime <= :?endDate
 						AND salesRecord.regionalCompany = :?regionalCompany
 						GROUP BY  salesRecord.project
-						ORDER BY salesRecord.amount DESC
-						
+						ORDER BY amount DESC
+
 			</sql>
 		</template>
 	</content>