customer

src/main/java/com.huiju.welcome/controller/TaCustomerController.java

@@ -306,6 +306,7 @@ public class TaCustomerController extends BaseController {
         @RequestParam(defaultValue = "") String identity,
         @RequestParam(defaultValue = "", name = "nameOrPhone") String nameOrPhoneOrReceiver,
         @RequestParam(defaultValue = "" ) Integer consultant,
+        @RequestParam(defaultValue = "all" ) String customerType,
         HttpServletRequest request
     ){
         ResponseBean responseBean = new ResponseBean();
@@ -319,7 +320,7 @@ public class TaCustomerController extends BaseController {
                 consultantId = consultant;
             }
 
-            IPage<TaCustomer> result = iTaCustomerService.getCustomerListOfFront(pageNumber, pageSize, consultantId, nameOrPhoneOrReceiver, identity, consultantType);
+            IPage<TaCustomer> result = iTaCustomerService.getCustomerListOfFront(pageNumber, pageSize, consultantId, nameOrPhoneOrReceiver, identity, consultantType,customerType);
             List<TaCustomer> custs = result.getRecords();
 
             if (null != custs && custs.size() > 0) {

src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java

@@ -27,7 +27,7 @@ public interface TaCustomerMapper extends BaseMapper<TaCustomer> {
 
     List<TaCustomer> getSomeCustMayBe(@Param("plateNumber") String plateNumber, @Param("phone") String phone);
 
-    IPage<TaCustomer> getCustomerListOfFront(IPage<TaCustomer> page, @Param("consultantId") Integer consultantId, @Param("nameOrPhoneOrReceiver") String nameOrPhoneOrReceiver, @Param("customerType") String customerType, @Param("consultantType") Integer consultantType);
+    IPage<TaCustomer> getCustomerListOfFront(IPage<TaCustomer> page, @Param("consultantId") Integer consultantId, @Param("nameOrPhoneOrReceiver") String nameOrPhoneOrReceiver, @Param("identityParams") String identityParams, @Param("consultantType") Integer consultantType,@Param("customerType") String customerType);
     
     IPage<TaCustomer> getAttributionList(IPage<TaCustomer> page);
     

src/main/java/com.huiju.welcome/service/ITaCustomerService.java

@@ -49,7 +49,7 @@ public interface ITaCustomerService extends IService<TaCustomer> {
     List<CustomerExcel> getCustomersEqualCustomerPage(String customerName, String phone, String platNumber, Integer agentUserId);
 
 
-    IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver, String identity, Integer consultantType);
+    IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver, String identity, Integer consultantType,String customerType);
 	
 	IPage<TaCustomer> getAttributionList(int pageNumber, int pageSize);
     

src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java

@@ -548,12 +548,12 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     }
 
     @Override
-    public IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver, String identity, Integer consultantType) {
+    public IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver, String identity, Integer consultantType,String customerType) {
         IPage<TaCustomer> page = new Page<>(pageNumber, pageSize);
 
-        String customerType = StringUtils.isEmpty(identity) ? null : identity;
+        String identityParams = StringUtils.isEmpty(identity) ? null : identity;
 
-        return taCustomerMapper.getCustomerListOfFront(page, consultantId, nameOrPhoneOrReceiver, customerType, consultantType);
+        return taCustomerMapper.getCustomerListOfFront(page, consultantId, nameOrPhoneOrReceiver, identityParams, consultantType,customerType);
     }
 
     @Override

src/main/resources/mapper/TaCustomerMapper.xml

@@ -104,9 +104,12 @@
             <if test="nameOrPhoneOrReceiver !=null and nameOrPhoneOrReceiver != ''">
               AND ( t.customer_name LIKE CONCAT('%',#{nameOrPhoneOrReceiver},'%') OR t.phone LIKE CONCAT('%',#{nameOrPhoneOrReceiver},'%') OR t.receiver LIKE CONCAT('%',#{nameOrPhoneOrReceiver},'%'))
             </if>
-            <if test='null != customerType and customerType == "channel"'>
+            <if test='null != identityParams and identityParams == "channel"'>
                 AND IFNULL(t.customer_type, '') = 'channel'
             </if>
+            <if test='null != customerType and customerType != "all"'>
+                AND IFNULL(t.customer_type, '') = #{customerType}
+            </if>
             <if test="null != consultantType and consultantType == 1">
                 AND t.consultant_id is null
             </if>