瀏覽代碼

* bug 修改

顾绍勇 4 年之前
父節點
當前提交
25a59cdeb2

+ 5
- 4
src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketController.java 查看文件

19
 import javax.servlet.http.HttpServletRequest;
19
 import javax.servlet.http.HttpServletRequest;
20
 import javax.servlet.http.HttpServletResponse;
20
 import javax.servlet.http.HttpServletResponse;
21
 import java.time.LocalDate;
21
 import java.time.LocalDate;
22
+import java.time.LocalDateTime;
22
 import java.util.HashMap;
23
 import java.util.HashMap;
23
 import java.util.Map;
24
 import java.util.Map;
24
 
25
 
261
     @RequestMapping(value = "/admin/redPacket/listVisitRecordByCondition", method = RequestMethod.GET)
262
     @RequestMapping(value = "/admin/redPacket/listVisitRecordByCondition", method = RequestMethod.GET)
262
     public ResponseBean listVisitRecordByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
263
     public ResponseBean listVisitRecordByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
263
                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
264
                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
264
-                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
265
-                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
265
+                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
266
+                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
266
                                                    String drainageId,
267
                                                    String drainageId,
267
                                                    String phone,
268
                                                    String phone,
268
                                                    String sharePersonPhone,
269
                                                    String sharePersonPhone,
289
      * @return
290
      * @return
290
      */
291
      */
291
     @RequestMapping(value = "/admin/redPacket/exportVisitRecordByCondition", method = RequestMethod.GET)
292
     @RequestMapping(value = "/admin/redPacket/exportVisitRecordByCondition", method = RequestMethod.GET)
292
-    public void exportVisitRecordByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
293
-                                             @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
293
+    public void exportVisitRecordByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
294
+                                             @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
294
                                              String drainageId,
295
                                              String drainageId,
295
                                              String phone,
296
                                              String phone,
296
                                              String sharePersonPhone,
297
                                              String sharePersonPhone,

+ 4
- 4
src/main/java/com/huiju/estateagents/redpack/mapper/TaRedPacketMapper.java 查看文件

91
      * @return
91
      * @return
92
      */
92
      */
93
     IPage<TaCustomerFrom> listVisitRecordByCondition(IPage<TaCustomerFrom> page,
93
     IPage<TaCustomerFrom> listVisitRecordByCondition(IPage<TaCustomerFrom> page,
94
-                                                     @Param("startTime") LocalDate startTime,
95
-                                                     @Param("endTime") LocalDate endTime,
94
+                                                     @Param("startTime") LocalDateTime startTime,
95
+                                                     @Param("endTime") LocalDateTime endTime,
96
                                                      @Param("drainageId") String drainageId,
96
                                                      @Param("drainageId") String drainageId,
97
                                                      @Param("phone") String phone,
97
                                                      @Param("phone") String phone,
98
                                                      @Param("sharePersonPhone") String sharePersonPhone,
98
                                                      @Param("sharePersonPhone") String sharePersonPhone,
108
      * @param orgId
108
      * @param orgId
109
      * @return
109
      * @return
110
      */
110
      */
111
-    List<RedPacketVisitRecordtExport> exportVisitRecordByCondition(@Param("startTime") LocalDate startTime,
112
-                                                                   @Param("endTime") LocalDate endTime,
111
+    List<RedPacketVisitRecordtExport> exportVisitRecordByCondition(@Param("startTime") LocalDateTime startTime,
112
+                                                                   @Param("endTime") LocalDateTime endTime,
113
                                                                    @Param("drainageId") String drainageId,
113
                                                                    @Param("drainageId") String drainageId,
114
                                                                    @Param("phone") String phone,
114
                                                                    @Param("phone") String phone,
115
                                                                    @Param("sharePersonPhone") String sharePersonPhone,
115
                                                                    @Param("sharePersonPhone") String sharePersonPhone,

+ 3
- 2
src/main/java/com/huiju/estateagents/redpack/service/ITaRedPacketService.java 查看文件

7
 
7
 
8
 import javax.servlet.http.HttpServletResponse;
8
 import javax.servlet.http.HttpServletResponse;
9
 import java.time.LocalDate;
9
 import java.time.LocalDate;
10
+import java.time.LocalDateTime;
10
 
11
 
11
 /**
12
 /**
12
  * <p>
13
  * <p>
58
      * @param orgId
59
      * @param orgId
59
      * @return
60
      * @return
60
      */
61
      */
61
-    ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId);
62
+    ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId);
62
 
63
 
63
     /**
64
     /**
64
      * 导出客户访问记录
65
      * 导出客户访问记录
70
      * @param sharePersonPhone
71
      * @param sharePersonPhone
71
      * @param orgId
72
      * @param orgId
72
      */
73
      */
73
-    void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception;
74
+    void exportVisitRecordByCondition(LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception;
74
 
75
 
75
 
76
 
76
 }
77
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketServiceImpl.java 查看文件

120
     }
120
     }
121
 
121
 
122
     @Override
122
     @Override
123
-    public ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId) {
123
+    public ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId) {
124
         ResponseBean responseBean = new ResponseBean();
124
         ResponseBean responseBean = new ResponseBean();
125
         IPage<TaCustomerFrom> pg = new Page<>(pageNum, pageSize);
125
         IPage<TaCustomerFrom> pg = new Page<>(pageNum, pageSize);
126
         responseBean.addSuccess(taRedPacketMapper.listVisitRecordByCondition(pg, startTime, endTime, drainageId, phone, sharePersonPhone, orgId));
126
         responseBean.addSuccess(taRedPacketMapper.listVisitRecordByCondition(pg, startTime, endTime, drainageId, phone, sharePersonPhone, orgId));
128
     }
128
     }
129
 
129
 
130
     @Override
130
     @Override
131
-    public void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
131
+    public void exportVisitRecordByCondition(LocalDateTime startTime, LocalDateTime endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
132
         response.setContentType("application/octet-stream");
132
         response.setContentType("application/octet-stream");
133
         response.setCharacterEncoding("utf-8");
133
         response.setCharacterEncoding("utf-8");
134
         List<RedPacketVisitRecordtExport> records = taRedPacketMapper.exportVisitRecordByCondition(startTime, endTime, drainageId, phone, sharePersonPhone, orgId);
134
         List<RedPacketVisitRecordtExport> records = taRedPacketMapper.exportVisitRecordByCondition(startTime, endTime, drainageId, phone, sharePersonPhone, orgId);