|
|
@@ -207,9 +207,14 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()){
|
|
|
- res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
|
|
|
+
|
|
|
+ if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (PatentInfoStatus.SETTLEMENT.getCode() == p.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -291,7 +296,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
|
|
|
return res;
|
|
|
@@ -302,9 +307,14 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()){
|
|
|
- res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
|
|
|
+
|
|
|
+ if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (PatentInfoStatus.SETTLEMENT.getCode() == p.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -319,9 +329,10 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增专利申请上传专利代理委托书
|
|
|
+ *
|
|
|
* @param req
|
|
|
* @param sign
|
|
|
* @param uid
|
|
|
@@ -345,8 +356,6 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* 下载专利相关材料
|
|
|
@@ -584,6 +593,16 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ if (PatentInfoStatus.CALLBACK.getCode() == info.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (PatentInfoStatus.SETTLEMENT.getCode() == info.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
PatentCost patentCost = new PatentCost();
|
|
|
patentCost.setId(cid);
|
|
|
patentCost.setAnnualFeeState(1);
|
|
|
@@ -676,6 +695,23 @@ 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){
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (PatentInfoStatus.SETTLEMENT.getCode() == p.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
patentRegistrationService.updateByPrimaryKey(regBo2Reg(rid, pid, patentRegistrationBo));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -716,6 +752,29 @@ 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"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == cost.getPid()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ PatentInfo info = patentInfoService.selectByPrimaryKey(cost.getPid());
|
|
|
+
|
|
|
+ if (PatentInfoStatus.CALLBACK.getCode() == info.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (PatentInfoStatus.SETTLEMENT.getCode() == info.getPatentState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
|
|
|
PatentCost pc = new PatentCost();
|
|
|
BeanUtils.copyProperties(patentCost, pc);
|
|
|
@@ -1004,32 +1063,32 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
|
|
|
try {
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
|
|
|
- patentRegistration.setAcceptanceIssueTime(
|
|
|
- DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ patentRegistration.setAcceptanceIssueTime(DateUtils
|
|
|
+ .parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
|
|
|
- patentRegistration.setAcceptanceReceiveTime(
|
|
|
- DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ patentRegistration.setAcceptanceReceiveTime(DateUtils
|
|
|
+ .parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
|
|
|
patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
|
|
|
- patentRegistration.setAuthorizationIssueTime(
|
|
|
- DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ patentRegistration.setAuthorizationIssueTime(DateUtils
|
|
|
+ .parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
|
|
|
- patentRegistration.setAuthorizationReceiveTime(
|
|
|
- DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ patentRegistration.setAuthorizationReceiveTime(DateUtils
|
|
|
+ .parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
|
|
|
patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
|
|
|
- patentRegistration.setCertificateIssueTime(
|
|
|
- DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ patentRegistration.setCertificateIssueTime(DateUtils
|
|
|
+ .parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
|
|
|
- patentRegistration.setCertificateRecieveTime(
|
|
|
- DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ patentRegistration.setCertificateRecieveTime(DateUtils
|
|
|
+ .parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
} catch (ParseException e) {
|
|
|
}
|