|
|
@@ -153,7 +153,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/patentList", method = RequestMethod.GET)
|
|
|
public Result patentList(Integer serialNumber, String patentNumber, String office, String locationProvince,
|
|
|
- String unitName, Integer patentCatagory, String patentName, Integer patentState,
|
|
|
+ String unitName, Integer patentCatagory, String patentName, Integer patentState, String uid,
|
|
|
@RequestParam(name = "createTime[]", required = false) String[] createTime,
|
|
|
@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
|
|
|
String author, String pageNo, String pageSize) {
|
|
|
@@ -167,7 +167,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
res.setData(patentInfoService.getManagePatentList(serialNumber, patentNumber, office, locationProvince,
|
|
|
- unitName, patentCatagory, patentName, patentState, createTime, patentApplicationDate, author, pNo,
|
|
|
+ unitName, patentCatagory, patentName, patentState, createTime, patentApplicationDate, author, uid, pNo,
|
|
|
pSize));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -809,7 +809,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
|
|
|
public Result exportComposite(@RequestParam(name = "serialNumber", required = false) String serialNumber,
|
|
|
- String patentNumber, String office, String locationProvince, String unitName,
|
|
|
+ String patentNumber, String office, String locationProvince, String unitName, String uid,
|
|
|
@RequestParam(name = "patentCatagory", required = false) String patentCatagory, String patentName,
|
|
|
@RequestParam(name = "patentState", required = false) String patentState,
|
|
|
@RequestParam(name = "createTime[]", required = false) String[] createTime,
|
|
|
@@ -822,7 +822,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
Integer ps = (!StringUtils.isNumeric(patentState) ? null : Integer.parseInt(patentState));
|
|
|
String lp = ("undefined".equals(locationProvince)) ? null : locationProvince;
|
|
|
List<PatentManageListBo> composites = (List<PatentManageListBo>) getManagePatentList(sn, patentNumber, office,
|
|
|
- lp, unitName, pc, patentName, ps, createTime, patentApplicationDate, author, 1, 1000).getList();
|
|
|
+ lp, unitName, pc, patentName, ps, createTime, patentApplicationDate, author, uid, 1, 1000).getList();
|
|
|
if (res.getError().isEmpty()) {
|
|
|
exportComosites(response, composites);
|
|
|
} else {
|
|
|
@@ -1130,10 +1130,10 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
// 管理端申请专利列表(专利综合管理)
|
|
|
private Pagination<PatentManageListBo> getManagePatentList(Integer 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)
|
|
|
+ String[] createTime, String[] patentApplicationDate, String author, String uid, Integer pNo, Integer pSize)
|
|
|
throws ParseException {
|
|
|
return patentInfoService.getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName,
|
|
|
- patentCatagory, patentName, patentState, createTime, patentApplicationDate, author, pNo, pSize);
|
|
|
+ patentCatagory, patentName, patentState, createTime, patentApplicationDate, author, uid, pNo, pSize);
|
|
|
}
|
|
|
|
|
|
// 缴费截止日期
|