From 7c8b81425bae4907c82a456bf6433d9438039708 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 14:49:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 3020843..1209c35 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -52,17 +52,23 @@
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
- @RequestParam(required = false, value = "user_id") Long userId){
+ @RequestParam(required = false, value = "user_id") Long userId,
+ @RequestParam Map<String, Object> param){
+ Integer status = null;
+ if (param.get("status") != null) {
+ status = Integer.parseInt(param.get("status").toString());
+ }
return R.ok(orderService.getPage(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
- , condition)
+ , condition
+ , status)
);
}
@RequestMapping(value = "/order/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞璺熻釜椤圭洰")
public R add(Order order) {
Long hostId = getHostId();
if (orderService.selectByUuid(hostId, order.getUuid()) != null) {
@@ -77,7 +83,7 @@
order.setCreateTime(new Date());
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
- order.setStatus(1);
+ order.setStatus(0);
order.setStep(1);
orderService.insert(order);
@@ -85,7 +91,7 @@
}
@RequestMapping(value = "/order/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊璺熻釜椤圭洰")
public R update(Order order){
if (Cools.isEmpty(order) || null==order.getId()){
return R.error();
@@ -97,7 +103,7 @@
}
@RequestMapping(value = "/order/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎璺熻釜椤圭洰")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
orderService.deleteById(id);
@@ -165,7 +171,8 @@
, getHostId()
, role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
- , condition);
+ , condition
+ , null);
List<KeyValueVo> vos = new ArrayList<>();
page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
return R.ok().add(vos);
--
Gitblit v1.9.1