Browse Source

Merge branch 'v5' of http://git.ycjcjy.com/welcome/service-welcome3 into v5

Your Name 5 years ago
parent
commit
9cb1bd43da

+ 2
- 2
src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java View File

310
      */
310
      */
311
     @RequestMapping(value="/excel/usherListExcel",method= RequestMethod.GET)
311
     @RequestMapping(value="/excel/usherListExcel",method= RequestMethod.GET)
312
     public void exportCustomerExcel(@RequestParam(value = "personName" ,required = false)String personName,
312
     public void exportCustomerExcel(@RequestParam(value = "personName" ,required = false)String personName,
313
-                                    @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date startTime,
314
-                                    @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Date endTime,
313
+                                    @RequestParam(value = "startTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
314
+                                    @RequestParam(value = "endTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
315
                                     @RequestParam(value = "customerType" ,required = false)String customerType,
315
                                     @RequestParam(value = "customerType" ,required = false)String customerType,
316
                                     @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
316
                                     @RequestParam(value = "customerSource" ,required = false)Integer customerSource,
317
                                     @RequestParam(value = "receiver" ,required = false)String receiver,
317
                                     @RequestParam(value = "receiver" ,required = false)String receiver,