Antiloveg 8 years ago
parent
commit
1f2f19717a

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -784,8 +784,8 @@
 		o.location_province as locationProvince,
 		o.unit_name as unitName , p.patent_catagory as
 		patentCatagory ,
-		p.patent_state as patentState , a.name as author , p.authorized_date as
-		authorizedDate
+		p.patent_state as patentState , a.name as author , p.record_time as
+		recordTime
 		FROM patent_info p
 		LEFT JOIN organization_identity o ON o.uid = p.uid
     	LEFT JOIN admin a on a.id = p.author

+ 9 - 8
src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -33,7 +33,7 @@ public class PatentNoticeOfCorrectionBo {
 		
 		private String author;
 		
-		private Date authorizedDate;
+		private Date recordTime;
 
 		public String getUid() {
 			return uid;
@@ -132,20 +132,21 @@ public class PatentNoticeOfCorrectionBo {
 			this.author = author;
 		}
 
-		public Date getAuthorizedDate() {
-			return authorizedDate;
+		
+		public Date getRecordTime() {
+			return recordTime;
 		}
 
-		public void setAuthorizedDate(Date authorizedDate) {
-			this.authorizedDate = authorizedDate;
+		public void setRecordTime(Date recordTime) {
+			this.recordTime = recordTime;
 		}
-		
+
 		//authorizedDate
 		public String getAuthorizedDateFormattedDate(){
-			if (this.authorizedDate == null) {
+			if (this.recordTime == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDDHHMMSS);
+				return DateFormatUtils.format(this.getRecordTime(), AFTConstants.YYYYMMDDHHMMSS);
 			}
 		}
 		

+ 5 - 6
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -21,7 +21,6 @@ import com.goafanti.common.dao.PatentRegistrationMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.PatentInfoStatus;
-import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrgIntellectualProperty;
@@ -303,9 +302,6 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	@Override
 	public PatentInfo savePatentInfo(PatentInfo patentInfo, String aid) {
 		patentInfo.setId(UUID.randomUUID().toString());
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		patentInfo.setRecordTime(now.getTime());
 		patentInfo.setDeletedSign(0);
 		patentInfo.setConfirmState(0);
 		patentInfo.setPatentState(PatentInfoStatus.CREATE.getCode());
@@ -357,9 +353,12 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 				p.setPatentApplicationDate(recordTime);
 			} else if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.AUTHORIZE) {
 				p.setAuthorizedDate(recordTime);
+			} else if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.REVIEWNOTICE){
+				p.setRecordTime(recordTime);
+			} else if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.CORRECTIONNOTICE){
+				p.setRecordTime(recordTime);
 			}
-
-			if (TechProjectStatus.getStatus(log.getState()) != TechProjectStatus.CIRCULATION) {
+			if (PatentInfoStatus.getStatus(log.getState()) != PatentInfoStatus.CIRCULATION) {
 				p.setPatentState(log.getState());
 			}
 			p.setPrincipal(log.getPrincipal());