提交

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -105,12 +105,12 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    @PostMapping("/customer/recommend")
-    public ResponseBean getCustomerList (@RequestParam(value ="name",defaultValue = "false") String name,
-                                         @RequestParam(value ="tel",defaultValue = "false") String tel,
-                                         @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
-                                         @RequestParam(value ="consultName",defaultValue = "false") String consultName,
-                                         @RequestParam(value ="consultTel",defaultValue = "false") String consultTel,
+    @GetMapping("/admin/customer/recommend")
+    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
@@ -121,8 +121,8 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    @PostMapping("/customer/recommend/{customerId}")
-    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,String customerId){
+    @GetMapping("/admin/customer/recommend/{customerId}")
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){
         String buildingId="";
         try{
             return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
@@ -159,7 +159,7 @@ public class TaRecommendCustomerController extends BaseController {
      * @param taRecommendCustomer 实体对象
      * @return
      */
-    @RequestMapping(value="/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/customer/recommend/edit/{id}",method= RequestMethod.PUT)
     public ResponseBean taRecommendCustomerUpdate(@PathVariable String id,
             @RequestBody TaRecommendCustomer taRecommendCustomer){
         ResponseBean responseBean = new ResponseBean();
@@ -189,8 +189,8 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/customer/recommend/get/{id}")
-    public ResponseBean getCutomerDetail(String id) {
+    @GetMapping(value = "/admin/customer/recommend/get/{id}")
+    public ResponseBean getCutomerDetail(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
@@ -201,7 +201,7 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @PostMapping("/customer/recommend/drift")
+    @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (@RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -248,20 +248,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Override
     public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel){
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-        if(building.equals("") && null != building){
-            queryWrapper.eq("building_id",building);
-        }
-        if(name.equals("") && null != name){
-            queryWrapper.like("name",name);
-        }
-        if(tel.equals("") && null != tel){
-            queryWrapper.eq("phone",tel);
-        }
-        if(consultName.equals("") && null != consultName){
+        queryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(building),"building_id",building);
+        queryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(name), "name",name);
+        queryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(tel),"phone",tel);
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(consultName)){
             List<String> consultIds = taPersonMapper.getConsultantByName(consultName);
             queryWrapper.in("realty_consultant",consultIds);
         }
-        if(consultTel.equals("") && null != consultTel){
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(consultTel)){
             String consultId = taPersonMapper.getConsultantByTel(consultTel);
             queryWrapper.eq("realty_consultant",consultId);
         }