结算单选择合同可选择所有合同类型

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW002.xml

@@ -558,9 +558,14 @@
 		    LEFT JOIN ${hggpSchema}.HGSC001 b on a.PROJ_CODE = b.PROJ_CODE
 		WHERE 1=1
 		AND a.REVIEW_STATUS= 3
-		AND a.CONTRACT_TYPE IN (1,2,4)
 		AND b.approval_status = 2
 		AND b.proj_status = 0
+		<isNotEmpty prepend=" AND " property="contractType">
+			a.CONTRACT_TYPE	= #contractType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractTyps">
+			a.CONTRACT_TYPE IN <iterate close=")" open="(" conjunction="," property="contractTyps">#contractTyps[]#</iterate>
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="accountCode">
 			a.ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>

src/main/webapp/HG/CW/HGCW008B.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFPopupInput ename="popupInputProjCode" cname="项目编号" colWidth="4"
                              serviceName="HGCW002" methodName="queryContractByType"
-                             resultId="contract_combo_box"
+                             resultId="result"
                              save="false" popupType="ServiceGrid"
                              valueField="projCode" textField="projCode"
                              columnEnames="projCode,projName,contractNumber,contractName,totalContractPriceExcluding"