|
|
@@ -5,6 +5,7 @@ import java.util.List;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
@@ -23,6 +24,8 @@ import com.goafanti.user.service.UserServiceService;
|
|
|
public class UserServiceApiController extends BaseApiController {
|
|
|
@Resource
|
|
|
private UserServiceService userServiceService;
|
|
|
+ @Value(value = "${upload.path}")
|
|
|
+ private String uploadPath = null;
|
|
|
|
|
|
@RequestMapping(value = "/addUseService",method = RequestMethod.POST)
|
|
|
public Result addUseService(InputUserServiceFollow us) {
|
|
|
@@ -38,38 +41,37 @@ public class UserServiceApiController extends BaseApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/listUseServiceFollow",method = RequestMethod.GET)
|
|
|
public Result listUseServiceFollow(String uid) {
|
|
|
Result res =new Result();
|
|
|
if(uid==null) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "用户编号"));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
res.data(userServiceService.listUseServiceFollow(uid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
@RequestMapping(value = "/listOrderUseService",method = RequestMethod.GET)
|
|
|
public Result listOrderUseService(InputListOrderUserService i) {
|
|
|
Result res =new Result();
|
|
|
res.data(userServiceService.listOrderUseService(i));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**导出客服跟进列表
|
|
|
- *
|
|
|
+ *
|
|
|
* @param i
|
|
|
- * @param response
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/userServiceExport",method = RequestMethod.GET)
|
|
|
- public Result userServiceExport(InputListOrderUserService i,HttpServletResponse response) {
|
|
|
+ public Result userServiceExport(InputListOrderUserService i) {
|
|
|
List<OutOrderUserService> list=userServiceService.listOrderUseServiceGetList(i);
|
|
|
NewExcelUtil<OutOrderUserService>excel=new NewExcelUtil<>(OutOrderUserService.class);
|
|
|
- return excel.exportExcel(list,"客服订单跟进列表",response);
|
|
|
+ return excel.exportExcel(list,"客服订单跟进列表",uploadPath);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
}
|