Browse Source

上报导出

[user3] 3 năm trước cách đây
mục cha
commit
aaa00f61cc

+ 3 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -959,6 +959,7 @@ END) as projectScale*/
 			and prd.status = 5
 			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
 			and rprr.report_status is not null
+			and a.reported_state=7
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 					/*B类紧急*/
@@ -1009,7 +1010,8 @@ END) as projectScale*/
 			and prd.status = 5
 			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
 			and rprr.report_status is not null
-			and rprr.JingHeJianLv>30
+			and a.reported_state=11
+			AND( rprr.JingHeJianLv > 30 or rprr.JingHeJianLv &lt;=-30)
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 					/*B类紧急*/