|
@@ -222,6 +222,7 @@
|
|
|
1 = 1
|
|
|
and
|
|
|
a.secondPower = 0
|
|
|
+ and a.whetherCloseStatus = '0'
|
|
|
<if test="reserveList != null and reserveList !='' ">
|
|
|
and a.reserveProjectName in
|
|
|
<foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">
|
|
@@ -249,9 +250,6 @@
|
|
|
<if test="constructionStatus!=null and constructionStatus !=''">
|
|
|
and a.constructionStatus = #{constructionStatus}
|
|
|
</if>
|
|
|
- <if test="whetherCloseStatus!=null and whetherCloseStatus !=''">
|
|
|
- and a.whetherCloseStatus = #{whetherCloseStatus}
|
|
|
- </if>
|
|
|
<if test="settStatus!=null and settStatus !=''">
|
|
|
and a.settStatus = #{settStatus}
|
|
|
</if>
|
|
@@ -288,6 +286,7 @@
|
|
|
1 = 1
|
|
|
and
|
|
|
a.secondPower = 0
|
|
|
+ and a.whetherCloseStatus = '0'
|
|
|
<if test="reserveList != null and reserveList !='' ">
|
|
|
and a.reserveProjectName in
|
|
|
<foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">
|
|
@@ -312,6 +311,7 @@
|
|
|
1 = 1
|
|
|
and
|
|
|
a.secondPower = 0
|
|
|
+ and a.whetherCloseStatus = '0'
|
|
|
<if test="reserveList != null and reserveList !='' ">
|
|
|
and a.reserveProjectName in
|
|
|
<foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">
|
|
@@ -334,6 +334,7 @@
|
|
|
and
|
|
|
a.secondPower = 0
|
|
|
and a.projectid !='' and a.projectName !=''
|
|
|
+ and a.whetherCloseStatus = '0'
|
|
|
<if test="reserveList != null and reserveList !='' ">
|
|
|
and a.projectId in
|
|
|
<foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">
|
|
@@ -1905,6 +1906,7 @@
|
|
|
<where>
|
|
|
1 = 1
|
|
|
and a.secondPower = '0'
|
|
|
+ and a.whetherCloseStatus = '0'
|
|
|
<if test="reserveList != null and reserveList !='' ">
|
|
|
and t.reserveProjectName in
|
|
|
<foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">
|