From 779be6c8e18bb3ac34ea7fa7b7fafc854570cffe Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 07 十月 2023 15:11:14 +0800
Subject: [PATCH] #出差相关
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 d8eebb7..006bf7f 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -150,7 +150,8 @@
priOnline2.setUserId(user.getId());
priOnline2.setDeptId(user.getDeptId());
priOnline2.setHostId(user.getHostId());
-
+ priOnline2.setUpdateUserId(getUserId());
+ priOnline2.setUpdateTime(now);
// List<SettleDto> priOnline2Dtos = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
// List<SettleDto> priOnline2DtoList = new ArrayList<>();
// for (SettleDto dto : priOnline2Dtos) {
@@ -176,13 +177,15 @@
plan.setUserId(user.getId());
plan.setDeptId(user.getDeptId());
plan.setHostId(user.getHostId());
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(now);
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.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�"+plan.getUserId$());
dto.setUserId(plan.getUserId());
dto.setUsername(plan.getUserId$());
break;
@@ -218,6 +221,15 @@
return R.ok();
}
+ @PostMapping(value = "/order/business/list/auth")
+ @ManagerAuth
+ public R orderBusiness(@RequestParam Long orderId){
+ List<KeyValueVo> vos = new ArrayList<>();
+ vos.add(new KeyValueVo("鍑哄樊鐢宠", 1L));
+ vos.add(new KeyValueVo("鍏跺畠鍑哄樊", 2L));
+ return R.ok().add(vos);
+ }
+
@RequestMapping(value = "/orderQuery/auth")
@ManagerAuth
public R query(String condition) {
--
Gitblit v1.9.1