Browse Source

还原耳标查询查询功能的所有输入参数的类型。

zhuoning 3 years ago
parent
commit
4ee07608f8

+ 24 - 12
huimv-manage/src/main/java/com/huimv/manage/eartag/controller/EarmarkController.java

@@ -42,19 +42,31 @@ public class EarmarkController {
     @RequestMapping(value = "/listEarmark",method = RequestMethod.GET)
 //    public Result listEarmark(@RequestParam(value = "pageSize") int pageSize, HttpServletRequest request){
     public Result listEarmark(
-                              @RequestParam(value = "applyId",required = false) String applyId,
-                              @RequestParam(value = "packageId",required = false) String packageId,
-                              @RequestParam(value = "earMarkId",required = false) String earMarkId,
-                              @RequestParam(value = "earMarkNumber",required = false) String earMarkNumber,
-                              @RequestParam(value = "returnState",required = false) String returnState,
-                              @RequestParam(value = "writeState",required = false) String writeState,
-                              @RequestParam(value = "printState",required = false) String printState,
-                              @RequestParam(value = "startDate",required = false) Date startDate,
-                              @RequestParam(value = "endDate",required = false) Date endDate,
-                              @RequestParam(value = "pageSize",required = true) String pageSize,
-                              @RequestParam(value = "pageNum", required = true) String pageNo){
+//                              @RequestParam(value = "applyId",required = false) String applyId,
+//                              @RequestParam(value = "packageId",required = false) String packageId,
+//                              @RequestParam(value = "earMarkId",required = false) String earMarkId,
+//                              @RequestParam(value = "earMarkNumber",required = false) String earMarkNumber,
+//                              @RequestParam(value = "returnState",required = false) String returnState,
+//                              @RequestParam(value = "writeState",required = false) String writeState,
+//                              @RequestParam(value = "printState",required = false) String printState,
+//                              @RequestParam(value = "startDate",required = false) Date startDate,
+//                              @RequestParam(value = "endDate",required = false) Date endDate,
+//                              @RequestParam(value = "pageSize",required = true) String pageSize,
+//                              @RequestParam(value = "pageNum", required = true) String pageNo){
+            @RequestParam(value = "applyId",required = false) Integer applyId,
+            @RequestParam(value = "packageId",required = false) Integer packageId,
+            @RequestParam(value = "earMarkId",required = false) Integer earMarkId,
+            @RequestParam(value = "earMarkNumber",required = false) Integer earMarkNumber,
+            @RequestParam(value = "returnState",required = false) Integer returnState,
+            @RequestParam(value = "writeState",required = false) Integer writeState,
+            @RequestParam(value = "printState",required = false) Integer printState,
+            @RequestParam(value = "startDate",required = false) Date startDate,
+            @RequestParam(value = "endDate",required = false) Date endDate,
+            @RequestParam(value = "pageSize",required = true) Integer pageSize,
+            @RequestParam(value = "pageNum", required = true) Integer pageNo){
         //
-        return earmarkService.listEarmark(Integer.parseInt(applyId),Integer.parseInt(packageId),Integer.parseInt(earMarkId),Integer.parseInt(earMarkNumber),Integer.parseInt(returnState),Integer.parseInt(writeState),Integer.parseInt(printState),startDate,endDate,Integer.parseInt(pageSize),Integer.parseInt(pageNo));
+        return earmarkService.listEarmark(applyId,packageId,earMarkId,earMarkNumber,returnState,writeState,printState,startDate,endDate,pageSize,pageNo);
+//        return earmarkService.listEarmark(Integer.parseInt(applyId),Integer.parseInt(packageId),Integer.parseInt(earMarkId),Integer.parseInt(earMarkNumber),Integer.parseInt(returnState),Integer.parseInt(writeState),Integer.parseInt(printState),startDate,endDate,Integer.parseInt(pageSize),Integer.parseInt(pageNo));
     }
 
     /**