getCustomerById

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
 import org.slf4j.Logger;
@@ -44,11 +45,31 @@ public class TaPointsExchangeController extends BaseController {
      */
     @RequestMapping(value="/admin/taPointsExchange",method= RequestMethod.GET)
     public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value ="personName",required = false) String personName,
+                                             @RequestParam(value ="phone",required = false) String phone,
+                                             @RequestParam(value ="personType",required = false) String personType,
+                                             @RequestParam(value ="targetName",required = false) String targetName,
+                                             @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                             @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                             @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
+                                             @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
+                                             @RequestParam(value ="status",required = false) Integer status,
+                                             @RequestParam(value ="tel",required = false) String tel){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             TaPointsExchange taPointsExchange = new TaPointsExchange();
+            taPointsExchange.setPersonName(personName);
+            taPointsExchange.setPhone(phone);
+            taPointsExchange.setPersonType(personType);
+            taPointsExchange.setTargetName(targetName);
+            taPointsExchange.setStartCreateDate(startCreateDate);
+            taPointsExchange.setEndCreateDate(endCreateDate);
+            taPointsExchange.setStartVerifyDate(startVerifyDate);
+            taPointsExchange.setEndVerifyDate(endVerifyDate);
+            taPointsExchange.setStatus(status);
+            taPointsExchange.setTel(tel);
             
             responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
 
@@ -59,6 +80,31 @@ public class TaPointsExchangeController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 修改对象
+     * @param taPointsExchange 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsExchange/change",method= RequestMethod.PUT)
+    public ResponseBean taPointsExchangeStatusChange(@RequestBody TaPointsExchange taPointsExchange){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (iTaPointsExchangeService.updateById(taPointsExchange)){
+                responseBean.addSuccess(taPointsExchange);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
     /**
      * 保存对象

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();
@@ -177,8 +177,8 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/wx/customer/recommend/get/{id}")
-    public ResponseBean getSingleCustomer(String customerId) {
+    @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
+    public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
@@ -189,8 +189,9 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/customer/recommend/{id}")
-    public ResponseBean getCustomerById(String customerId) {
+
+    @RequestMapping(value = "/admin/customer/recommend/getById/{id}", method = RequestMethod.GET)
+    public ResponseBean getRecommendCustomerById(@PathVariable(value = "id") String customerId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getCustomerById(customerId));
@@ -201,8 +202,9 @@ 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));
@@ -213,7 +215,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/entity/TaPointsExchange.java

@@ -120,4 +120,7 @@ public class TaPointsExchange implements Serializable {
     
     @TableField(exist = false)
     private String endVerifyDate;
+    
+    @TableField(exist = false)
+    private String tel;
 }

src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
 	
-	List<TaPointsExchange> selectListByParams(Page page, TaPointsExchange taPointsExchange);
+	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange);
 }

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -24,5 +24,36 @@
         FROM
             ta_points_exchange t
             LEFT JOIN ta_person p ON t.person_id = p.person_id
+        where 1=1
+        <if test="taPointsExchange.status != null and taPointsExchange.status != '' or taPointsExchange.status ==0">
+            and  t.`status` = #{taPointsExchange.status}
+        </if>
+        <if test="taPointsExchange.personName != null and taPointsExchange.personName != ''">
+            and  t.person_name like concat('%',#{taPointsExchange.personName},'%')
+        </if>
+        <if test="taPointsExchange.phone != null and taPointsExchange.phone != ''">
+            and  t.phone like concat('%',#{taPointsExchange.phone},'%')
+        </if>
+        <if test="taPointsExchange.tel != null and taPointsExchange.tel != ''">
+            and  t.phone = #{taPointsExchange.tel}
+        </if>
+        <if test="taPointsExchange.personType != null and taPointsExchange.personType != ''">
+            and  p.person_type = #{taPointsExchange.personType}
+        </if>
+        <if test="taPointsExchange.targetName != null and taPointsExchange.targetName != ''">
+            and  t.target_name like concat('%',#{taPointsExchange.targetName},'%')
+        </if>
+        <if test="taPointsExchange.startCreateDate != null and taPointsExchange.startCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="taPointsExchange.endCreateDate != null and taPointsExchange.endCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="taPointsExchange.startVerifyDate != null and taPointsExchange.startVerifyDate != ''">
+            and  date_format(t.verify_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+        </if>
+        <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
+            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+        </if>
     </select>
 </mapper>