|
@@ -47,6 +47,7 @@ import com.goafanti.common.enums.PatentRegistrationFields;
|
|
|
import com.goafanti.common.model.Admin;
|
|
import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.AftFile;
|
|
import com.goafanti.common.model.AftFile;
|
|
|
import com.goafanti.common.model.OrgRatepay;
|
|
import com.goafanti.common.model.OrgRatepay;
|
|
|
|
|
+import com.goafanti.common.model.OrganizationIdentity;
|
|
|
import com.goafanti.common.model.PatentCost;
|
|
import com.goafanti.common.model.PatentCost;
|
|
|
import com.goafanti.common.model.PatentInfo;
|
|
import com.goafanti.common.model.PatentInfo;
|
|
|
import com.goafanti.common.model.PatentLog;
|
|
import com.goafanti.common.model.PatentLog;
|
|
@@ -93,6 +94,8 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
private AftFileService aftFileService;
|
|
private AftFileService aftFileService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private OrgRatepayService orgRatepayService;
|
|
private OrgRatepayService orgRatepayService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private OrganizationIdentityService organizationIdentityService;
|
|
|
|
|
|
|
|
@Value(value = "${aesSecretKey}")
|
|
@Value(value = "${aesSecretKey}")
|
|
|
private String secretKey = null;
|
|
private String secretKey = null;
|
|
@@ -111,7 +114,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (ids == null || ids.length < 1) {
|
|
if (ids == null || ids.length < 1) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
|
|
|
return res;
|
|
return res;
|
|
@@ -121,7 +124,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转状态", "流转状态"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转状态", "流转状态"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (StringUtils.isBlank(pi.getPrincipal())) {
|
|
if (StringUtils.isBlank(pi.getPrincipal())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到负责人", "负责人"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到负责人", "负责人"));
|
|
|
return res;
|
|
return res;
|
|
@@ -322,7 +325,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
if (null == ratepay) {
|
|
if (null == ratepay) {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
|
map.put("id", ratepay.getId());
|
|
map.put("id", ratepay.getId());
|
|
|
map.put("year", ratepay.getYear().toString());
|
|
map.put("year", ratepay.getYear().toString());
|
|
@@ -432,7 +435,8 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
|| attachmentType == AttachmentType.AUTHORIZATION_NOTICE
|
|
|| attachmentType == AttachmentType.AUTHORIZATION_NOTICE
|
|
|
|| attachmentType == AttachmentType.PATENT_CERTIFICATE) {
|
|
|| attachmentType == AttachmentType.PATENT_CERTIFICATE) {
|
|
|
if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT) {
|
|
if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT) {
|
|
|
- downloadFile(response, pi.getPatentProryStatementDownloadFileName(), pi.getPatentProryStatementUrl());
|
|
|
|
|
|
|
+ OrganizationIdentity oi = organizationIdentityService.selectOrgIdentityByUserId(pi.getUid());
|
|
|
|
|
+ downloadFile(response, oi.getPatentProryStatementDownloadFileName(), oi.getPatentProryStatementUrl());
|
|
|
} else if (attachmentType == AttachmentType.PATENT_WRITING) {
|
|
} else if (attachmentType == AttachmentType.PATENT_WRITING) {
|
|
|
downloadFile(response, pi.getPatentWritingDownloadFileName(), pi.getPatentWritingUrl());
|
|
downloadFile(response, pi.getPatentWritingDownloadFileName(), pi.getPatentWritingUrl());
|
|
|
} else if (attachmentType == AttachmentType.AUTHORIZATION_NOTICE) {
|
|
} else if (attachmentType == AttachmentType.AUTHORIZATION_NOTICE) {
|
|
@@ -446,8 +450,6 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 下载模版文件(专利代理委托书)
|
|
* 下载模版文件(专利代理委托书)
|
|
|
*
|
|
*
|
|
@@ -898,7 +900,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
List<Admin> list = adminService.selectPatentPrincipal();
|
|
List<Admin> list = adminService.selectPatentPrincipal();
|
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
|
for (Admin o : list) {
|
|
for (Admin o : list) {
|
|
|
- map.put(o.getId(), o.getName()+ " " + o.getPosition());
|
|
|
|
|
|
|
+ map.put(o.getId(), o.getName() + " " + o.getPosition());
|
|
|
}
|
|
}
|
|
|
res.setData(map);
|
|
res.setData(map);
|
|
|
return res;
|
|
return res;
|