项目列表-咨询营业收入统计-调整

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -2349,6 +2349,15 @@ END) as projectScale*/
 			<if test="engineeringType !=null and engineeringType !=''">
 				and a.engineering_type= #{engineeringType}
 			</if>
+
+			<!-- 送审规模 -->
+			<if test="beginSubmitScale !=null and beginSubmitScale != ''">
+				AND a.submit_scale >= #{beginSubmitScale}
+			</if>
+			<if test="endSubmitScale !=null and endSubmitScale != ''">
+				AND a.submit_scale &lt; #{endSubmitScale}
+			</if>
+
 			<!-- 质量复核审核时间 -->
 			<if test="reportBeginDate !=null">
 				AND prd.audit_pass_date >= #{reportBeginDate}
@@ -2423,21 +2432,17 @@ END) as projectScale*/
 					#{officeId}
 				</foreach>
 			</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="projectReportStatus != null">
+				AND
+				<choose>
+					<when test="projectReportStatus != 0">
+						prd.status = #{projectReportStatus}
+					</when>
+					<otherwise>
+						prd.STATUS is null
+					</otherwise>
+				</choose>
+			</if>
 			<if test="reportedState !=null and reportedState !=''">
 				<choose>
 					<when test="reportedState == 0">