Commit 2c240f87 by 王军业

【合同状态问题】

1 parent 12e3d367
...@@ -324,8 +324,8 @@ ...@@ -324,8 +324,8 @@
<if test="contract_states !=null and contract_states.length > 0"> <if test="contract_states !=null and contract_states.length > 0">
and and
contract_state in contract_state in
<foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=","> <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
#{contract_state} #{item}
</foreach> </foreach>
</if> </if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
and and
product_line_type=#{product_line_type} product_line_type=#{product_line_type}
</if> </if>
<if test="contract_state !=null and contract_state!=''"> <if test="contract_state !=null and contract_state !=''">
and and
contract_state=#{contract_state} contract_state=#{contract_state}
</if> </if>
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
and and
contract_unid=#{contract_unid} contract_unid=#{contract_unid}
</if> </if>
<if test="salesperson_unids !=null and salesperson_unids.length > 0"> <if test="salesperson_unids !=null">
and and
salesperson_unid in salesperson_unid in
<foreach collection="salesperson_unids" index="index" item="salesperson_unid" open="(" close=")" separator=","> <foreach collection="salesperson_unids" index="index" item="salesperson_unid" open="(" close=")" separator=",">
...@@ -468,8 +468,8 @@ ...@@ -468,8 +468,8 @@
<if test="contract_states !=null and contract_states.length > 0"> <if test="contract_states !=null and contract_states.length > 0">
and and
contract_state in contract_state in
<foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=","> <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
#{contract_state} #{item}
</foreach> </foreach>
</if> </if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
...@@ -508,7 +508,7 @@ ...@@ -508,7 +508,7 @@
and and
product_line_type=#{product_line_type} product_line_type=#{product_line_type}
</if> </if>
<if test="contract_state !=null and contract_state!=''"> <if test="contract_state !=null and contract_state !=''">
and and
contract_state=#{contract_state} contract_state=#{contract_state}
</if> </if>
...@@ -532,12 +532,9 @@ ...@@ -532,12 +532,9 @@
and and
amount_state_unid=#{amount_state_unid} amount_state_unid=#{amount_state_unid}
</if> </if>
<if test="start_date != null "> <if test="start_date != null and end_date !=null">
and and
#{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date #{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="end_date !=null">
and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler}
</if> </if>
<if test="amount_start_point !=null "> <if test="amount_start_point !=null ">
and and
...@@ -566,10 +563,6 @@ ...@@ -566,10 +563,6 @@
and 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}) 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>
<if test="salesperson_unid !=null and salesperson_unid !=''">
and
salesperson_unid = #{salesperson_unid}
</if>
and is_delete=false and is_delete=false
and project_unid is not null and project_unid is not null
and customer_unid is not null and customer_unid is not null
...@@ -639,8 +632,8 @@ ...@@ -639,8 +632,8 @@
<if test="contract_states !=null and contract_states.length > 0"> <if test="contract_states !=null and contract_states.length > 0">
and and
contract_state in contract_state in
<foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=","> <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
#{contract_state} #{item}
</foreach> </foreach>
</if> </if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
...@@ -679,7 +672,7 @@ ...@@ -679,7 +672,7 @@
and and
product_line_type=#{product_line_type} product_line_type=#{product_line_type}
</if> </if>
<if test="contract_state !=null and contract_state!=''"> <if test="contract_state !=null and contract_state !=''">
and and
contract_state=#{contract_state} contract_state=#{contract_state}
</if> </if>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!