【合同状态问题】

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -324,8 +324,8 @@
 		   <if test="contract_states !=null  and contract_states.length > 0">
 		   and
 		   contract_state in 
-		   <foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=",">
-		   #{contract_state}
+		   <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
+		   #{item}
 		   </foreach>
 		   </if>
 		   <if test="project_name__like !=null and project_name__like !=''">
@@ -364,7 +364,7 @@
 		   and 
 		   product_line_type=#{product_line_type}
 		   </if>
-		   <if test="contract_state !=null and contract_state!=''">
+		   <if test="contract_state !=null and contract_state !=''">
 		    and 
 		   contract_state=#{contract_state} 
 		   </if>
@@ -458,18 +458,18 @@
 			and
 			contract_unid=#{contract_unid}
 			</if>
-		   <if test="salesperson_unids !=null   and salesperson_unids.length > 0">
+		   <if test="salesperson_unids !=null">
 		   and 
 		   salesperson_unid in
 		   <foreach collection="salesperson_unids" index="index" item="salesperson_unid" open="(" close=")" separator=",">
 		     #{salesperson_unid} 
 		   </foreach>
 		   </if>
-		   <if test="contract_states !=null and contract_states.length > 0">
+		   <if test="contract_states !=null  and contract_states.length > 0">
 		   and
 		   contract_state in 
-		   <foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=",">
-		   #{contract_state}
+		   <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
+		   #{item}
 		   </foreach>
 		   </if>
 		   <if test="project_name__like !=null and project_name__like !=''">
@@ -508,7 +508,7 @@
 		   and 
 		   product_line_type=#{product_line_type}
 		   </if>
-		   <if test="contract_state !=null and contract_state!=''">
+		   <if test="contract_state !=null and contract_state !=''">
 		    and 
 		   contract_state=#{contract_state} 
 		   </if>
@@ -532,12 +532,9 @@
 		   and 
 		   amount_state_unid=#{amount_state_unid} 
 		   </if>
-		   <if test="start_date != null ">
+		   <if test="start_date != null and end_date !=null">
 		   and 
-		   #{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date 
-		   </if>
-		   <if test="end_date !=null">
-		   and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler}
+		   #{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler}
 		   </if>
 		   <if test="amount_start_point !=null ">
 		    and
@@ -566,13 +563,9 @@
 		   and
 		   contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[<=]]> #{leave_amount_end_point})
 		   </if>
-		   <if test="salesperson_unid !=null and salesperson_unid !=''">
-		   and
-		   salesperson_unid = #{salesperson_unid}
-		   </if>
 		   and is_delete=false
- 		   and project_unid is not null
-		   and customer_unid is not null 
+		   and project_unid is not null
+		   and customer_unid is not null  
 		   <if test="limit !=null ">
 		   limit #{limit} 
 		   </if>
@@ -639,8 +632,8 @@
 		   <if test="contract_states !=null  and contract_states.length > 0">
 		   and
 		   contract_state in 
-		   <foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=",">
-		   #{contract_state}
+		   <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
+		   #{item}
 		   </foreach>
 		   </if>
 		   <if test="project_name__like !=null and project_name__like !=''">
@@ -679,7 +672,7 @@
 		   and 
 		   product_line_type=#{product_line_type}
 		   </if>
-		   <if test="contract_state !=null and contract_state!=''">
+		   <if test="contract_state !=null and contract_state !=''">
 		    and 
 		   contract_state=#{contract_state}  
 		   </if>