From 59292e68b11c383948b436e755a4aad8abf1ce24 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:32:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 96064e7..487c42a 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -649,9 +649,6 @@
try{
weeklyDailyPlanService.insert(weeklyDailyPlan);
- WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality();
- weeklyDailyReality.sync(weeklyDailyPlan);
- weeklyDailyRealityService.insert(weeklyDailyReality);
} catch (Exception e){
log.error("鏂板鏃ヨ鍒掑け璐�"+e);
throw new CoolException("鏂板鏃ヨ鍒掑け璐�");
@@ -681,9 +678,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");
}
+// else if (Cools.isEmpty(param.getWeeklyType())){
+// throw new CoolException("鍙傛暟涓虹┖锛歐eekly");
+// }
Date now = new Date();
Weekly weekly = weeklyService.selectById(param.getWeeklyId());
weekly.setUpdateBy(getUserId());
@@ -704,23 +702,35 @@
throw new CoolException("鏇存柊鍛ㄨ鍒掍富琛ㄥけ璐�");
}
- List<CstmrUtilsParam> cstmrUtilsParamList = new ArrayList<>();
+ List<WeeklyDailyReality> weeklyDailyRealitieList = weeklyDailyRealityService.selectList(new EntityWrapper<WeeklyDailyReality>().eq("weekly_id", weekly.getId()));
+ List<Long> ids = new ArrayList<>();
+ for (WeeklyDailyReality weeklyDailyReality: param.getWeeklyDailyRealityList()) {
+ if (!Cools.isEmpty(weeklyDailyReality.getId())) {
+ ids.add(weeklyDailyReality.getId());
+ }
+ }
+ try{
+ for (WeeklyDailyReality weeklyDailyReality2:weeklyDailyRealitieList){
+ if (!ids.contains(weeklyDailyReality2.getId())){
+ weeklyDailyRealityService.deleteById(weeklyDailyReality2.getId());
+ }
+ }
+ }catch (Exception e){
+
+ }
for (WeeklyDailyReality weeklyDailyReality: param.getWeeklyDailyRealityList()){
WeeklyDailyReality weeklyDailyReality1 = new WeeklyDailyReality();
if (!Cools.isEmpty(weeklyDailyReality.getId())){
- Long weeklyDailyPlanId = weeklyDailyReality.getId();
+ Long weeklyDailyRealityId = weeklyDailyReality.getId();
weeklyDailyReality1 = weeklyDailyRealityService.selectById(weeklyDailyReality.getId());
- if (Cools.isEmpty(weeklyDailyReality)){
- throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyPlanId);
+ if (Cools.isEmpty(weeklyDailyReality1)){
+ throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyRealityId);
}
- if (!Cools.isEmpty(weeklyDailyReality1.getComment())){
-// weeklyDailyReality1.setComment(weeklyDailyReality1.getComment()+";"+weeklyDailyReality.getComment());
- weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
- }else {
- weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
- }
+ weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
weeklyDailyReality1.setWorkContent(weeklyDailyReality.getWorkContent());
weeklyDailyReality1.setWorkPurpose(weeklyDailyReality.getWorkPurpose());
+ weeklyDailyReality1.setWeeklyMatter(weeklyDailyReality.getWeeklyMatter());
+ weeklyDailyReality1.setAddr(weeklyDailyReality.getAddr());
weeklyDailyReality1.setMemo(weeklyDailyReality.getMemo());
weeklyDailyReality1.setUpdateBy(getUserId());
weeklyDailyReality1.setUpdateTime(now);
--
Gitblit v1.9.1