From 13a34d2197b001799ef8f0f09e5b48af2add0926 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 15 四月 2024 09:25:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java b/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java
index 3ab49e5..214e76b 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java
@@ -1,18 +1,19 @@
 package com.zy.crm.manager.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.crm.manager.entity.CstmrType;
-import com.zy.crm.manager.service.CstmrTypeService;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
+import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.crm.common.web.BaseController;
+import com.zy.crm.manager.entity.CstmrGrade;
+import com.zy.crm.manager.entity.CstmrType;
+import com.zy.crm.manager.service.CstmrGradeService;
+import com.zy.crm.manager.service.CstmrTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,6 +42,7 @@
         EntityWrapper<CstmrType> wrapper = new EntityWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
+        hostEq(wrapper);
         allLike(CstmrType.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         return R.ok(cstmrTypeService.selectPage(new Page<>(curr, limit), wrapper));
@@ -60,24 +62,32 @@
     }
 
     @RequestMapping(value = "/cstmrType/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "娣诲姞瀹㈡埛绫诲埆")
     public R add(CstmrType cstmrType) {
+        cstmrType.setHostId(getHostId());
+        cstmrType.setCreateBy(getUserId());
+        cstmrType.setCreateTime(new Date());
+        cstmrType.setUpdateBy(getUserId());
+        cstmrType.setUpdateTime(new Date());
+        cstmrType.setStatus(1);
         cstmrTypeService.insert(cstmrType);
         return R.ok();
     }
 
 	@RequestMapping(value = "/cstmrType/update/auth")
-	@ManagerAuth
+	@ManagerAuth(memo = "鏇存柊瀹㈡埛绫诲埆")
     public R update(CstmrType cstmrType){
         if (Cools.isEmpty(cstmrType) || null==cstmrType.getId()){
             return R.error();
         }
+        cstmrType.setUpdateBy(getUserId());
+        cstmrType.setUpdateTime(new Date());
         cstmrTypeService.updateById(cstmrType);
         return R.ok();
     }
 
     @RequestMapping(value = "/cstmrType/delete/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鍒犻櫎瀹㈡埛绫诲埆")
     public R delete(@RequestParam(value="ids[]") Long[] ids){
          for (Long id : ids){
             cstmrTypeService.deleteById(id);
@@ -98,7 +108,7 @@
 
     @RequestMapping(value = "/cstmrTypeQuery/auth")
     @ManagerAuth
-    public R query(String condition) {
+    public R queryType(String condition) {
         EntityWrapper<CstmrType> wrapper = new EntityWrapper<>();
         wrapper.like("id", condition);
         Page<CstmrType> page = cstmrTypeService.selectPage(new Page<>(0, 10), wrapper);
@@ -106,7 +116,7 @@
         for (CstmrType cstmrType : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
             map.put("id", cstmrType.getId());
-            map.put("value", cstmrType.getId());
+            map.put("value", cstmrType.getName());
             result.add(map);
         }
         return R.ok(result);

--
Gitblit v1.9.1