|
|
@@ -1,5 +1,6 @@
|
|
|
package com.goafanti.patent.controller;
|
|
|
|
|
|
+import java.util.Iterator;
|
|
|
import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -86,11 +87,10 @@ public class PatentApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
|
- if (attachmentType == AttachmentType.PATENT_WRITING
|
|
|
- || attachmentType == AttachmentType.AUTHORIZATION_NOTICE
|
|
|
+ if (attachmentType == AttachmentType.PATENT_WRITING || attachmentType == AttachmentType.AUTHORIZATION_NOTICE
|
|
|
|| attachmentType == AttachmentType.PATENT_CERTIFICATE) {
|
|
|
res.setData(handleFiles(res, "/patent/", true, req, sign, TokenManager.getUserId()));
|
|
|
- } else if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT){
|
|
|
+ } else if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT) {
|
|
|
res.setData(handleFile(res, "/identity/", true, req, sign));
|
|
|
} else {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
|
|
|
@@ -264,13 +264,15 @@ public class PatentApiController extends CertifyApiController {
|
|
|
PatentInfo pi = patentInfoService.selectByPrimaryKey(pid);
|
|
|
if (null != pi.getUid() && pi.getUid().equals(TokenManager.getUserId())) {
|
|
|
List<PatentLog> list = patentLogService.selectProcessByPid(pid);
|
|
|
- for (PatentLog log : list) {
|
|
|
- if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.SIGN
|
|
|
- || PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.CIRCULATION
|
|
|
- || PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.SETTLEMENT) {
|
|
|
- list.remove(log);
|
|
|
+ for (Iterator<PatentLog> log = list.iterator(); log.hasNext();) {
|
|
|
+ Integer state = log.next().getState();
|
|
|
+ if (PatentInfoStatus.getStatus(state) == PatentInfoStatus.SIGN
|
|
|
+ || PatentInfoStatus.getStatus(state) == PatentInfoStatus.CIRCULATION
|
|
|
+ || PatentInfoStatus.getStatus(state) == PatentInfoStatus.SETTLEMENT) {
|
|
|
+ log.remove();
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
res.setData(list);
|
|
|
} else {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "专利id"));
|