From bf2fbd9f3e90dd2ef508c5944ae63491397b42ae Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 10:35:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 1d09de6..5b2bebd 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -43,6 +43,8 @@
private PriOnline2Service priOnline2Service;
@Autowired
private PriQuoteService priQuoteService;
+ @Autowired
+ private FollowUpService followUpService;
@RequestMapping(value = "/order/{id}/auth")
@ManagerAuth
@@ -62,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 ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , userId
+ , director
, condition
, status)
);
@@ -110,7 +125,25 @@
}
Date now = new Date();
+ if (order.getStatus()!=0){
+ if (Cools.isEmpty(order.getMemoExperience())){
+ return R.error("璇疯緭鍏ュ績寰椾綋浼�");
+ }else {
+ FollowUp followUp = new FollowUp();
+ followUp.setWorkMsg(order.getMemoExperience());
+ followUp.setOrderId(order.getId());
+ followUp.setUserId(getUserId());
+ followUp.setCreateBy(getUserId());
+ followUp.setUpdateBy(getUserId());
+ followUp.setDirector(getUserId());
+ followUp.setDeptId(getDeptId());
+ followUp.setCreateTime(now);
+ followUp.setUpdateTime(now);
+ followUpService.insert(followUp);
+ }
+ }
+ order.setMemoExperience(null);
order.setUpdateBy(getUserId());
order.setUpdateTime(now);
Order orderOld = orderService.selectById(order.getId());
@@ -334,6 +367,7 @@
, getHostId()
, role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
+ , null
, condition
, 0);
List<KeyValueVo> vos = new ArrayList<>();
--
Gitblit v1.9.1