|
|
@@ -76,7 +76,6 @@ public class PatentApiController extends BaseApiController {
|
|
|
@Resource
|
|
|
private UserService userService;
|
|
|
|
|
|
-
|
|
|
@Value(value = "${upload.private.path}")
|
|
|
private String uploadPrivatePath = null;
|
|
|
|
|
|
@@ -88,7 +87,8 @@ public class PatentApiController extends BaseApiController {
|
|
|
Result res = new Result();
|
|
|
res = checkCertify(res, TokenManager.getUserId());
|
|
|
if (res.getError().isEmpty()) {
|
|
|
- res.setData(patentInfoService.savePatentInfo(patentInfo, TokenManager.getUserId(), TokenManager.getToken().getAid()));
|
|
|
+ res.setData(patentInfoService.savePatentInfo(patentInfo, TokenManager.getUserId(),
|
|
|
+ TokenManager.getToken().getAid()));
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
@@ -194,7 +194,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
res.setData(map);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 获取管理员
|
|
|
*/
|
|
|
@@ -226,7 +226,8 @@ public class PatentApiController extends BaseApiController {
|
|
|
|
|
|
/**
|
|
|
* 管理端专利详情修改保存
|
|
|
- * @throws ParseException
|
|
|
+ *
|
|
|
+ * @throws ParseException
|
|
|
*/
|
|
|
@RequestMapping(value = "/managePatentInfo", method = RequestMethod.POST)
|
|
|
public Result managePatentInfo(String patentNumber, String patentName, String patentCatagory, String patentField,
|
|
|
@@ -246,7 +247,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
patentInfo.setPatentCertificateUrl(patentCertificateUrl);
|
|
|
Date recordTime = null;
|
|
|
if (!StringUtils.isBlank(recordTimeFormattedDate)) {
|
|
|
- recordTime = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
|
|
|
+ recordTime = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
|
|
|
}
|
|
|
patentInfoService.updatePatentInfo(patentInfo, patentLog, recordTime);
|
|
|
|
|
|
@@ -315,7 +316,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
|
|
|
public Result replyConfirm(String pid, Integer patentState) {
|
|
|
Result res = new Result();
|
|
|
- if (StringUtils.isBlank(patentInfoService.updateNoticeOfCorrection(res, pid, patentState))){
|
|
|
+ if (StringUtils.isBlank(patentInfoService.updateNoticeOfCorrection(res, pid, patentState))) {
|
|
|
res.getError().add(buildError("", "确认失败!"));
|
|
|
}
|
|
|
return res;
|
|
|
@@ -430,8 +431,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (res.getError().isEmpty()) {
|
|
|
exportComosites(response, composites);
|
|
|
} else {
|
|
|
- FileUtils downloadUtils = new FileUtils();
|
|
|
- downloadUtils.out(response, res.toString());
|
|
|
+ FileUtils.out(response, res.toString());
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
@@ -448,8 +448,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (res.getError().isEmpty()) {
|
|
|
exportPendings(response, pendings);
|
|
|
} else {
|
|
|
- FileUtils downloadUtils = new FileUtils();
|
|
|
- downloadUtils.out(response, res.toString());
|
|
|
+ FileUtils.out(response, res.toString());
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
@@ -470,8 +469,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
if (res.getError().isEmpty()) {
|
|
|
exportFees(response, fees);
|
|
|
} else {
|
|
|
- FileUtils downloadUtils = new FileUtils();
|
|
|
- downloadUtils.out(response, res.toString());
|
|
|
+ FileUtils.out(response, res.toString());
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
@@ -541,8 +539,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
: calDeadline(obj.getPatentApplicationDateFormattedDate()));
|
|
|
|
|
|
}
|
|
|
- FileUtils downloadUtils = new FileUtils();
|
|
|
- downloadUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
+ FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
}
|
|
|
|
|
|
// 待缴年登印费专利管理报表
|
|
|
@@ -597,8 +594,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
: calDeadline(obj.getAuthorizedDateFormattedDate()));
|
|
|
|
|
|
}
|
|
|
- FileUtils downloadUtils = new FileUtils();
|
|
|
- downloadUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
+ FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
}
|
|
|
|
|
|
private void exportComosites(HttpServletResponse response, List<PatentCompositeBo> composites) {
|
|
|
@@ -628,8 +624,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
row.createCell(10).setCellValue(obj.getPatentApplicationFormattedDate());
|
|
|
row.createCell(11).setCellValue(obj.getAuthor());
|
|
|
}
|
|
|
- FileUtils downloadUtils = new FileUtils();
|
|
|
- downloadUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
+ FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
|
|
|
|
|
|
}
|
|
|
|