Merge branch 'feature/form_statistics_05' into 'develop'

部分增加 discard 判断

See merge request kunlun/xyst_dinas/xyst_dinas_backend!64

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

@@ -19,6 +19,7 @@
 					WHERE 1=1 
 					AND contract.approveState = 2 
 					AND contract.contractState <> 'MODIFIED'
+					AND contract.discard  <> 1
 				GROUP BY contract.regionalCompany
 			</sql>
 		</template>

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

@@ -31,6 +31,7 @@
 				WHERE
 					1 = 1 
 					AND contract.contractState = 'EXECUTING' 
+					AND contract.discard  <> 1
 				GROUP BY
 					contract.regionalCompany 
 				) AS executingNumber ON executingNumber.regionalCompany = xystOrganization.id
@@ -43,6 +44,7 @@
 				WHERE
 					1 = 1 
 					AND contract.contractState = 'UN_EXECUTE' 
+					AND contract.discard  <> 1
 				GROUP BY
 					contract.regionalCompany 
 				) AS unexecuteNumber ON unexecuteNumber.regionalCompany = xystOrganization.id
@@ -55,6 +57,7 @@
 				WHERE
 					1 = 1 
 					AND contract.contractState = 'COMPLETED' 
+					AND contract.discard  <> 1
 				GROUP BY
 					contract.regionalCompany 
 				) AS completedNumber ON completedNumber.regionalCompany = xystOrganization.id
@@ -72,6 +75,7 @@
 					WHERE
 						1 = 1 
 						AND contract.contractState <> 'MODIFIED' 
+						AND contract.discard  <> 1
 					) AS purchaseSandUnit 
 				GROUP BY
 					purchaseSandUnit.regionalCompany 
@@ -90,6 +94,7 @@
 					WHERE
 						1 = 1 
 						AND contract.contractState <> 'MODIFIED' 
+						AND contract.discard  <> 1
 					) AS project 
 				GROUP BY
 				project.regionalCompany 
@@ -97,6 +102,7 @@
 				WHERE 1=1
 				AND xystOrganization.type <> 'GROUP_COMPANY'
 				AND xystOrganization.id = :?regionalCompany
+				AND xystOrganization.discard  <> 1
 			</sql>
 		</template>
 	</content>

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

@@ -19,6 +19,7 @@
 					WHERE 1=1 
 					AND contract.approveState = 2 
 					AND contract.contractState <> 'MODIFIED'
+					AND contract.discard  <> 1
 				GROUP BY contract.regionalCompany
 			</sql>
 		</template>

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

@@ -22,6 +22,7 @@
 			    LEFT JOIN Contract AS contract on contractAssociatedcontractDetail.master = contract.id
 			    WHERE 1=1
 			    AND contract.approveState = 2
+			    AND contract.discard  <> 1
 			    AND contract.contractState <> 'MODIFIED'
 			    AND contract.regionalCompany = :?regionalCompany
 				GROUP BY contractAssociatedcontractDetail.dinasType

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

@@ -22,6 +22,7 @@
 			    LEFT JOIN Contract AS contract on contractAssociatedcontractDetail.master = contract.id
 			    WHERE  1=1
 			    AND contract.approveState = 2
+			    AND contract.discard  <> 1
 			    AND contract.contractState <> 'MODIFIED'
 			    AND contract.regionalCompany = :?regionalCompany
 				GROUP BY contractAssociatedcontractDetail.dinasType

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

@@ -20,7 +20,9 @@
 				contract1.id as id ,
 				contract1.createTime as createTime
 				from Contract as contract1 
-				where contract1.approveState = 2 
+				where 1=1
+				AND contract1.approveState = 2 
+				AND contract1.discard  <> 1
 				)AS contract
 				RIGHT JOIN PlanningCycle AS planningCycle ON 1=1
 					AND yearof(contract.createTime) = yearof(planningCycle.startTime)

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

@@ -18,6 +18,7 @@
 					 Contract AS contract
 					WHERE 1=1 
 					AND contract.approveState = 2 
+					AND contract.discard  <> 1
 					AND contract.contractState <> 'MODIFIED'
 
 			</sql>

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

@@ -24,6 +24,7 @@
 					LEFT JOIN PurchaseSandCompany AS purchaseSandCompany on purchaseSandCompany.id = contract.purchaseSandUnit
 					where 1=1
 					AND contract.approveState = 2
+					AND contract.discard  <> 1
 					AND contract.contractState  <>  'MODIFIED'
 					AND contract.regionalCompany = :?regionalCompany
 					

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

@@ -49,7 +49,7 @@
 				FROM
 					PlanningCycle AS planningCycle
 					 JOIN xystOrganization AS xystOrganization ON 1=1 AND planningCycle.cycleType <> 'WEEK'
