From 75c3ceae532acc1ffe1df3c6b71a5b9621be8a41 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 02 四月 2024 14:53:39 +0800
Subject: [PATCH] #周计划
---
src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 88 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 21 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 5a13521..c46f76c 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -47,12 +47,24 @@
private SmsCodeService smsCodeService;
String PZH = " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
- Integer PBN = 6;
+ Integer PBN = 3;
@RequestMapping(value = "/weekly/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(weeklyService.selectById(String.valueOf(id)));
+ Weekly weekly = weeklyService.selectById(String.valueOf(id));
+ assert weekly != null;
+ JSONObject resultObj = JSON.parseObject(JSON.toJSONString(weekly));
+ if (!Cools.isEmpty(weekly.getForm())) {
+ JSONObject formObj = JSON.parseObject(weekly.getForm());
+ formObj.forEach(resultObj::putIfAbsent);
+ }
+
+ // 姝ラ鏉＄浉鍏�
+ resultObj.put("step", weekly.getSettle().equals(weekly.getSettleSize()) ? 0 : weekly.getSettle() + 1);
+
+ return R.ok().add(resultObj);
+// return R.ok(weeklyService.selectById(String.valueOf(id)));
}
@RequestMapping(value = "/weekly/list/auth")
@@ -103,11 +115,27 @@
@RequestMapping(value = "/weekly/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- weeklyService.deleteById(id);
- }
- return R.ok();
+ public R delete(@RequestParam() Long[] ids){
+ try{
+ for (Long id : ids){
+ List<WeeklyDailyReality> weeklyDailyRealities = weeklyDailyRealityService.selectList(new EntityWrapper<WeeklyDailyReality>().eq("weekly_id", id));
+ for (WeeklyDailyReality weeklyDailyReality:weeklyDailyRealities){
+ weeklyDailyRealityService.deleteById(weeklyDailyReality);
+ }
+ List<WeeklyDailyPlan> weeklyDailyPlans = weeklyDailyPlanService.selectList(new EntityWrapper<WeeklyDailyPlan>().eq("weekly_id", id));
+ for (WeeklyDailyPlan weeklyDailyPlan:weeklyDailyPlans){
+ weeklyDailyPlanService.deleteById(weeklyDailyPlan);
+ }
+ List<WeeklyFoll> weeklyFolls = weeklyFollService.selectList(new EntityWrapper<WeeklyFoll>().eq("weekly_id", id));
+ for (WeeklyFoll weeklyFoll:weeklyFolls){
+ weeklyFollService.deleteById(weeklyFoll);
+ }
+ weeklyService.deleteById(id);
+ }
+ }catch (Exception e){
+ throw new CoolException("鍒犻櫎澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ return R.ok();
}
@RequestMapping(value = "/weekly/export/auth")
@@ -220,16 +248,33 @@
weekly.setWeeklyNowMonth(TimeCalculatorUtils.WeeklyNowMonthDay(weekly.getStartTime()));
weekly.setWeeklyDayMonth(weekly.getWeeklyMonth()+"鏈堢"+weekly.getWeeklyNowMonth()+"鍛�");
- List<User> userList = new ArrayList<>();
- userList.add(getUser());
User manager = new User();
try {
manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
} catch (Exception e) {
manager = getUser();
}
- userList.add(manager);
- weekly.setDirector(manager.getId());
+ // 鑾峰彇涓氬姟鍛�
+ List<String> initNames = new ArrayList<>();
+ initNames.add("鍒涘缓浜嗗鎵�");
+ initNames.add("涓氬姟鍛樻彁浜�");
+ initNames.add("閮ㄩ棬棰嗗瀹℃牳");
+ List<User> users = new ArrayList<>();
+ users.add(getUser());
+ users.add(getUser());
+ users.add(manager);
+// users.add(getUser());
+ weekly.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPathTwo(users, initNames, users.size())));
+ weekly.setSettleSize(users.size());
+ weekly.setSettleCurrent(1);
+ if (users.size() > 1) {
+ weekly.setDirector(users.get(1).getId());
+ } else {
+ weekly.setDirector(getUserId());
+ }
+
+
+ weekly.setSettleSize(users.size());
List<Date> dates = TimeCalculatorUtils.WeeklyListDays(dateList);//鑾峰彇鍛ㄤ竴鍒板懆鏃ユ棩鏈�
@@ -268,7 +313,7 @@
}
try{
- insertWeeklyFoll(userList,weekly.getId()); // 鑷姩娣诲姞璺熻繘浜�
+ insertWeeklyFoll(users,weekly.getId()); // 鑷姩娣诲姞璺熻繘浜�
}catch (Exception e){
log.error("鍛ㄦ姤娣诲姞璺熻繘浜哄紓甯革紝寮傚父淇℃伅1锛�"+e);
}
@@ -285,10 +330,13 @@
for (User user:userList){
try{
// 鑷姩娣诲姞璺熻繘浜�
- WeeklyFoll weeklyFoll = new WeeklyFoll();
- weeklyFoll.setUserId(user.getId());
- weeklyFoll.setWeeklyId(weeklyId);
- weeklyFollService.insert(weeklyFoll);
+ List<WeeklyFoll> weeklyFolls = weeklyFollService.selectList(new EntityWrapper<WeeklyFoll>().eq("weekly_id", weeklyId).eq("user_id", user.getId()));
+ if (weeklyFolls.size()==0){
+ WeeklyFoll weeklyFoll = new WeeklyFoll();
+ weeklyFoll.setUserId(user.getId());
+ weeklyFoll.setWeeklyId(weeklyId);
+ weeklyFollService.insert(weeklyFoll);
+ }
}catch (Exception e){
log.error("鍛ㄦ姤娣诲姞璺熻繘浜哄紓甯革紝寮傚父淇℃伅2锛�"+e);
continue;
@@ -323,23 +371,21 @@
weekly.setUpdateBy(getUserId());
weekly.setUpdateTime(now);
- List<User> userList = new ArrayList<>();
- userList.add(getUser());
User manager = new User();
try {
manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
} catch (Exception e) {
manager = getUser();
}
- userList.add(manager);
weekly.setDirector(manager.getId());
// 鑾峰彇涓氬姟鍛�
List<String> initNames = new ArrayList<>();
initNames.add("鍒涘缓浜嗗鎵�");
+ initNames.add("涓氬姟鍛樻彁浜�");
initNames.add("閮ㄩ棬棰嗗瀹℃牳");
-// initNames.add("涓氬姟鍛樼‘璁�");
List<User> users = new ArrayList<>();
+ users.add(getUser());
users.add(getUser());
users.add(manager);
// users.add(getUser());
@@ -426,7 +472,7 @@
}
try{
- insertWeeklyFoll(userList,weekly.getId()); // 鑷姩娣诲姞璺熻繘浜�
+ insertWeeklyFoll(users,weekly.getId()); // 鑷姩娣诲姞璺熻繘浜�
}catch (Exception e){
log.error("鍛ㄦ姤娣诲姞璺熻繘浜哄紓甯革紝寮傚父淇℃伅1锛�"+e);
}
--
Gitblit v1.9.1