|
|
@@ -1,6 +1,7 @@
|
|
|
package com.goafanti.techservice.patent.controller;
|
|
|
|
|
|
import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.LinkedHashMap;
|
|
|
@@ -10,6 +11,7 @@ import java.util.UUID;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
+import org.junit.Test;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
@@ -24,6 +26,7 @@ import com.goafanti.common.model.PatentCost;
|
|
|
import com.goafanti.common.model.PatentInfo;
|
|
|
import com.goafanti.common.model.PatentLog;
|
|
|
import com.goafanti.common.model.PatentRegistration;
|
|
|
+import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -32,6 +35,7 @@ import com.goafanti.techservice.patent.bo.PatentCompositeBo;
|
|
|
import com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo;
|
|
|
import com.goafanti.techservice.patent.bo.PatentPendingBo;
|
|
|
import com.goafanti.techservice.patent.bo.PatentRecieveSendBo;
|
|
|
+import com.goafanti.techservice.patent.bo.PatentRegistrationBo;
|
|
|
import com.goafanti.techservice.patent.service.AdminService;
|
|
|
import com.goafanti.techservice.patent.service.PatentCostService;
|
|
|
import com.goafanti.techservice.patent.service.PatentInfoService;
|
|
|
@@ -43,17 +47,17 @@ import com.goafanti.user.service.OrganizationIdentityService;
|
|
|
@RequestMapping(value = "/techservice/patent")
|
|
|
public class PatentApiController extends BaseApiController {
|
|
|
@Resource
|
|
|
- private PatentInfoService patentInfoService;
|
|
|
+ private PatentInfoService patentInfoService;
|
|
|
@Resource
|
|
|
- private PatentLogService patentLogService;
|
|
|
+ private PatentLogService patentLogService;
|
|
|
@Resource
|
|
|
- private OrganizationIdentityService organizationIdentityServivce;
|
|
|
+ private OrganizationIdentityService organizationIdentityServivce;
|
|
|
@Resource
|
|
|
- private PatentCostService patentCostService;
|
|
|
+ private PatentCostService patentCostService;
|
|
|
@Resource
|
|
|
- private PatentRegistrationService patentRegistrationService;
|
|
|
+ private PatentRegistrationService patentRegistrationService;
|
|
|
@Resource
|
|
|
- private AdminService adminService;
|
|
|
+ private AdminService adminService;
|
|
|
|
|
|
/**
|
|
|
* 用户端专利申请
|
|
|
@@ -111,22 +115,25 @@ public class PatentApiController extends BaseApiController {
|
|
|
* 用户端申请专利当前流程/管理端专利详情-专利状态流转记录
|
|
|
*/
|
|
|
@RequestMapping(value = "/patentProcess", method = RequestMethod.POST)
|
|
|
- public Result clientCurrentProcess(String pid) {
|
|
|
+ public Result patentProcess(String pid) {
|
|
|
Result res = new Result();
|
|
|
- List<PatentLog> patentLog = patentLogService.selectCurrentProcessByPid(pid);
|
|
|
+ List<PatentLog> patentLog = patentLogService.selectProcessByPid(pid);
|
|
|
res.setData(patentLog);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 管理端申请专利列表
|
|
|
- * @throws ParseException
|
|
|
+ *
|
|
|
+ * @throws ParseException
|
|
|
*/
|
|
|
@RequestMapping(value = "/managePatentList", method = RequestMethod.POST)
|
|
|
- public Result managePatentList(String serialNumber,String patentNumber,String office,String locationProvince,String unitName,
|
|
|
- Integer patentCatagory,String patentName,Integer patentState, @RequestParam(name="createTime[]", required=false) String[] createTime, @RequestParam(name="patentApplicationDate[]", required=false) String[] patentApplicationDate,
|
|
|
- String author,String pageNo, String pageSize) throws ParseException{
|
|
|
- Result res =new Result();
|
|
|
+ public Result managePatentList(String serialNumber, String patentNumber, String office, String locationProvince,
|
|
|
+ String unitName, Integer patentCatagory, String patentName, Integer patentState,
|
|
|
+ @RequestParam(name = "createTime[]", required = false) String[] createTime,
|
|
|
+ @RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
|
|
|
+ String author, String pageNo, String pageSize) throws ParseException {
|
|
|
+ Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
if (StringUtils.isNumeric(pageSize)) {
|
|
|
@@ -135,45 +142,48 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName,
|
|
|
- patentCatagory, patentName, patentState, createTime, patentApplicationDate
|
|
|
- , author, pNo, pSize));
|
|
|
+ res.setData(getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName, patentCatagory,
|
|
|
+ patentName, patentState, createTime, patentApplicationDate, author, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 获取公司
|
|
|
*/
|
|
|
- @RequestMapping(value="/getUnitNames",method = RequestMethod.GET)
|
|
|
- public Result getUnitNames(){
|
|
|
+ @RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
|
|
|
+ public Result getUnitNames() {
|
|
|
Result res = new Result();
|
|
|
List<OrganizationIdentity> list = organizationIdentityServivce.selectAllOrgIndentity();
|
|
|
Map<String, String> map = new LinkedHashMap<String, String>();
|
|
|
- for(OrganizationIdentity o : list){
|
|
|
+ for (OrganizationIdentity o : list) {
|
|
|
map.put(o.getUid(), o.getUnitName());
|
|
|
}
|
|
|
res.setData(map);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- * 获取操作人
|
|
|
+ * 获取管理员
|
|
|
*/
|
|
|
- @RequestMapping(value="/getAdmin",method=RequestMethod.GET)
|
|
|
- public Result getAdmin(){
|
|
|
+ @RequestMapping(value = "/getAdmin", method = RequestMethod.GET)
|
|
|
+ public Result getAdmin() {
|
|
|
Result res = new Result();
|
|
|
List<Admin> admin = adminService.selectAllAdmin();
|
|
|
- res.setData(admin);
|
|
|
+ Map<String, String> map = new LinkedHashMap<String, String>();
|
|
|
+ for (Admin a : admin) {
|
|
|
+ map.put(a.getId(), a.getName());
|
|
|
+ }
|
|
|
+ res.setData(map);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 管理端新增专利申请
|
|
|
*/
|
|
|
- @RequestMapping(value="/manageApplyPatent",method = RequestMethod.POST)
|
|
|
- public Result manageApplyPatent(PatentInfo patentInfo,String uid){
|
|
|
+ @RequestMapping(value = "/manageApplyPatent", method = RequestMethod.POST)
|
|
|
+ public Result manageApplyPatent(PatentInfo patentInfo, String uid) {
|
|
|
Result res = new Result();
|
|
|
- if(null == uid){
|
|
|
+ if (null == uid) {
|
|
|
res.getError().add(buildError("该公司无法提交申请!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -191,19 +201,19 @@ public class PatentApiController extends BaseApiController {
|
|
|
res.setData(patentInfo);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 管理端专利详情修改保存
|
|
|
*/
|
|
|
- @RequestMapping(value="managePatentInfo",method = RequestMethod.POST)
|
|
|
- public Result managePatentInfo(PatentInfo patentInfo,String pid,PatentLog patentLog){
|
|
|
+ @RequestMapping(value = "/managePatentInfo", method = RequestMethod.POST)
|
|
|
+ public Result managePatentInfo(PatentInfo patentInfo, String pid, PatentLog patentLog) {
|
|
|
Result res = new Result();
|
|
|
- if(null == patentInfo.getId()){
|
|
|
+ if (null == patentInfo.getId()) {
|
|
|
res.getError().add(buildError("保存失败!"));
|
|
|
return res;
|
|
|
}
|
|
|
- if (patentLog != null){
|
|
|
- switch (patentLog.getState()){
|
|
|
+ if (patentLog != null) {
|
|
|
+ switch (patentLog.getState()) {
|
|
|
case 1:
|
|
|
patentInfo.setCreateTime(patentLog.getRecordTime());
|
|
|
break;
|
|
|
@@ -215,18 +225,18 @@ public class PatentApiController extends BaseApiController {
|
|
|
break;
|
|
|
}
|
|
|
patentInfo.setPatentState(patentLog.getState());
|
|
|
- patentLogService.insert(patentLog);
|
|
|
+ patentLogService.insert(patentLog);
|
|
|
}
|
|
|
patentInfo.setId(pid);
|
|
|
patentInfoService.updateByPrimaryKeySelective(patentInfo);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 待缴费专利管理
|
|
|
*/
|
|
|
- @RequestMapping(value="/managePendingPaymentList",method = RequestMethod.POST)
|
|
|
- public Result managePendingPaymentList(String locationProvince,String pageNo, String pageSize){
|
|
|
+ @RequestMapping(value = "/managePendingPaymentList", method = RequestMethod.POST)
|
|
|
+ public Result managePendingPaymentList(String locationProvince, String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
@@ -236,33 +246,34 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(getManagePendingPaymentList(locationProvince,pNo,pSize));
|
|
|
+ res.setData(getManagePendingPaymentList(locationProvince, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 年费确认缴费
|
|
|
*/
|
|
|
- @RequestMapping(value="/confirmPayment",method = RequestMethod.POST)
|
|
|
- public Result confirmPayment(String cid){
|
|
|
+ @RequestMapping(value = "/confirmPayment", method = RequestMethod.POST)
|
|
|
+ public Result confirmPayment(String cid) {
|
|
|
Result res = new Result();
|
|
|
- if (null == cid){
|
|
|
+ if (null == cid) {
|
|
|
res.getError().add(buildError("确认缴费失败!"));
|
|
|
return res;
|
|
|
}
|
|
|
- PatentCost patentCost =new PatentCost();
|
|
|
+ PatentCost patentCost = new PatentCost();
|
|
|
patentCost.setId(cid);
|
|
|
patentCost.setAnnualFeeState(1);
|
|
|
patentCostService.updateByPrimaryKeySelective(patentCost);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 补正审查通知列表
|
|
|
*/
|
|
|
- @RequestMapping(value="/noticeOfCorrectionList",method = RequestMethod.POST)
|
|
|
- public Result noticeOfCorrectionList(Date authorizedDate,String serialNumber, String patentNumber, String office, String locationProvince, String unitName,
|
|
|
- Integer patentCatagory, String patentName, Integer patentState ,String author ,String pageNo, String pageSize){
|
|
|
+ @RequestMapping(value = "/noticeOfCorrectionList", method = RequestMethod.POST)
|
|
|
+ public Result noticeOfCorrectionList(Date authorizedDate, String serialNumber, String patentNumber, String office,
|
|
|
+ String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
|
|
|
+ String author, String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
@@ -272,24 +283,24 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(getNoticeOfCorrectionList(authorizedDate,serialNumber,patentNumber,office,locationProvince,unitName,
|
|
|
- patentCatagory,patentName,patentState,author,pNo,pSize));
|
|
|
- return res;
|
|
|
+ res.setData(getNoticeOfCorrectionList(authorizedDate, serialNumber, patentNumber, office, locationProvince,
|
|
|
+ unitName, patentCatagory, patentName, patentState, author, pNo, pSize));
|
|
|
+ return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 补正审查通知答复确认
|
|
|
*/
|
|
|
- @RequestMapping(value="/replyConfirm",method = RequestMethod.POST)
|
|
|
- public Result replyConfirm(String pid ,Integer patentState){
|
|
|
+ @RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
|
|
|
+ public Result replyConfirm(String pid, Integer patentState) {
|
|
|
Result res = new Result();
|
|
|
PatentInfo patentInfo = new PatentInfo();
|
|
|
patentInfo.setId(pid);
|
|
|
- if(patentState == 4){
|
|
|
+ if (patentState == 4) {
|
|
|
patentInfo.setPatentState(5);
|
|
|
- }else if(patentState == 6){
|
|
|
+ } else if (patentState == 6) {
|
|
|
patentInfo.setPatentState(7);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
res.getError().add(buildError("通知答复确认失败!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -307,12 +318,12 @@ public class PatentApiController extends BaseApiController {
|
|
|
patentLogService.insert(patentLog);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 收发详情入口/收发纸件登记
|
|
|
*/
|
|
|
- @RequestMapping(value="/getRecieveSendList",method = RequestMethod.POST)
|
|
|
- public Result RecieveSendList(String pageNo, String pageSize){
|
|
|
+ @RequestMapping(value = "/getRecieveSendList", method = RequestMethod.POST)
|
|
|
+ public Result RecieveSendList(String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
@@ -322,29 +333,29 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(getRecieveSendList(pNo,pSize));
|
|
|
+ res.setData(getRecieveSendList(pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
- * 收发详情保存修改
|
|
|
+ * 收发登记详情编辑保存
|
|
|
+ *
|
|
|
+ * @throws ParseException
|
|
|
*/
|
|
|
- @RequestMapping(value="/saveRecieveSend",method = RequestMethod.POST)
|
|
|
- public Result recieveSendDetail(String rid,PatentRegistration patentRegistration){
|
|
|
+ @RequestMapping(value = "/saveRecieveSend", method = RequestMethod.POST)
|
|
|
+ public Result recieveSendDetail(String rid, PatentRegistrationBo patentRegistrationBo) throws ParseException {
|
|
|
Result res = new Result();
|
|
|
- patentRegistration.setId(rid);
|
|
|
- patentRegistrationService.updateByPrimaryKeySelective(patentRegistration);
|
|
|
+ patentRegistrationService.updateByPrimaryKeySelective(regBo2Reg(rid, patentRegistrationBo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 专利申请费用管理
|
|
|
*/
|
|
|
- @RequestMapping(value="/getApplicationFeeList",method=RequestMethod.POST)
|
|
|
- public Result getApplicationFeeList(String[] patentApplicationDate,String locationProvince,String pageNo, String pageSize)
|
|
|
- throws ParseException{
|
|
|
+ @RequestMapping(value = "/getApplicationFeeList", method = RequestMethod.POST)
|
|
|
+ public Result getApplicationFeeList(
|
|
|
+ @RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
|
|
|
+ String locationProvince, String pageNo, String pageSize) throws ParseException {
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
|
@@ -354,75 +365,109 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(getApplicationFeeList(patentApplicationDate,locationProvince,pNo,pSize));
|
|
|
+ res.setData(getApplicationFeeList(patentApplicationDate, locationProvince, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 登记申请费用
|
|
|
*/
|
|
|
- @RequestMapping(value="/registerApplicationFee",method=RequestMethod.POST)
|
|
|
- public Result registerApplicationFee(PatentCost patentCost,String cid){
|
|
|
+ @RequestMapping(value = "/registerApplicationFee", method = RequestMethod.POST)
|
|
|
+ public Result registerApplicationFee(PatentCost patentCost, String cid) {
|
|
|
Result res = new Result();
|
|
|
PatentCost p = new PatentCost();
|
|
|
- if(null == patentCost.getApplicationFee() || null == patentCost.getPrintingFee() || null == patentCost.getTrialFee()){
|
|
|
- res.getError().add(buildError(ErrorConstants.FEE_EMPTY_ERROR,"申请费、实审费、文印费均不能为空!"));
|
|
|
- return res;
|
|
|
- }
|
|
|
p.setId(cid);
|
|
|
p.setApplicationFee(patentCost.getApplicationFee());
|
|
|
- p.setIsReimbursement(patentCost.getIsReimbursement());
|
|
|
- p.setIsRequestFunds(patentCost.getIsRequestFunds());
|
|
|
+ p.setReimbursement(patentCost.getReimbursement());
|
|
|
+ p.setFunds(patentCost.getFunds());
|
|
|
p.setTrialFee(patentCost.getTrialFee());
|
|
|
p.setPrintingFee(patentCost.getPrintingFee());
|
|
|
- p.setPaymentState("1");
|
|
|
+ p.setPaymentState(patentCost.getPaymentState());
|
|
|
res.setData(patentCostService.updateByPrimaryKeySelective(p));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- //专利纸件收发登记
|
|
|
- private Pagination<PatentRecieveSendBo> getRecieveSendList(Integer pNo,Integer pSize) {
|
|
|
- return (Pagination<PatentRecieveSendBo>) patentRegistrationService.getRecieveSendList(pNo,pSize) ;
|
|
|
+
|
|
|
+ // 专利纸件收发登记
|
|
|
+ private Pagination<PatentRecieveSendBo> getRecieveSendList(Integer pNo, Integer pSize) {
|
|
|
+ return (Pagination<PatentRecieveSendBo>) patentRegistrationService.getRecieveSendList(pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- //专利申请费用管理
|
|
|
- private Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate, String locationProvince,
|
|
|
- Integer pNo,Integer pSize) throws ParseException{
|
|
|
- return (Pagination<PatentApplicationFeeBo>) patentCostService.getApplicationFeeList(patentApplicationDate,locationProvince,pNo,pSize);
|
|
|
+
|
|
|
+ // 专利申请费用管理
|
|
|
+ private Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate,
|
|
|
+ String locationProvince, Integer pNo, Integer pSize) throws ParseException {
|
|
|
+ return (Pagination<PatentApplicationFeeBo>) patentCostService.getApplicationFeeList(patentApplicationDate,
|
|
|
+ locationProvince, pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
- //补正审查通知列表
|
|
|
- private Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, String serialNumber, String patentNumber,
|
|
|
- String office, String locationProvince, String unitName, Integer patentCatagory, String patentName,
|
|
|
- Integer patentState, String author, Integer pNo, Integer pSize) {
|
|
|
- return (Pagination<PatentNoticeOfCorrectionBo>) patentInfoService.getNoticeOfCorrectionList(authorizedDate,serialNumber,patentNumber,office,locationProvince,unitName,
|
|
|
- patentCatagory,patentName,patentState,author,pNo,pSize);
|
|
|
+
|
|
|
+ // 补正审查通知列表
|
|
|
+ private Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, String serialNumber,
|
|
|
+ String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
|
|
|
+ String patentName, Integer patentState, String author, Integer pNo, Integer pSize) {
|
|
|
+ return (Pagination<PatentNoticeOfCorrectionBo>) patentInfoService.getNoticeOfCorrectionList(authorizedDate,
|
|
|
+ serialNumber, patentNumber, office, locationProvince, unitName, patentCatagory, patentName, patentState,
|
|
|
+ author, pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
- //待缴费专利管理
|
|
|
- private Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo, Integer pSize) {
|
|
|
- return (Pagination<PatentPendingBo>) patentInfoService.getManagePendingPaymentList(locationProvince,pNo,pSize);
|
|
|
+
|
|
|
+ // 待缴费专利管理
|
|
|
+ private Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo,
|
|
|
+ Integer pSize) {
|
|
|
+ return (Pagination<PatentPendingBo>) patentInfoService.getManagePendingPaymentList(locationProvince, pNo,
|
|
|
+ pSize);
|
|
|
}
|
|
|
-
|
|
|
- //管理端申请专利列表
|
|
|
- private Pagination<PatentCompositeBo> getManagePatentList(String serialNumber,String patentNumber,String office,String locationProvince,String unitName,
|
|
|
- Integer patentCatagory,String patentName,Integer patentState,String[] createTime,String[] patentApplicationDate,
|
|
|
- String author,Integer pNo, Integer pSize) throws ParseException{
|
|
|
- return (Pagination<PatentCompositeBo>) patentInfoService.getManagePatentList( serialNumber, patentNumber, office, locationProvince, unitName,
|
|
|
- patentCatagory, patentName, patentState, createTime, patentApplicationDate,
|
|
|
- author, pNo, pSize);
|
|
|
+
|
|
|
+ // 管理端申请专利列表(专利综合管理)
|
|
|
+ private Pagination<PatentCompositeBo> getManagePatentList(String serialNumber, String patentNumber, String office,
|
|
|
+ String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
|
|
|
+ String[] createTime, String[] patentApplicationDate, String author, Integer pNo, Integer pSize)
|
|
|
+ throws ParseException {
|
|
|
+ return (Pagination<PatentCompositeBo>) patentInfoService.getManagePatentList(serialNumber, patentNumber, office,
|
|
|
+ locationProvince, unitName, patentCatagory, patentName, patentState, createTime, patentApplicationDate,
|
|
|
+ author, pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
- //用户端申请专利列表
|
|
|
+
|
|
|
+ // 用户端申请专利列表
|
|
|
private Pagination<PatentInfo> getClientApplyList(Result res, String patentNumber, String patentName,
|
|
|
Integer patentCatagory, Integer patentState, Integer pNo, Integer pSize) {
|
|
|
return (Pagination<PatentInfo>) patentInfoService.getClientApplyList(TokenManager.getUserId(), patentNumber,
|
|
|
patentName, patentCatagory, patentState, pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ private PatentRegistration regBo2Reg(String rid, PatentRegistrationBo patentRegistrationBo) throws ParseException {
|
|
|
+ PatentRegistration patentRegistration = new PatentRegistration();
|
|
|
+ patentRegistration.setId(rid);
|
|
|
+ patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
|
|
|
+ if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
|
|
|
+ patentRegistration.setAcceptanceIssueTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), "yyyy-MM-dd"));
|
|
|
+ }
|
|
|
+ if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
|
|
|
+ patentRegistration.setAcceptanceReceiveTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), "yyyy-MM-dd"));
|
|
|
+ }
|
|
|
+ patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
|
|
|
+ patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
|
|
|
+ if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
|
|
|
+ patentRegistration.setAuthorizationIssueTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), "yyyy-MM-dd"));
|
|
|
+ }
|
|
|
+ if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
|
|
|
+ patentRegistration.setAuthorizationReceiveTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), "yyyy-MM-dd"));
|
|
|
+ }
|
|
|
+ patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
|
|
|
+ patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
|
|
|
+ if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
|
|
|
+ patentRegistration.setCertificateIssueTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), "yyyy-MM-dd"));
|
|
|
+
|
|
|
+ }
|
|
|
+ if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
|
|
|
+ patentRegistration.setCertificateRecieveTime(
|
|
|
+ DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), "yyyy-MM-dd"));
|
|
|
+ }
|
|
|
+ patentRegistration.setCertificateTrackingNumber(patentRegistrationBo.getCertificateTrackingNumber());
|
|
|
+ return patentRegistration;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|