From c1c4db6170a51f809862ff94393f0612f72645ec Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十一月 2022 21:11:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrTypeController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..9890a63 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,17 @@
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.CstmrType;
+import com.zy.crm.manager.service.CstmrTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +40,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));
@@ -62,6 +62,12 @@
@RequestMapping(value = "/cstmrType/add/auth")
@ManagerAuth
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();
}
@@ -72,6 +78,8 @@
if (Cools.isEmpty(cstmrType) || null==cstmrType.getId()){
return R.error();
}
+ cstmrType.setUpdateBy(getUserId());
+ cstmrType.setUpdateTime(new Date());
cstmrTypeService.updateById(cstmrType);
return R.ok();
}
@@ -106,7 +114,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