Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk

@@ -88,6 +88,11 @@
        			<annotation id='4d1596bd-ae0a-4d7e-8258-5dad66493239' attributeId='7b049c9a-56e4-4791-a0a3-451237fd38a1' name='precision' value='12'></annotation>
        			<annotation id='1a25ed97-846e-4847-aa21-1a0b025c01ed' attributeId='52a3d8ee-92ab-45dc-b668-46408143254d' name='scale' value='2'></annotation>
        		</attribute>
+       		<attribute id='4b08ddf4-95fd-4b5d-96fd-9445b6983ebe' name='dinasAmount' columnName='dinas_amount' title='合同总量' type='fixnum' default='' precision='' isArray='false'>
+        		<annotation id='bd1259e6-9e98-477f-8901-3733b095a1f2' attributeId='727c8d0e-431d-4563-a7db-7b7879a02451' name='length' value='100'></annotation>
+       			<annotation id='061d8f37-a652-4f58-b333-d2f03f0faae9' attributeId='befbad20-b1a1-4634-b8d5-83f5a28b9cde' name='precision' value='12'></annotation>
+       			<annotation id='c7541b9d-4e81-4d58-8c37-f4c610cda822' attributeId='f154b68d-97da-4761-bc1f-3d17a99e6324' name='scale' value='4'></annotation>
+       		</attribute>
 			<attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='carInfo' columnName='car_info' title='车辆信息' type='string' default='' precision='' isArray='false'>
  				<annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='300'></annotation>
 			</attribute>

backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml

@@ -102,6 +102,9 @@
 	  	<property name="amount" type="big_decimal" not-null="false">
             <column name="amount" precision="12" scale="2"></column>
         </property>
+        <property name="dinasAmount" type="big_decimal" not-null="false">
+            <column name="dinas_amount" precision="12" scale="4"></column>
+        </property>
 		<property name="carInfo" type="nstring" not-null="false">
 			<column name="car_info" length="300"></column>
 		</property>

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>