Browse Source

审核接口开发

anderx 3 years ago
parent
commit
84fe0dcf93

+ 5 - 1
src/main/java/com/goafanti/common/enums/NoticeTypes.java

@@ -42,7 +42,11 @@ public enum NoticeTypes {
 				|| i == NoticeStatus.PROJECT_OUTSOURCE_YES.getCode() || i == NoticeStatus.PROJECT_OUTSOURCE_NO.getCode()
 				|| i == NoticeStatus.ITEM_CHECK_START.getCode() || i == NoticeStatus.ITEM_CHECK_END.getCode()
 				|| i == NoticeStatus.MENBER_START.getCode() || i == NoticeStatus.MENBER_YES.getCode()
-				|| i == NoticeStatus.MENBER_NO.getCode() ) {
+				|| i == NoticeStatus.MENBER_NO.getCode() ||
+				i == NoticeStatus.PROJECT_SOPT_START.getCode() || i == NoticeStatus.PROJECT_SOPT_YES.getCode()
+				|| i == NoticeStatus.PROJECT_SOPT_NO.getCode()
+				|| i == NoticeStatus.PROJECT_RENEW_START.getCode() || i == NoticeStatus.PROJECT_RENEW_YES.getCode()
+				|| i == NoticeStatus.PROJECT_RENEW_NO.getCode() ) {
 			return 2;
 		} else if (i == NoticeStatus.CUSTOMER_LOSE30.getCode() || i == NoticeStatus.CUSTOMER_LOSE270.getCode()
 				|| i == NoticeStatus.CUSTOMER_CHENNEL_LOSE.getCode()

+ 13 - 11
src/main/java/com/goafanti/common/model/Notice.java

@@ -2,6 +2,7 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import com.goafanti.common.enums.NoticeTypes;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.goafanti.common.constant.AFTConstants;
@@ -284,14 +285,14 @@ public class Notice implements Serializable {
 	}
 
 
-	
+
 	public Notice() {};
 //	Readed(0);//未读
 //	 n.setAid("1");
 //	 n.setNoticeType(NoticeStatus.TASK_PATENT_ERROR.getCode());
 //	 n
 	/**
-	 * 
+	 *
 	 * @param id 编号
 	 * @param createTime 创建时间
 	 * @param readed 0未读
@@ -308,10 +309,10 @@ public class Notice implements Serializable {
 		this.content=content;
 		this.uid=uid;
 	}
-	
-	
+
+
 	/**
-	 * 
+	 *
 	 * @param id 编号
 	 * @param createTime 创建时间
 	 * @param readed 0未读
@@ -325,6 +326,7 @@ public class Notice implements Serializable {
 		this.readed=readed;
 		this.aid=aid;
 		this.noticeType=noticeType;
+		this.type= NoticeTypes.getType(noticeType);
 		this.content=content;
 	}
 
@@ -334,11 +336,11 @@ public class Notice implements Serializable {
 		if (null == this.noticeType)return null;
 		return NoticeStatus.getValueByCode(this.noticeType);
 	}
-    
+
 	public void setNoticeTypeName(Integer noticeType){
-		
+
 	}
-	
+
 	public String getCreateTimeFormattedDate() {
 		if (this.createTime == null) {
 			return null;
@@ -350,6 +352,6 @@ public class Notice implements Serializable {
 	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
 
 	}
-	
-	
-}
+
+
+}