增加查询条件

src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceiveExample.java

@@ -222,6 +222,10 @@ public class BusinessNoticeReceiveExample {
             addCriterion("audit_state =", value, "auditState");
             return (Criteria) this;
         }
+        public Criteria andAuditStateNotEqualTo(Integer value) {
+            addCriterion("audit_state <>", value, "auditState");
+            return (Criteria) this;
+        }
         public Criteria andIsNoticeEqualTo(Integer value) {
             addCriterion("is_notice =", value, "isNotice");
             return (Criteria) this;

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -110,7 +110,11 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         }
         //审批通过的
         if(businessNoticeReceive.getAuditState() != null){
-        	createCriteria.andAuditStateEqualTo(businessNoticeReceive.getAuditState());
+        	if(businessNoticeReceive.getAuditState().equals("04")){//未审批结束的
+        		createCriteria.andAuditStateNotEqualTo(5);//5是审批结束的
+        	}else{
+        		createCriteria.andAuditStateEqualTo(businessNoticeReceive.getAuditState());
+        	}
         }
         //是否是可以引用的通知单
         if(businessNoticeReceive.getIsNotice()!=null){