From 9e62b27d593c2db04e389f973420743eab55e555 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 十一月 2023 11:09:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CompanyTargetController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CompanyTargetController.java b/src/main/java/com/zy/crm/manager/controller/CompanyTargetController.java
index fdbbeec..c830af7 100644
--- a/src/main/java/com/zy/crm/manager/controller/CompanyTargetController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CompanyTargetController.java
@@ -31,7 +31,7 @@
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy");
String year = format.format(date);
- return R.ok(companyTargetService.selectByYear(year));
+ return R.ok(companyTargetService.selectCompanyByYear(year));
}
@RequestMapping(value = "/companyTarget/{id}/auth")
@@ -51,6 +51,24 @@
EntityWrapper<CompanyTarget> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ wrapper.isNull("staff");
+ allLike(CompanyTarget.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(companyTargetService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/companyTarget/person/list/auth")
+ @ManagerAuth
+ public R personList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<CompanyTarget> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ wrapper.eq("staff", getUserId());
allLike(CompanyTarget.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(companyTargetService.selectPage(new Page<>(curr, limit), wrapper));
@@ -72,6 +90,11 @@
@RequestMapping(value = "/companyTarget/add/auth")
@ManagerAuth(memo = "娣诲姞骞村害鐩爣")
public R add(CompanyTarget companyTarget) {
+ CompanyTarget target = companyTargetService.selectCompanyByYear(companyTarget.getYear());
+ if (target != null) {
+ return R.error("宸插瓨鍦ㄥ勾搴︾洰鏍�");
+ }
+
companyTarget.setCreateTime(new Date());
companyTarget.setUserId(getUserId());
companyTargetService.insert(companyTarget);
@@ -99,6 +122,33 @@
return R.ok();
}
+ @RequestMapping(value = "/companyTarget/person/add/auth")
+ @ManagerAuth(memo = "娣诲姞涓汉骞村害鐩爣")
+ public R addPerson(CompanyTarget companyTarget) {
+ CompanyTarget target = companyTargetService.selectPersonByYear(companyTarget.getYear(), getUserId());
+ if (target != null) {
+ return R.error("宸插瓨鍦ㄥ勾搴︾洰鏍�");
+ }
+
+ companyTarget.setCreateTime(new Date());
+ companyTarget.setUserId(getUserId());
+ companyTarget.setStaff(getUserId());
+ companyTargetService.insert(companyTarget);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/companyTarget/person/update/auth")
+ @ManagerAuth(memo = "鏇存柊涓汉骞村害鐩爣")
+ public R updatePerson(CompanyTarget companyTarget){
+ if (Cools.isEmpty(companyTarget) || null==companyTarget.getId()){
+ return R.error();
+ }
+ companyTarget.setUpdateTime(new Date());
+ companyTarget.setUpdateUserId(getUserId());
+ companyTargetService.updateById(companyTarget);
+ return R.ok();
+ }
+
@RequestMapping(value = "/companyTarget/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
--
Gitblit v1.9.1