销售计划分析sql调整

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx

@@ -11,11 +11,29 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-			SELECT
+		SELECT 
+			result.id AS id,
+			result.organization AS organization,
+			result.organizationId AS organizationId,
+			result.planningCycleTitle AS planningCycleTitle,
+			result.planningCycleStartTime AS planningCycleStartTime,
+			result.planningCycleEndTime AS planningCycleEndTime,
+			result.projectName AS projectName,
+			result.projectId AS projectId,
+			result.type AS type,
+			result.requiredTotalAmount AS requiredTotalAmount,
+			result.totalPlanAmount AS totalPlanAmount,
+			result.actualSaleTotalAmount AS actualSaleTotalAmount
+		FROM 
+		   (SELECT
 				salesPlan.id AS id,
 				xystorganization.NAME AS organization,
+				xystorganization.id AS organizationId,
 				planningCycle.title AS planningCycleTitle,
+				planningCycle.startTime AS planningCycleStartTime,
+				planningCycle.endTime AS planningCycleEndTime,
 				projectFiled.projectName AS projectName,
+				projectFiled.id AS projectId,
 				'销售计划' AS type,
 				salesPlan.requiredTotalAmount AS requiredTotalAmount,
 				salesPlan.planTotalAmount AS totalPlanAmount,
@@ -30,8 +48,12 @@
 			SELECT
 				salesPlanTemp.id AS id,
 				xystorganizationrTemp.NAME AS organization,
+				xystorganizationrTemp.id AS organizationId,
 				planningCycleTemp.title AS planningCycleTitle,
+				planningCycleTemp.startTime AS planningCycleStartTime,
+				planningCycleTemp.endTime AS planningCycleEndTime,
 				projectFiledTemp.projectName AS projectName,
+				projectFiledTemp.id AS projectId,
 				'临时销售计划' AS type,
 				needPlanTemp.needPlanTotalAmount AS requiredTotalAmount,
 				salesPlanTemp.totalPlanAmount AS totalPlanAmount,
@@ -42,7 +64,13 @@
 				LEFT JOIN PlanningCycleTemp AS planningCycleTemp ON planningCycleTemp.id = salesPlanTemp.planningCycle
 				LEFT JOIN ProjectFiledTemp AS projectFiledTemp ON projectFiledTemp.id = salesPlanTemp.project
 				LEFT JOIN NeedPlanTemp AS needPlanTemp ON needPlanTemp.planningCycle = salesPlanTemp.planningCycle
-			WHERE ( salesPlanTemp.DISCARD = FALSE OR salesPlanTemp.DISCARD IS NULL )
+			WHERE ( salesPlanTemp.DISCARD = FALSE OR salesPlanTemp.DISCARD IS NULL )) AS result 
+			WHERE result.type = :?type
+			AND result.organizationId = :?organizationId
+			AND result.projectId = :?projectId
+			AND result.organizationId = :?organizationId
+			AND result.planningCycleStartTime &gt;= :?planningCycleStartTime
+			AND result.planningCycleEndTime &lt;= :?planningCycleEndTime
 				</sql>
 		</template>
 	</content>