|
|
@@ -281,7 +281,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 专利相关材料上传
|
|
|
+ * 专利相关材料上传(专利稿件,授权通知书,专利证书)
|
|
|
*
|
|
|
* @param req
|
|
|
* @param uid
|
|
|
@@ -319,8 +319,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
|
- if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT || 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, uid));
|
|
|
} else {
|
|
|
@@ -695,13 +694,13 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
PatentInfo p = patentInfoService.selectByPrimaryKey(pid);
|
|
|
- if (null == p){
|
|
|
+ if (null == p) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()) {
|
|
|
res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
|
|
|
return res;
|
|
|
@@ -711,7 +710,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
patentRegistrationService.updateByPrimaryKey(regBo2Reg(rid, pid, patentRegistrationBo));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -752,7 +751,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
PatentCost cost = patentCostService.selectByPrimaryKey(cid);
|
|
|
if (null == cost) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
|
|
|
@@ -770,7 +769,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (PatentInfoStatus.SETTLEMENT.getCode() == info.getPatentState()) {
|
|
|
res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
|
|
|
return res;
|
|
|
@@ -1063,32 +1062,32 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
|
|
|
try {
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
|
|
|
- patentRegistration.setAcceptanceIssueTime(DateUtils
|
|
|
- .parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD));
|
|
|
+ patentRegistration.setAcceptanceIssueTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD));
|
|
|
}
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
|
|
|
- patentRegistration.setAcceptanceReceiveTime(DateUtils
|
|
|
- .parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD));
|
|
|
+ patentRegistration.setAcceptanceReceiveTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD));
|
|
|
}
|
|
|
patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
|
|
|
patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
|
|
|
- patentRegistration.setAuthorizationIssueTime(DateUtils
|
|
|
- .parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD));
|
|
|
+ patentRegistration.setAuthorizationIssueTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD));
|
|
|
}
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
|
|
|
- patentRegistration.setAuthorizationReceiveTime(DateUtils
|
|
|
- .parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD));
|
|
|
+ patentRegistration.setAuthorizationReceiveTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD));
|
|
|
}
|
|
|
patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
|
|
|
patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
|
|
|
- patentRegistration.setCertificateIssueTime(DateUtils
|
|
|
- .parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDD));
|
|
|
+ patentRegistration.setCertificateIssueTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDD));
|
|
|
}
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
|
|
|
- patentRegistration.setCertificateRecieveTime(DateUtils
|
|
|
- .parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDD));
|
|
|
+ patentRegistration.setCertificateRecieveTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDD));
|
|
|
}
|
|
|
} catch (ParseException e) {
|
|
|
}
|