|
|
@@ -831,7 +831,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
|
|
|
public Result exportComposite(@RequestParam(name = "contractId", required = false) String contractId,
|
|
|
@RequestParam(name = "serialNumber", required = false) String serialNumber, String patentNumber,
|
|
|
- String office, @RequestParam(name = "locationProvince", required = false) Integer locationProvince,
|
|
|
+ String office, @RequestParam(name = "locationProvince", required = false) 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,
|
|
|
@@ -842,7 +842,7 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
Integer sn = (!StringUtils.isNumeric(serialNumber) ? null : Integer.parseInt(serialNumber));
|
|
|
Integer pc = (!StringUtils.isNumeric(patentCatagory) ? null : Integer.parseInt(patentCatagory));
|
|
|
Integer ps = (!StringUtils.isNumeric(patentState) ? null : Integer.parseInt(patentState));
|
|
|
- Integer lp = (null == locationProvince) ? null : locationProvince;
|
|
|
+ Integer lp = (!StringUtils.isNumeric(locationProvince) ? null : Integer.parseInt(locationProvince));
|
|
|
List<PatentManageListBo> composites = (List<PatentManageListBo>) getManagePatentList(contractId, sn,
|
|
|
patentNumber, office, lp, unitName, pc, patentName, ps, createTime, patentApplicationDate, author, uid,
|
|
|
1, 1000).getList();
|