From 1a06f9fd2091d0aadf0ea5a624dfca7f7b3b2102 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 09:36:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index dd2ba66..d14761f 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -11,12 +11,17 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
+import com.zy.crm.manager.controller.result.CstmrFollowerTableVo;
import com.zy.crm.manager.entity.Cstmr;
+import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
+import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
import com.zy.crm.system.entity.Dic;
+import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DicService;
+import com.zy.crm.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -25,7 +30,6 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -181,7 +185,7 @@
*/
@PostMapping(value = "/cstmr/excel/import/auth")
@ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
- @Transactional
+// @Transactional
public R cstmrExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
String fileMime = file.getContentType();
@@ -210,7 +214,8 @@
String uuid = dataFormatter.formatCellValue(row.getCell(0));
if (!Cools.isEmpty(uuid)) {
if (cstmrService.selectByUuid(hostId, uuid) != null) {
- throw new CoolException(uuid + "瀹㈡埛浠ｅ彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+// throw new CoolException(uuid + "瀹㈡埛浠ｅ彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+ continue;
} else {
cstmr.setUuid(uuid);
}
@@ -290,4 +295,27 @@
}
+ /******************************** 璺熻繘浜� ***************************************/
+
+ @Autowired
+ private CstmrFollService cstmrFollService;
+ @Autowired
+ private UserService userService;
+
+ @RequestMapping(value = "/cstmr/followers/table/auth")
+ @ManagerAuth
+ public R get(@RequestParam("cstmrId") Long cstmrId) {
+ List<CstmrFoll> cstmrFolls = cstmrFollService.selectList(new EntityWrapper<CstmrFoll>().eq("cstmr_id", cstmrId));
+ List<CstmrFollowerTableVo> result = new ArrayList<>();
+ for (CstmrFoll cstmrFoll : cstmrFolls) {
+ User user = userService.selectById(cstmrFoll.getUserId());
+ CstmrFollowerTableVo vo = new CstmrFollowerTableVo();
+ vo.setUserId(user.getId());
+ vo.setUserName(user.getNickname());
+ result.add(vo);
+ }
+ return R.ok().add(result);
+ }
+
+
}
--
Gitblit v1.9.1