Parcourir la source

开发客服跟进列表

anderx il y a 4 ans
Parent
commit
a1adb1ff5b

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml

@@ -469,7 +469,7 @@
 		</if>
 		</if>
 		order by  a.create_time desc
-		<if test="${page_sql}!=null">
+		<if test="page_sql != null">
 			${page_sql}
 		</if>
 	</select>

+ 107 - 0
src/main/java/com/goafanti/user/bo/outUserFollowList.java

@@ -1,5 +1,112 @@
 package com.goafanti.user.bo;
 
 public class outUserFollowList {
+    private String nickname;
+    private String shareType;
+    private String channel;
+    private String id;
+    private String startTimes;
+    private String contact_type;
+    private String followName;
+    private String followDep;
+    private String result;
+    private String followCount;
+    private String guidance;
+    private String guidanceTimes;
 
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getShareType() {
+        return shareType;
+    }
+
+    public void setShareType(String shareType) {
+        this.shareType = shareType;
+    }
+
+    public String getChannel() {
+        return channel;
+    }
+
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getStartTimes() {
+        return startTimes;
+    }
+
+    public void setStartTimes(String startTimes) {
+        this.startTimes = startTimes;
+    }
+
+    public String getContact_type() {
+        return contact_type;
+    }
+
+    public void setContact_type(String contact_type) {
+        this.contact_type = contact_type;
+    }
+
+    public String getFollowName() {
+        return followName;
+    }
+
+    public void setFollowName(String followName) {
+        this.followName = followName;
+    }
+
+    public String getFollowDep() {
+        return followDep;
+    }
+
+    public void setFollowDep(String followDep) {
+        this.followDep = followDep;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public String getFollowCount() {
+        return followCount;
+    }
+
+    public void setFollowCount(String followCount) {
+        this.followCount = followCount;
+    }
+
+    public String getGuidance() {
+        return guidance;
+    }
+
+    public void setGuidance(String guidance) {
+        this.guidance = guidance;
+    }
+
+    public String getGuidanceTimes() {
+        return guidanceTimes;
+    }
+
+    public void setGuidanceTimes(String guidanceTimes) {
+        this.guidanceTimes = guidanceTimes;
+    }
 }

+ 3 - 3
src/main/java/com/goafanti/user/controller/UserFollowController.java

@@ -1,6 +1,7 @@
 package com.goafanti.user.controller;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.user.bo.InputUserFollowList;
 import com.goafanti.user.service.UserFollowService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,14 +10,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping(value = "/api/admin/follow")
-public class UserFollowController {
+@RequestMapping(value = "/api/admin")
+public class UserFollowController extends BaseApiController {
     @Autowired
     private UserFollowService userFollowService;
 
     @RequestMapping(value = "/userFollowList", method = RequestMethod.GET)
     public Result  userFollowList(InputUserFollowList in){
-        System.out.println("11111");
         Result res =new Result();
         res.data(userFollowService.userFollowList(in));
         return res;

+ 0 - 7
src/main/java/com/goafanti/user/controller/UserServiceApiController.java

@@ -38,13 +38,6 @@ public class UserServiceApiController extends BaseApiController {
 		return res;
 	}
 
-	@RequestMapping(value = "/test",method = RequestMethod.POST)
-	public Result test(InputUserServiceFollow us) {
-		Result res =new Result();
-		System.out.println("11111111111");
-		return res;
-	}
-	
 	
 	@RequestMapping(value = "/listUseServiceFollow",method = RequestMethod.GET)
 	public Result listUseServiceFollow(String uid) {

+ 3 - 1
src/main/java/com/goafanti/user/service/UserFollowService.java

@@ -1,7 +1,9 @@
 package com.goafanti.user.service;
 
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.InputUserFollowList;
+import com.goafanti.user.bo.outUserFollowList;
 
 public interface UserFollowService {
-     Object userFollowList(InputUserFollowList in);
+     Pagination<outUserFollowList> userFollowList(InputUserFollowList in);
 }

+ 4 - 2
src/main/java/com/goafanti/user/service/impl/UserFollowServiceImpl.java

@@ -2,7 +2,9 @@ package com.goafanti.user.service.impl;
 
 import com.goafanti.common.dao.UserFollowMapper;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.InputUserFollowList;
+import com.goafanti.user.bo.outUserFollowList;
 import com.goafanti.user.service.UserFollowService;
 import org.springframework.stereotype.Service;
 import org.terracotta.offheapstore.HashingMap;
@@ -13,7 +15,7 @@ import java.util.Map;
 @Service
 public class UserFollowServiceImpl extends BaseMybatisDao<UserFollowMapper>  implements UserFollowService {
     @Override
-    public Object userFollowList(InputUserFollowList in) {
+    public Pagination<outUserFollowList> userFollowList(InputUserFollowList in) {
         Map<String,Object>map=new HashMap<>();
         if (in.getUserName()!=null)map.put("userName",in.getUserName());
         if (in.getContactType()!=null)map.put("contactType",in.getContactType());
@@ -21,6 +23,6 @@ public class UserFollowServiceImpl extends BaseMybatisDao<UserFollowMapper>  imp
         if (in.getUserType()!=null)map.put("userType",in.getUserType());
         if (in.getStartTime()!=null)map.put("startTime",in.getStartTime());
         if (in.getEndTime()!=null)map.put("endTime",in.getEndTime());
-        return findPage("userFollowList","userFollowCount",map,in.getPageNo(), in.getPageSize());
+        return (Pagination<outUserFollowList>) findPage("userFollowList","userFollowCount",map,in.getPageNo(), in.getPageSize());
     }
 }