傅行帆 3 years ago
parent
commit
2fb713d7e6

+ 2
- 0
src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java View File

183
                                                    @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
183
                                                    @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
184
                                                    @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
184
                                                    @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
185
                                                    @RequestParam(value = "status", required = false) Integer status,
185
                                                    @RequestParam(value = "status", required = false) Integer status,
186
+                                                   @RequestParam(value = "name", required = false) String name,
186
                                                    HttpServletRequest request) {
187
                                                    HttpServletRequest request) {
187
         Integer orgId = getOrgId(request);
188
         Integer orgId = getOrgId(request);
188
         String personId = getPersonId(request);
189
         String personId = getPersonId(request);
194
             recommendCustomerDTO.setOrgId(orgId);
195
             recommendCustomerDTO.setOrgId(orgId);
195
             recommendCustomerDTO.setPersonId(personId);
196
             recommendCustomerDTO.setPersonId(personId);
196
             recommendCustomerDTO.setStatus(status);
197
             recommendCustomerDTO.setStatus(status);
198
+            recommendCustomerDTO.setName(name);
197
             return iChannelCustomerService.getCustomersIRecommended(pageNumber, pageSize, recommendCustomerDTO);
199
             return iChannelCustomerService.getCustomersIRecommended(pageNumber, pageSize, recommendCustomerDTO);
198
         } catch (Exception e) {
200
         } catch (Exception e) {
199
             e.printStackTrace();
201
             e.printStackTrace();

+ 2
- 0
src/main/java/com/yunzhi/marketing/xlk/dto/RecommendCustomerDTO.java View File

16
     private LocalDateTime endDate;
16
     private LocalDateTime endDate;
17
 
17
 
18
     private Integer status;
18
     private Integer status;
19
+
20
+    private String name;
19
 }
21
 }

+ 5
- 2
src/main/resources/mapper/xlk/ChannelCustomerMapper.xml View File

84
         <if test="params.status != null and params.status !=''">
84
         <if test="params.status != null and params.status !=''">
85
             and c.status = #{params.status}
85
             and c.status = #{params.status}
86
         </if>
86
         </if>
87
+        <if test="params.name != null and params.name !=''">
88
+            and a.name like CONCAT('%',#{params.name}, '%')
89
+        </if>
87
         <if test="params.startDate != null and params.startDate != null">
90
         <if test="params.startDate != null and params.startDate != null">
88
-            AND t.create_date >= #{params.startDate}
91
+            AND a.create_date >= #{params.startDate}
89
         </if>
92
         </if>
90
         <if test="params.endDate != null and params.endDate != null">
93
         <if test="params.endDate != null and params.endDate != null">
91
-            AND (t.visit_date &lt;= #{params.endDate} or t.preparatory_date &lt;= #{params.endDate} or t.signed_date &lt;= #{params.endDate} or t.commission_date &lt;= #{params.endDate})
94
+            AND (a.visit_date &lt;= #{params.endDate} or a.preparatory_date &lt;= #{params.endDate} or a.signed_date &lt;= #{params.endDate} or a.commission_date &lt;= #{params.endDate})
92
         </if>
95
         </if>
93
         ORDER BY
96
         ORDER BY
94
         a.create_date desc
97
         a.create_date desc