|
@@ -33,8 +33,10 @@ import io.swagger.annotations.ApiImplicitParam;
|
33
|
33
|
import io.swagger.annotations.ApiImplicitParams;
|
34
|
34
|
import io.swagger.annotations.ApiOperation;
|
35
|
35
|
import org.apache.commons.collections.CollectionUtils;
|
|
36
|
+import org.apache.ibatis.annotations.Param;
|
36
|
37
|
import org.springframework.beans.factory.annotation.Autowired;
|
37
|
38
|
import org.springframework.context.ApplicationContext;
|
|
39
|
+import org.springframework.format.annotation.DateTimeFormat;
|
38
|
40
|
import org.springframework.web.bind.annotation.*;
|
39
|
41
|
|
40
|
42
|
import javax.annotation.Resource;
|
|
@@ -576,7 +578,7 @@ public class TaRecommendCustomerController extends BaseController {
|
576
|
578
|
public ResponseBean getCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId, HttpServletRequest request) {
|
577
|
579
|
Integer orgId = getOrgId(request);
|
578
|
580
|
try {
|
579
|
|
- return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, customerId, orgId, getTaPersonBuildingListByUserId(request)));
|
|
581
|
+ return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, customerId, orgId, getTaPersonBuildingListByUserId(request),null,null,null));
|
580
|
582
|
} catch (Exception e) {
|
581
|
583
|
e.printStackTrace();
|
582
|
584
|
return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
|
|
@@ -584,12 +586,16 @@ public class TaRecommendCustomerController extends BaseController {
|
584
|
586
|
}
|
585
|
587
|
|
586
|
588
|
@GetMapping("/wx/customer/recommend/mine")
|
587
|
|
- public ResponseBean getWxCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
|
|
589
|
+ public ResponseBean getWxCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize,
|
|
590
|
+ @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
|
|
591
|
+ @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
|
|
592
|
+ @RequestParam(value = "status", required = false) Integer status,
|
|
593
|
+ HttpServletRequest request) {
|
588
|
594
|
Integer orgId = getOrgId(request);
|
589
|
595
|
String personId = getPersonId(request);
|
590
|
596
|
TaPerson person = taPersonService.getById(personId);
|
591
|
597
|
try {
|
592
|
|
- return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, person.getPersonId(), orgId, null));
|
|
598
|
+ return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, person.getPersonId(), orgId, null,startDate,endDate,status));
|
593
|
599
|
} catch (Exception e) {
|
594
|
600
|
e.printStackTrace();
|
595
|
601
|
return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
|