|
|
@@ -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());
|