Antiloveg 8 years ago
parent
commit
0b503545b3

+ 5 - 4
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -863,8 +863,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		Result res = new Result();
 		Integer lp = (!StringUtils.isNumeric(locationProvince) ? null : Integer.parseInt(locationProvince));
 		@SuppressWarnings("unchecked")
-		List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(lp, 1, 1000)
-				.getList();
+		List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(lp, 1, 1000).getList();
 		if (res.getError().isEmpty()) {
 			exportPendings(response, pendings);
 		} else {
@@ -880,10 +879,12 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/exportApplicationFee", method = RequestMethod.GET)
 	public Result exportApplicationFee(
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			Integer locationProvince, HttpServletResponse response) throws ParseException {
+			@RequestParam(name = "locationProvince", required = false) String locationProvince,
+			HttpServletResponse response) throws ParseException {
 		Result res = new Result();
+		Integer lp = (!StringUtils.isNumeric(locationProvince) ? null : Integer.parseInt(locationProvince));
 		List<PatentApplicationFeeBo> fees = (List<PatentApplicationFeeBo>) getApplicationFeeList(patentApplicationDate,
-				locationProvince, 1, 1000).getList();
+				lp, 1, 1000).getList();
 		if (res.getError().isEmpty()) {
 			exportFees(response, fees);
 		} else {