结算单管理-条件过滤优化

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

@@ -53,16 +53,16 @@
 			PROJ_CODE = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME = #projName#
+			PROJ_NAME like ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="contractNumber">
-			CONTRACT_NUMBER = #contractNumber#
+			CONTRACT_NUMBER like ('%$contractNumber$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="contractName">
-			CONTRACT_NAME = #contractName#
+			CONTRACT_NAME like ('%$contractName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="settlementNumber">
-			SETTLEMENT_NUMBER = #settlementNumber#
+			SETTLEMENT_NUMBER like ('%$settlementNumber$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="settlementType">
 			SETTLEMENT_TYPE = #settlementType#
@@ -70,6 +70,12 @@
 		<isNotEmpty prepend=" AND " property="contractDate">
 			CONTRACT_DATE = #contractDate#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractDateFrom">
+			CONTRACT_DATE &gt;= REPLACE(#signingDateFrom#, '-', '')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractDateTo">
+			CONTRACT_DATE &lt;= REPLACE(#signingDateTo#, '-', '')
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="taxPoints">
 			TAX_POINTS = #taxPoints#
 		</isNotEmpty>