查询条件调整

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -509,7 +509,7 @@
 				<if test="dbName == 'mysql'">concat('%',#{number},'%')</if>
 			</if>
 			<if test="invoiceState != null and invoiceState != ''">
-				AND a.invoice_state = #{invoiceState} or a.cancellation_state = #{invoiceState}
+				AND (a.invoice_state = #{invoiceState} or a.cancellation_state = #{invoiceState})
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
@@ -1462,7 +1462,7 @@
 				<if test="dbName == 'mysql'">concat('%',#{number},'%')</if>
 			</if>
 			<if test="invoiceState != null and invoiceState != ''">
-				AND a.invoice_state = #{invoiceState} or a.cancellation_state = #{invoiceState}
+				AND (a.invoice_state = #{invoiceState} or a.cancellation_state = #{invoiceState})
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
@@ -3032,6 +3032,7 @@
 				<if test="null != officeId and officeId != ''">
 					and office_id = #{officeId}
 				</if>
+			     and invoice_state = 5
 				 and invoice_date between #{beginDate} and #{endDate}
 			</where>
 			) and del_flag = 0