|
|
@@ -99,6 +99,8 @@ public class PatentApiController extends BaseApiController {
|
|
|
PatentCost patentCost = new PatentCost();
|
|
|
patentCost.setId(UUID.randomUUID().toString());
|
|
|
patentCost.setPid(patentInfo.getId());
|
|
|
+ patentCost.setAnnualFeeState(0);
|
|
|
+ patentCost.setPaymentState(0);
|
|
|
patentCostService.insert(patentCost);
|
|
|
res.setData(patentInfo);
|
|
|
return res;
|
|
|
@@ -221,6 +223,8 @@ public class PatentApiController extends BaseApiController {
|
|
|
PatentCost patentCost = new PatentCost();
|
|
|
patentCost.setId(UUID.randomUUID().toString());
|
|
|
patentCost.setPid(patentInfo.getId());
|
|
|
+ patentCost.setAnnualFeeState(0);
|
|
|
+ patentCost.setPaymentState(0);
|
|
|
patentCostService.insert(patentCost);
|
|
|
res.setData(patentInfo);
|
|
|
return res;
|
|
|
@@ -255,7 +259,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
d = null;
|
|
|
}
|
|
|
|
|
|
- if (patentLog.getPrincipal() != null ) {
|
|
|
+ if (!StringUtils.isBlank(patentLog.getPrincipal())) {
|
|
|
switch (patentLog.getState()) {
|
|
|
case 1:
|
|
|
patentInfo.setCreateTime(d);
|
|
|
@@ -438,7 +442,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
* 用户确认申报材料
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value= "clientConfirm",method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value= "/clientConfirm",method = RequestMethod.POST)
|
|
|
public Result clientConfirmApplicationMaterials(String pid){
|
|
|
Result res = new Result();
|
|
|
PatentInfo p = new PatentInfo();
|
|
|
@@ -632,9 +636,10 @@ public class PatentApiController extends BaseApiController {
|
|
|
row.createCell(7).setCellValue("未缴费");
|
|
|
}
|
|
|
row.createCell(8).setCellValue(null == obj.getAuthorizedDateFormattedDate() ? "" : calDeadline(obj.getAuthorizedDateFormattedDate()));
|
|
|
- DownloadUtils downloadUtils = new DownloadUtils();
|
|
|
- downloadUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
+
|
|
|
}
|
|
|
+ DownloadUtils downloadUtils = new DownloadUtils();
|
|
|
+ downloadUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -700,12 +705,12 @@ public class PatentApiController extends BaseApiController {
|
|
|
Result res = new Result();
|
|
|
String fileName = "";
|
|
|
if(StringUtils.isBlank(oid)){
|
|
|
- fileName = "/patent" + TokenManager.getUserId()+ "_" + sign + ".doc";
|
|
|
+ fileName = "/patent/" + TokenManager.getUserId()+ "_" + sign + ".doc";
|
|
|
}else{
|
|
|
if(sign.equals("patent_prory_statement") || sign.equals("patent_writing")){
|
|
|
- fileName = "/patent" + oid + "_" + sign + ".doc";
|
|
|
+ fileName = "/patent/" + oid + "_" + sign + ".doc";
|
|
|
}else{
|
|
|
- fileName = "/patent" + oid + "_" + sign + ".jpg";
|
|
|
+ fileName = "/patent/" + oid + "_" + sign + ".jpg";
|
|
|
}
|
|
|
}
|
|
|
res.setData(handleFile(res, fileName , req));
|
|
|
@@ -721,7 +726,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
@RequestMapping(value="/downloadTemplate",method = RequestMethod.GET)
|
|
|
public Result downloadPatentProryStatement(HttpServletResponse response, HttpServletRequest request){
|
|
|
Result res = new Result();
|
|
|
- String filename = "专利代理委托书模版" + Long.toString(System.nanoTime())+".doc";
|
|
|
+ String filename = "Patent" + Long.toString(System.nanoTime())+".doc";
|
|
|
String fileSaveRootPath = uploadPrivatePath + "/patent/patent_prory_statement.doc";
|
|
|
return patentDownload(res,response,filename,fileSaveRootPath);
|
|
|
}
|
|
|
@@ -737,10 +742,6 @@ public class PatentApiController extends BaseApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "下载文件不存在!"));
|
|
|
return res;
|
|
|
}
|
|
|
- /*if(null == TokenManager.getAdminToken()){
|
|
|
- res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "权限不足,无法下载!"));
|
|
|
- return res;
|
|
|
- }*/
|
|
|
String filename = "";
|
|
|
if(sign.equals("patent_prory_statement") || sign.equals("patent_writing")){
|
|
|
filename =Long.toString(System.nanoTime())+".doc";
|