From cc85911b19cc25838f19ffb2fbb120fbc72b2fb4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 29 三月 2024 13:00:32 +0800
Subject: [PATCH] #周计划
---
src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 7ee351b..5226b02 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -414,12 +414,20 @@
if (Cools.isEmpty(weeklyDailyPlan)){
throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyPlanId);
}
- weeklyDailyPlan1.setComment(weeklyDailyPlan1.getComment()+";"+weeklyDailyPlan.getComment());
+ if (!Cools.isEmpty(weeklyDailyPlan1.getComment())){
+// weeklyDailyPlan1.setComment(weeklyDailyPlan1.getComment()+";"+weeklyDailyPlan.getComment());
+ weeklyDailyPlan1.setComment(weeklyDailyPlan.getComment());
+ }else {
+ weeklyDailyPlan1.setComment(weeklyDailyPlan.getComment());
+ }
weeklyDailyPlan1.setWorkContent(weeklyDailyPlan.getWorkContent());
weeklyDailyPlan1.setWorkPurpose(weeklyDailyPlan.getWorkPurpose());
weeklyDailyPlan1.setMemo(weeklyDailyPlan.getMemo());
weeklyDailyPlan1.setUpdateBy(getUserId());
weeklyDailyPlan1.setUpdateTime(now);
+ if (!Cools.isEmpty(weeklyDailyPlan.getCstmrId())){
+ weeklyDailyPlan1.setCstmrId(weeklyDailyPlan1.getCstmrId());
+ }
weeklyDailyPlanService.updateById(weeklyDailyPlan1);
}else {
@@ -504,12 +512,20 @@
if (Cools.isEmpty(weeklyDailyReality)){
throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyPlanId);
}
- weeklyDailyReality1.setComment(weeklyDailyReality1.getComment()+";"+weeklyDailyReality.getComment());
+ if (!Cools.isEmpty(weeklyDailyReality1.getComment())){
+// weeklyDailyReality1.setComment(weeklyDailyReality1.getComment()+";"+weeklyDailyReality.getComment());
+ weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
+ }else {
+ weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
+ }
weeklyDailyReality1.setWorkContent(weeklyDailyReality.getWorkContent());
weeklyDailyReality1.setWorkPurpose(weeklyDailyReality.getWorkPurpose());
weeklyDailyReality1.setMemo(weeklyDailyReality.getMemo());
weeklyDailyReality1.setUpdateBy(getUserId());
weeklyDailyReality1.setUpdateTime(now);
+ if (!Cools.isEmpty(weeklyDailyReality.getCstmrId())){
+ weeklyDailyReality1.setCstmrId(weeklyDailyReality.getCstmrId());
+ }
weeklyDailyRealityService.updateById(weeklyDailyReality1);
}else {
--
Gitblit v1.9.1