From 30350cae29ec19082a9810080e32fcddd4d9df17 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 14:26:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
index 3c1b096..0fff081 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -85,16 +85,76 @@
return R.ok(weeklyService.selectPage(new Page<>(curr, limit), wrapper));
}
+// private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+// for (Map.Entry<String, Object> entry : map.entrySet()){
+// String val = String.valueOf(entry.getValue());
+// if (val.contains(RANGE_TIME_LINK)){
+// String[] dates = val.split(RANGE_TIME_LINK);
+// wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+// wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+// } else {
+// wrapper.like(entry.getKey(), val);
+// }
+// }
+// }
+
+ @RequestMapping(value = "/weekly/list/auth2")
+ @ManagerAuth
+ public R list2(@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<Weekly> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(Weekly.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(weeklyService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ Long deptId = getDeptId();
+ boolean signUserId = false;
+ boolean signDeptId = false;
+ boolean signHostId = false;
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ if (entry.getKey().equals("dept_id")){
+ signDeptId = true;
+ if (String.valueOf(entry.getValue()).equals("19")){
+ signHostId = true;
+ }
+ }
+ }
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (entry.getKey().equals("dept_id")){
+ if (!val.equals("19")){
+ wrapper.eq(entry.getKey(), val);
+ }
+ } else if (entry.getKey().equals("user_id") && !signDeptId){
+ signUserId = true;
+ wrapper.eq(entry.getKey(), val);
} else {
wrapper.like(entry.getKey(), val);
}
+ }
+ if (!signUserId && !signDeptId){
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",getHostId());
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
+ }
+ if (signHostId){
+ wrapper.or().eq("host_id",getHostId());
}
}
@@ -509,9 +569,10 @@
throw new CoolException("鍙傛暟涓虹┖锛歐eeklyId");
} else if (Cools.isEmpty(param.getType())){
throw new CoolException("鍙傛暟涓虹┖锛歍ype");
- } else if (Cools.isEmpty(param.getWeeklyType())){
- throw new CoolException("鍙傛暟涓虹┖锛歐eekly");
}
+// if (Cools.isEmpty(param.getWeeklyType())){
+// throw new CoolException("鍙傛暟涓虹┖锛歐eekly");
+// }
Date now = new Date();
Weekly weekly = weeklyService.selectById(param.getWeeklyId());
weekly.setUpdateBy(getUserId());
@@ -538,22 +599,19 @@
if (!Cools.isEmpty(weeklyDailyPlan.getId())){
Long weeklyDailyPlanId = weeklyDailyPlan.getId();
weeklyDailyPlan1 = weeklyDailyPlanService.selectById(weeklyDailyPlan.getId());
- if (Cools.isEmpty(weeklyDailyPlan)){
+ if (Cools.isEmpty(weeklyDailyPlan1)){
throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyPlanId);
}
- if (!Cools.isEmpty(weeklyDailyPlan1.getComment())){
-// weeklyDailyPlan1.setComment(weeklyDailyPlan1.getComment()+";"+weeklyDailyPlan.getComment());
- weeklyDailyPlan1.setComment(weeklyDailyPlan.getComment());
- }else {
- weeklyDailyPlan1.setComment(weeklyDailyPlan.getComment());
- }
+ weeklyDailyPlan1.setComment(weeklyDailyPlan.getComment());
weeklyDailyPlan1.setWorkContent(weeklyDailyPlan.getWorkContent());
weeklyDailyPlan1.setWorkPurpose(weeklyDailyPlan.getWorkPurpose());
+ weeklyDailyPlan1.setWeeklyMatter(weeklyDailyPlan.getWeeklyMatter());
+ weeklyDailyPlan1.setAddr(weeklyDailyPlan.getAddr());
weeklyDailyPlan1.setMemo(weeklyDailyPlan.getMemo());
weeklyDailyPlan1.setUpdateBy(getUserId());
weeklyDailyPlan1.setUpdateTime(now);
if (!Cools.isEmpty(weeklyDailyPlan.getCstmrId())){
- weeklyDailyPlan1.setCstmrId(weeklyDailyPlan1.getCstmrId());
+ weeklyDailyPlan1.setCstmrId(weeklyDailyPlan.getCstmrId());
}
weeklyDailyPlanService.updateById(weeklyDailyPlan1);
--
Gitblit v1.9.1