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