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 | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 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 6c6865a..1209c35 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -8,6 +8,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
@@ -15,6 +16,7 @@
import com.zy.crm.manager.entity.OrderFoll;
import com.zy.crm.manager.service.OrderFollService;
import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -50,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) {
@@ -75,14 +83,15 @@
order.setCreateTime(new Date());
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
- order.setStatus(1);
+ order.setStatus(0);
+ order.setStep(1);
orderService.insert(order);
return R.ok();
}
@RequestMapping(value = "/order/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊璺熻釜椤圭洰")
public R update(Order order){
if (Cools.isEmpty(order) || null==order.getId()){
return R.error();
@@ -94,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);
@@ -118,6 +127,31 @@
return R.ok(result);
}
+ @RequestMapping(value = "/orderQueryName/auth")
+ @ManagerAuth
+ public R queryName(String condition) {
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ wrapper.like("name", condition);
+ Long id = getRole().getId();
+ if (id.equals(1L)) {
+ wrapper.eq("host_id", 1);
+ } else if (id.equals(2L)) {
+ wrapper.eq("dept_id", getDeptId());
+ } else {
+ wrapper.eq("user_id", getUserId());
+ }
+
+ Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Order order : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", order.getId());
+ map.put("value", order.getName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
@RequestMapping(value = "/order/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
@@ -128,6 +162,22 @@
return R.ok();
}
+ @RequestMapping("/order/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ User user = getUser(); assert user != null;
+ Role role = getRole(); assert role != null;
+ Page<Order> page = orderService.getPage(new Page<>(1, 30)
+ , getHostId()
+ , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
+ , user.getId()
+ , 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