|
@@ -593,9 +593,22 @@ END) as projectScale*/
|
|
|
<if test="attachmentProjectSort !=null and attachmentProjectSort !=''">
|
|
|
and a.attachment_project_sort= #{attachmentProjectSort}
|
|
|
</if>
|
|
|
- <if test="projectReportStatus != null and projectReportStatus != ''">
|
|
|
- AND prd.status = #{projectReportStatus}
|
|
|
- </if>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus == null">
|
|
|
+
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus != 0">
|
|
|
+ AND prd.status = #{projectReportStatus}
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ AND prd.status is null
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
+
|
|
|
<if test="submitMoney != null and submitMoney != ''">
|
|
|
AND a.submit_money = #{submitMoney}
|
|
|
</if>
|
|
@@ -937,9 +950,21 @@ END) as projectScale*/
|
|
|
<if test="attachmentProjectSort !=null and attachmentProjectSort !=''">
|
|
|
and a.attachment_project_sort= #{attachmentProjectSort}
|
|
|
</if>
|
|
|
- <if test="projectReportStatus != null and projectReportStatus != ''">
|
|
|
- AND prd.status = #{projectReportStatus}
|
|
|
- </if>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus == null">
|
|
|
+
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus != 0">
|
|
|
+ AND prd.status = #{projectReportStatus}
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ AND prd.status is null
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
<if test="submitMoney != null and submitMoney != ''">
|
|
|
AND a.submit_money = #{submitMoney}
|
|
|
</if>
|
|
@@ -1177,9 +1202,21 @@ END) as projectScale*/
|
|
|
#{officeId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="projectReportStatus != null and projectReportStatus != ''">
|
|
|
- AND prd.status = #{projectReportStatus}
|
|
|
- </if>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus == null">
|
|
|
+
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus != 0">
|
|
|
+ AND prd.status = #{projectReportStatus}
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ AND prd.status is null
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
<if test="reportedState !=null and reportedState !=''">
|
|
|
<choose>
|
|
|
<when test="reportedState == 0">
|
|
@@ -1766,9 +1803,21 @@ END) as projectScale*/
|
|
|
#{officeId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="projectReportStatus != null and projectReportStatus != ''">
|
|
|
- AND prd.status = #{projectReportStatus}
|
|
|
- </if>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus == null">
|
|
|
+
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ <choose>
|
|
|
+ <when test="projectReportStatus != 0">
|
|
|
+ AND prd.status = #{projectReportStatus}
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ AND prd.status is null
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
<if test="reportedState !=null and reportedState !=''">
|
|
|
<choose>
|
|
|
<when test="reportedState == 0">
|