-					 AND xystOrganization.type <> 'GROUP_COMPANY'
+					 AND xystOrganization.type <> 'GROUP_COMPANY'  AND  xystOrganization.discard  <> 1
 					LEFT JOIN 
 					(
 						SELECT

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

@@ -21,11 +21,13 @@
 				ProjectFiled AS projectFiled
 				LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
 				AND contract.approveState = 2 
+				AND contract.discard  <> 1
 				AND contract.contractState <> '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
 				AND projectFiled.regionalCompany = :?regionalCompany
+				AND projectFiled.discard  <> 1
 			GROUP BY
 				dinasType.type
 			</sql>

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

@@ -19,8 +19,9 @@
 				LEFT JOIN ProjectFiledAssociatedProjectFiledDinasDetail AS projectFiledDinasDetail ON projectFiledDinasDetail.master = projectFiled.id
 				LEFT JOIN DinasType AS dinasType ON projectFiledDinasDetail.dinasType = dinasType.id 
 			WHERE 1=1 
-			and projectFiledDinasDetail.dinasType is not null
-			and projectFiled.regionalCompany = :?regionalCompany
+			AND projectFiledDinasDetail.dinasType is not null
+			AND projectFiled.regionalCompany = :?regionalCompany
+			AND projectFiled.discard  <> 1
 			GROUP BY
 				projectFiledDinasDetail.dinasType
 				</sql>

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

@@ -26,6 +26,7 @@
 				FROM
 					ProjectFiled AS projectFiled
 				WHERE 1=1
+				AND projectFiled.discard  <> 1
 				AND projectFiled.regionalCompany = :?regionalCompany
 				) AS projectFiledDetial
 				GROUP BY projectFiledDetial.district

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

@@ -21,7 +21,10 @@
 					select projectFiled1.createTime as createTime,
 					projectFiled1.id as id
 					
-					 from ProjectFiled as projectFiled1 where projectFiled1.regionalCompany = :?regionalCompany
+					 from ProjectFiled as projectFiled1 
+					 where 1=1
+					 AND projectFiled1.discard  <> 1
+					 AND projectFiled1.regionalCompany = :?regionalCompany
 					) AS projectFiled ON 1=1
 					AND yearof(projectFiled.createTime) = yearof(planningCycle.startTime)
 			        AND monthof(projectFiled.createTime) = monthof(planningCycle.startTime)

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

@@ -36,7 +36,9 @@
 					FROM
 						ProjectFiled AS projectFiled
 						LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
-						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 				
+						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 	
+						WHERE 1=1
+						AND projectFiled.discard  <> 1			
 					) AS project 
 						LEFT JOIN (
 						SELECT
@@ -49,6 +51,8 @@
 							ProjectFiled AS projectFiled
 							LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
 							LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 
+							WHERE 1=1
+						    AND projectFiled.discard  <> 1	
 						) AS project1 ON project.id = project1.id 
 						AND project.createtime < project1.createtime 
 					WHERE

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

@@ -17,7 +17,9 @@
 		FROM
 			ProjectFiled AS projectFiled
 			left join ProjectType as projectType on projectFiled.projectType = projectType.id
-			WHERE 1=1 and projectFiled.regionalCompany = :?regionalCompany
+			WHERE 1=1
+			AND projectFiled.discard  <> 1	
+			AND projectFiled.regionalCompany = :?regionalCompany
 			GROUP BY 
 			projectFiled.projectType
 				</sql>

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

@@ -41,7 +41,9 @@
 						LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 
 						LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
-						WHERE 1=1 AND xystOrganization.type <> 'GROUP_COMPANY'
+						WHERE 1=1  
+						AND xystOrganization.discard  <> 1	
+						AND xystOrganization.type <> 'GROUP_COMPANY'
 					) AS project
 					LEFT JOIN (
 					SELECT
@@ -56,7 +58,9 @@
 						LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 
 						LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
-						WHERE 1=1 AND xystOrganization.type <> 'GROUP_COMPANY'
+						WHERE 1=1 
+						AND xystOrganization.discard  <> 1 
+						AND xystOrganization.type <> 'GROUP_COMPANY'
 					) AS project1 ON project.ID = project1.ID 
 					AND project.createTime < project1.createTime 
 				WHERE

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

@@ -28,6 +28,7 @@
 					LEFT JOIN xystOrganization AS xystOrganization on xystOrganization.id = salesRecord.regionalCompany
 					WHERE 1=1
 					    AND xystOrganization.type <> 'GROUP_COMPANY'
+					    AND xystOrganization.discard  <> 1
 						AND salesRecord.syncTime >= :?startDate
 						AND salesRecord.syncTime <= :?endDate
 						AND salesRecord.regionalCompany = :?regionalCompany

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

@@ -29,6 +29,7 @@
 					LEFT JOIN ProjectFiled as projectFiled on projectFiled.id = salesRecord.project
 					LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
 					WHERE 1=1
+					AND projectFiled.discard  <> 1
 					AND salesRecord.syncTime >= :?startDate
 					AND salesRecord.syncTime <= :?endDate
 					AND salesRecord.regionalCompany = :?regionalCompany

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

@@ -24,7 +24,7 @@
 			    xystOrganization.name AS regionalCompanyName
 			  FROM
 			  DinasType AS dinasType
-			  JOIN  xystOrganization AS xystOrganization ON 1=1
+			  JOIN  xystOrganization AS xystOrganization ON 1=1 AND xystOrganization.discard  <> 1
 			  LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
 			  AND xystOrganization.id = salesRecord.regionalCompany
 			  WHERE 1=1

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

@@ -19,6 +19,7 @@
 						SalesRecord AS salesRecord
 						LEFT JOIN ProjectFiled as projectFiled on projectFiled.id = salesRecord.project
 						WHERE 1=1
+						AND projectFiled.discard  <> 1
 						AND salesRecord.syncTime >= :?startDate
 						AND salesRecord.syncTime <= :?endDate
 						AND salesRecord.regionalCompany = :?regionalCompany

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

@@ -19,6 +19,7 @@
 				LEFT JOIN Station AS station on station.id = salesSummary.station
 			    LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = station.regionalCompany
 			WHERE 1=1
+			AND xystOrganization.discard  <> 1
 			AND xystOrganization.type <> 'GROUP_COMPANY'
 			AND salesSummary.dealTime >= :?startDate 
 			AND salesSummary.dealTime <= :?endDate