Explorar o código

开发客服跟进列表

anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
20567180e5

+ 8 - 12
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -678,7 +678,7 @@ public class AdminCustomerApiController extends BaseApiController{
 	 * @param startDate 开始日期
 	 * @param endDate 结束日期
 	 * @param timeSpan 时间差
-	 * @param depId 部门编号
+	 * @param depNo 部门编号
 	 * @param pageNo 页码
 	 * @param pageSize 页数
 	 * @return
@@ -715,10 +715,10 @@ public class AdminCustomerApiController extends BaseApiController{
 	 * @param startDate 开始日期
 	 * @param endDate 结束日期
 	 * @param timeSpan 时间差
-	 * @param depId 部门编号
+	 * @param depNo 部门编号
 	 * @param businessGlossoryId 业务编号
 	 * @param pageNo 页码
-	 * @param pageSiz 页数
+	 * @param pageSize 页数
 	 * @return
 	 * @throws ParseException 
 	 */
@@ -753,10 +753,9 @@ public class AdminCustomerApiController extends BaseApiController{
 	 * @param startDate 开始日期
 	 * @param endDate 结束日期
 	 * @param timeSpan 时间差
-	 * @param depId 部门编号
-	 * @param businessGlossoryId 业务编号
+	 * @param depNo 部门编号
 	 * @param pageNo 页码
-	 * @param pageSiz 页数
+	 * @param pageSize 页数
 	 * @return
 	 * @throws ParseException
 	 */
@@ -1250,8 +1249,6 @@ public class AdminCustomerApiController extends BaseApiController{
 	 * @param depId
 	 * @param startTime
 	 * @param endTime
-	 * @param pageSize
-	 * @param pageNo
 	 * @return
 	 */
 	@RequestMapping(value = "/selectAllUser", method = RequestMethod.GET)
@@ -1262,7 +1259,6 @@ public class AdminCustomerApiController extends BaseApiController{
 	}
 	/**
 	 * 查看客户日期内新增客户
-	 * @param depId
 	 * @param startTime
 	 * @param endTime
 	 * @param type
@@ -1364,8 +1360,8 @@ public class AdminCustomerApiController extends BaseApiController{
 		res.data(customerService.updateUserName(uid,userName));
 		return res;
 	}
-	
-	
+
+
 	/** 客户名称列表 **/
 	@RequestMapping(value = "/listUserName", method = RequestMethod.GET)
 	public Result listUserName(String uid){
@@ -1373,7 +1369,7 @@ public class AdminCustomerApiController extends BaseApiController{
 		if(StringUtils.isBlank(uid) || StringUtils.isBlank(uid)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"uid","uid"));
 			return res;
-		} 
+		}
 		res.data(customerService.listUserName(uid));
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -362,7 +362,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 			        }
 			    	} catch (Exception e) {
 			    		e.printStackTrace();
-			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行"+cellNum+"列输入内容不正确。"));
+			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行"+(cellNum+1)+"列输入内容不正确。"));
 					}
 			    	if (cellNum==0&&trb.getPatentNo()!=null) {
 						Integer i=patentNewMapper.selectByPatenNo(trb.getPatentNo());

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

@@ -0,0 +1,18 @@
+package com.goafanti.user.controller;
+
+import com.goafanti.common.bo.Result;
+import org.springframework.web.bind.annotation.RequestMapping;
+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 = "userFollowList", method = RequestMethod.POST)
+    public Result  userFollowList(){
+        Result res =new Result();
+
+        return res;
+    }
+}