From 56b48f78fb89d8e1c42b352febdf33882d3f0333 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 17:01:06 +0800
Subject: [PATCH] #项目状态
---
src/main/java/com/zy/crm/manager/controller/ContractController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ContractController.java b/src/main/java/com/zy/crm/manager/controller/ContractController.java
index 93fca31..94b934b 100644
--- a/src/main/java/com/zy/crm/manager/controller/ContractController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ContractController.java
@@ -81,16 +81,18 @@
}
@RequestMapping(value = "/contract/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鍚堝悓")
public R add(Contract contract) {
- contract.setCreateBy(getUserId());
+ contract.setUserId(getUserId());
+ //鍒涘缓浜哄憳閮ㄩ棬
+ contract.setDeptId(getDeptId());
contract.setCreateTime(new Date());
contractService.insert(contract);
return R.ok();
}
@RequestMapping(value = "/contract/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鍚堝悓")
public R update(Contract contract){
if (Cools.isEmpty(contract) || null==contract.getId()){
return R.error();
@@ -102,7 +104,7 @@
}
@RequestMapping(value = "/contract/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鍚堝悓")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
contractService.deleteById(id);
@@ -111,7 +113,7 @@
}
@RequestMapping(value = "/contract/generate/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鐢熸垚鍚堝悓")
public ResponseEntity<InputStreamResource> generate(@RequestParam Integer id,
@RequestParam String contractTemplate){
try {
@@ -121,6 +123,7 @@
return null;
}
HashMap<String, Object> map = new HashMap<>();
+ map.put("{{serial}}", contract.getSerial());
map.put("{{customer}}", contract.getCustomer());
map.put("{{address}}", contract.getAddress());
map.put("{{company}}", contract.getCompany());
@@ -189,7 +192,7 @@
}
@RequestMapping(value = "/contract/upload/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "涓婁紶鍚堝悓")
public R upload(@RequestParam("id") Integer id,
@RequestParam("file") MultipartFile[] files) throws IOException {
Contract contract = contractService.selectById(id);
@@ -230,7 +233,7 @@
}
@RequestMapping(value = "/contract/download/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "涓嬭浇鍚堝悓")
public ResponseEntity<InputStreamResource> download(@RequestParam("id") Integer id) {
Contract contract = contractService.selectById(id);
if (contract == null) {
--
Gitblit v1.9.1