From 8b109f923dc7c2d5c5bd351a03a5277670962aac Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 04 十二月 2023 13:05:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 87 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index 184c8c7..0f17ce7 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -64,10 +64,23 @@
if (param.get("status") != null) {
status = Integer.parseInt(param.get("status").toString());
}
+
+ Long director = null;
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ director = getUserId();
+ }
+
return R.ok(orderService.getPage(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , deptId == null ? null : String.valueOf(deptId)
, userId
+ , director
, condition
, status)
);
@@ -128,6 +141,10 @@
followUp.setUpdateTime(now);
followUpService.insert(followUp);
}
+ }else {
+ if (Cools.isEmpty(order.getMemoExperience())) {
+ order.setMemoExperience(null);
+ }
}
order.setMemoExperience(null);
@@ -152,6 +169,12 @@
}
public void updateDirector(Long orderId, User user , Date now){
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), user.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = user;
+ }
try{
List<Plan> plans = planService.selectList(new EntityWrapper<Plan>().eq("order_id", orderId));
for (Plan plan:plans){
@@ -176,18 +199,17 @@
List<SettleDto> priQuoteDtos = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
List<SettleDto> priQuoteDtoList = new ArrayList<>();
for (SettleDto dto : priQuoteDtos) {
- switch (dto.getStep()) {
- case 1:
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�"+priQuote.getUserId$());
- dto.setUserId(priQuote.getUserId());
- dto.setUsername(priQuote.getUserId$());
- break;
- case 4:
- dto.setUserId(priQuote.getUserId());
- dto.setUsername(priQuote.getUserId$());
- break;
- default:
- break;
+ if (priQuoteDtos.indexOf(dto) == 0) {
+ dto.setMsg(dto.getMsg() + " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� " + DateUtils.convert(now) + " 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�" + priQuote.getUserId$());
+ dto.setUserId(priQuote.getUserId());
+ dto.setUsername(priQuote.getUserId$());
+ } else if (dto.getStep() == 2) {
+ dto.setMsg(dto.getMsg() + " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� " + DateUtils.convert(now) + " 璺熻釜椤圭洰淇敼璐熻矗浜烘椂鍚屾淇敼璐熻矗浜虹粡鐞嗕负锛�" + manager.getNickname());
+ dto.setUserId(manager.getId());
+ dto.setUsername(manager.getNickname());
+ } else if (dto.getStep() == 4) {
+ dto.setUserId(priQuote.getUserId());
+ dto.setUsername(priQuote.getUserId$());
}
priQuoteDtoList.add(dto);
}
@@ -211,16 +233,11 @@
List<SettleDto> priOnline2Dtos = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
List<SettleDto> priOnline2DtoList = new ArrayList<>();
for (SettleDto dto : priOnline2Dtos) {
- switch (dto.getStep()) {
- case 0:
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�"+priOnline2.getUser$());
- break;
- case 2:
- dto.setUserId(priOnline2.getUserId());
- dto.setUsername(priOnline2.getUser$());
- break;
- default:
- break;
+ if (priOnline2Dtos.indexOf(dto) == 0) {
+ dto.setMsg(dto.getMsg() + " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� " + DateUtils.convert(now) + " 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�" + priOnline2.getUser$());
+ } else if (priOnline2Dtos.indexOf(dto) == priOnline2Dtos.size()-1) {
+ dto.setUserId(priOnline2.getUserId());
+ dto.setUsername(priOnline2.getUser$());
}
priOnline2DtoList.add(dto);
}
@@ -246,18 +263,13 @@
List<SettleDto> planDtos = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
List<SettleDto> planDtoList = new ArrayList<>();
for (SettleDto dto : planDtos) {
- switch (dto.getStep()) {
- case 1:
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�"+plan.getUserId$());
- dto.setUserId(plan.getUserId());
- dto.setUsername(plan.getUserId$());
- break;
- case 4:
- dto.setUserId(plan.getUserId());
- dto.setUsername(plan.getUserId$());
- break;
- default:
- break;
+ if (planDtos.indexOf(dto) == 0) {
+ dto.setMsg(dto.getMsg() + " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� " + DateUtils.convert(now) + " 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�" + plan.getUserId$());
+ dto.setUserId(plan.getUserId());
+ dto.setUsername(plan.getUserId$());
+ } else if (dto.getStep().equals(plan.getSettleSize())) {
+ dto.setUserId(plan.getUserId());
+ dto.setUsername(plan.getUserId$());
}
planDtoList.add(dto);
}
@@ -317,7 +329,7 @@
wrapper.like("name", condition);
Long id = getRole().getId();
if (id.equals(1L)) {
- wrapper.eq("host_id", 1);
+ wrapper.eq("host_id", getHostId());
} else if (id.equals(2L)) {
wrapper.eq("dept_id", getDeptId());
} else {
@@ -354,6 +366,7 @@
, getHostId()
, role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
+ , null
, condition
, 0);
List<KeyValueVo> vos = new ArrayList<>();
@@ -367,7 +380,7 @@
* excel瀵煎叆
*/
@PostMapping(value = "/order/excel/import/auth")
- @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
+ @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆")
// @Transactional
public R orderExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
--
Gitblit v1.9.1