From 74f10367c4bb507d086cbdc7fd11528582addfb9 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 11 Jan 2021 13:23:48 +0800
Subject: [PATCH] 修改跟进bug
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
index c059963..c1ee69a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
@@ -1,28 +1,17 @@
package com.matrix.system.app.action;
import com.matrix.core.constance.MatrixConstance;
-import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.*;
-import com.matrix.system.app.vo.OrderDetailVo;
-import com.matrix.system.app.vo.ShoppingGoodsDetailVo;
-import com.matrix.system.app.vo.ShoppingGoodsListVo;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.SysFollowupCommentDao;
import com.matrix.system.hive.dao.SysFollowupDao;
import com.matrix.system.hive.dao.SysVipAlbumDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.pojo.ShoppingCarItem;
-import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
-import com.matrix.system.hive.service.ShoppingGoodsCategoryService;
-import com.matrix.system.hive.service.ShoppingGoodsService;
-import com.matrix.system.hive.service.SysOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -135,13 +124,13 @@
@ApiResponse(code = 200, message = "ok", response = SysFollowup.class)
})
@PostMapping(value = "/findFollowup")
- public AjaxResult findFollowup(@RequestBody @Validated FollowupCommonetListDto followupCommonetListDto) {
+ public AjaxResult findFollowup(@RequestBody @Validated FollowupListDto followupListDto) {
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- followupCommonetListDto.setShopId(user.getShopId());
- followupCommonetListDto.setCompanyId(user.getCompanyId());
- followupCommonetListDto.setSelfStaff(user.getSuId());
+ followupListDto.setShopId(user.getShopId());
+ followupListDto.setCompanyId(user.getCompanyId());
+ followupListDto.setSelfStaff(user.getSuId());
//TODO 需要设置跨店数据权限
- List<SysFollowup> rows= followupDao.selectByAppDto(followupCommonetListDto);
+ List<SysFollowup> rows= followupDao.selectByAppDto(followupListDto);
return AjaxResult.buildSuccessInstance(rows,"查询成功");
}
--
Gitblit v1.9.1