Browse Source

修复 bug

魏熙美 5 years ago
parent
commit
8fcee328f2

+ 6
- 4
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java View File

19
 import org.slf4j.Logger;
19
 import org.slf4j.Logger;
20
 import org.slf4j.LoggerFactory;
20
 import org.slf4j.LoggerFactory;
21
 import org.springframework.beans.factory.annotation.Autowired;
21
 import org.springframework.beans.factory.annotation.Autowired;
22
+import org.springframework.format.annotation.DateTimeFormat;
22
 import org.springframework.web.bind.annotation.PathVariable;
23
 import org.springframework.web.bind.annotation.PathVariable;
23
 import org.springframework.web.bind.annotation.RequestBody;
24
 import org.springframework.web.bind.annotation.RequestBody;
24
 import org.springframework.web.bind.annotation.RequestMapping;
25
 import org.springframework.web.bind.annotation.RequestMapping;
30
 import javax.servlet.http.HttpServletRequest;
31
 import javax.servlet.http.HttpServletRequest;
31
 import javax.servlet.http.HttpServletResponse;
32
 import javax.servlet.http.HttpServletResponse;
32
 import java.io.IOException;
33
 import java.io.IOException;
34
+import java.time.LocalDateTime;
33
 import java.time.format.DateTimeFormatter;
35
 import java.time.format.DateTimeFormatter;
34
 import java.util.ArrayList;
36
 import java.util.ArrayList;
35
 import java.util.Arrays;
37
 import java.util.Arrays;
94
      */
96
      */
95
     @RequestMapping(value="/admin/taDrainageRecord/export",method= RequestMethod.GET)
97
     @RequestMapping(value="/admin/taDrainageRecord/export",method= RequestMethod.GET)
96
     public void taDrainageRecordList(@RequestParam(value = "drainageId") Integer drainageId,
98
     public void taDrainageRecordList(@RequestParam(value = "drainageId") Integer drainageId,
97
-                                             @RequestParam(value = "startTime",required = false) String startTime,
98
-                                             @RequestParam(value = "endTime",required = false) String endTime,
99
+                                             @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
100
+                                             @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
99
                                              HttpServletRequest request, HttpServletResponse response) throws IOException {
101
                                              HttpServletRequest request, HttpServletResponse response) throws IOException {
100
             //使用分页插件
102
             //使用分页插件
101
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
103
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
102
             queryWrapper.eq("drainage_id",drainageId);
104
             queryWrapper.eq("drainage_id",drainageId);
103
             queryWrapper.eq("org_id",getOrgId(request));
105
             queryWrapper.eq("org_id",getOrgId(request));
104
-            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
105
-            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
106
+            queryWrapper.gt(null != startTime,"create_date",startTime);
107
+            queryWrapper.lt(null != endTime,"create_date",endTime);
106
             queryWrapper.orderByDesc("create_date");
108
             queryWrapper.orderByDesc("create_date");
107
     
109
     
108
             List<TaDrainageRecord> list = iTaDrainageRecordService.list(queryWrapper);
110
             List<TaDrainageRecord> list = iTaDrainageRecordService.list(queryWrapper);