|
|
@@ -858,11 +858,12 @@ public class AdminPatentApiController extends CertifyApiController {
|
|
|
* 待缴年登印费专利管理报表导出
|
|
|
*/
|
|
|
@RequestMapping(value = "/exportPending", method = RequestMethod.GET)
|
|
|
- public Result exportPending(@RequestParam(name = "locationProvince", required = false) Integer locationProvince,
|
|
|
+ public Result exportPending(@RequestParam(name = "locationProvince", required = false) String locationProvince,
|
|
|
HttpServletResponse response) {
|
|
|
Result res = new Result();
|
|
|
+ Integer lp = (!StringUtils.isNumeric(locationProvince) ? null : Integer.parseInt(locationProvince));
|
|
|
@SuppressWarnings("unchecked")
|
|
|
- List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(locationProvince, 1, 1000)
|
|
|
+ List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(lp, 1, 1000)
|
|
|
.getList();
|
|
|
if (res.getError().isEmpty()) {
|
|
|
exportPendings(response, pendings);
|