年报、月报处理

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

@@ -3452,9 +3452,12 @@
 			and a.del_flag = 0
 			and sdi.year = #{statementCompanyComprehensiveInfo.year}
 			and sdi.type = #{statementCompanyComprehensiveInfo.type}
-			and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
 
-			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !=''">
+			<if test="statementCompanyComprehensiveInfo.bigDateType != null and statementCompanyComprehensiveInfo.bigDateType !=0">
+				and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
+			</if>
+
+			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !='' and statementCompanyComprehensiveInfo.bigDateType !=0">
 				and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			</if>
 
@@ -3675,9 +3678,11 @@
 			and a.del_flag = 0
 			and sdi.year = #{statementCompanyComprehensiveInfo.year}
 			and sdi.type = #{statementCompanyComprehensiveInfo.type}
-			and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
+			<if test="statementCompanyComprehensiveInfo.bigDateType != null and statementCompanyComprehensiveInfo.bigDateType !=0">
+				and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
+			</if>
 
-			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !=''">
+			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !='' and statementCompanyComprehensiveInfo.bigDateType !=0">
 				and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			</if>