From 0e504a7e2d5d7affa0f1ad96c340dbe21f480646 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 26 七月 2023 09:40:21 +0800
Subject: [PATCH] #甲方单位页面优化
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 89 insertions(+), 6 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 0f3ea78..f4ca4a2 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -7,10 +7,10 @@
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
-import com.zy.crm.common.model.enums.RoleType;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.Cstmr;
@@ -19,12 +19,15 @@
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.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.DicService;
import com.zy.crm.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
+import lombok.val;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
import org.apache.poi.ss.usermodel.Row;
@@ -37,8 +40,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.lang.reflect.Array;
import java.util.*;
@Slf4j
@@ -51,6 +54,8 @@
private CstmrTypeService cstmrTypeService;
@Autowired
private DicService dicService;
+ @Autowired
+ private DeptService deptService;
@RequestMapping(value = "/cstmr/{id}/auth")
@ManagerAuth
@@ -62,13 +67,28 @@
@ManagerAuth
public R page(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String conditionName,
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
@RequestParam(required = false, value = "user_id") Long userId){
- return R.ok(cstmrService.getPage(new Page<>(curr, limit)
+ if (!Cools.isEmpty(conditionName)){
+ switch (conditionName){
+ case "director":
+ try {
+ condition=userService.selectOne(new EntityWrapper<User>().eq("username", condition)).getId().toString();
+ }catch (Exception e){
+ conditionName = null;
+ }
+ break;
+ default:
+
+ }
+ }
+ return R.ok(cstmrService.getPage1(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
+ , conditionName
, condition)
);
}
@@ -109,11 +129,13 @@
@RequestMapping(value = "/cstmr/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ for (Long id : ids){
cstmrService.deleteById(id);
}
return R.ok();
}
+
+
@RequestMapping(value = "/cstmrQuery/auth")
@ManagerAuth
@@ -301,6 +323,25 @@
return R.ok("娣诲姞鎴愬姛");
}
+
+ @RequestMapping(value = "/cstmr/followers/add/json")
+ @ManagerAuth
+ @Transactional
+ public R cstmrFollowersAddJson(@RequestBody() Map map) {
+ long cstmrId = Long.valueOf(String.valueOf(map.get("cstmrId")));
+ long followerIds = Long.valueOf(String.valueOf(map.get("followerIds")));
+ if (Cools.isEmpty(cstmrId, followerIds)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ CstmrFoll cstmrFoll = new CstmrFoll();
+ cstmrFoll.setCstmrId(cstmrId);
+ cstmrFoll.setUserId(followerIds);
+ if (!cstmrFollService.insert(cstmrFoll)) {
+ throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
@RequestMapping(value = "/cstmr/followers/remove/auth")
@ManagerAuth
public R cstmrFollowersRemove(@RequestParam("cstmrId") Long cstmrId,
@@ -321,7 +362,7 @@
Role role = getRole(); assert role != null;
Page<Cstmr> page = cstmrService.getPage(new Page<>(1, 30)
, getHostId()
- , (role.getCode().equals(RoleType.boss.toString()) || role.getCode().equals(RoleType.manager.toString())) ? String.valueOf(user.getDeptId()) : null
+ , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
, condition);
List<KeyValueVo> vos = new ArrayList<>();
@@ -329,4 +370,46 @@
return R.ok().add(vos);
}
+ @RequestMapping("/cstmr/file/import")
+ @Transactional
+ public R fileImport() throws IOException {
+ File file = new File("D:\\tmp\\璺熻繘浜�.xls");
+ InputStream inStream = new FileInputStream(file);
+ int excelVersion = 2007;
+ Workbook book = null;
+ book = new HSSFWorkbook(inStream);
+ Sheet sheet = book.getSheetAt(0);
+ int totalRows = sheet.getLastRowNum() + 1; // 鎬�
+ DataFormatter dataFormatter = new DataFormatter();
+ for (int i = 1; i < totalRows; i++) {
+ System.out.println(i);
+ Row row = sheet.getRow(i);
+ // 瀹㈡埛浠ｅ彿
+ String username = dataFormatter.formatCellValue(row.getCell(0));
+ System.out.println(username);
+ if (username.equals("鐢樺叏") || username.equals("闄嗘檽涓�")
+ || username.equals("寮犲ぉ鏋�") || username.equals("闄堥箯") || username.equals("璧甸洩鐢�")
+ || username.equals("寮犱繆鑹�(绂昏亴)")
+ ) { continue;}
+ String cstmrUuid = dataFormatter.formatCellValue(row.getCell(2));
+ System.out.println(cstmrUuid);
+
+ User user = userService.selectOne(new EntityWrapper<User>().eq("nickname", username));
+ if (null == user) {
+ throw new CoolException(username + "閿欒");
+ }
+ Cstmr cstmr = cstmrService.selectByUuid(null, cstmrUuid);
+ if (null == cstmr) {
+ throw new CoolException(cstmrUuid + "閿欒");
+ }
+ CstmrFoll cstmrFoll = new CstmrFoll();
+ cstmrFoll.setCstmrId(cstmr.getId());
+ cstmrFoll.setUserId(user.getId());
+ if (!cstmrFollService.insert(cstmrFoll)) {
+ throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1