#

lsh

2024-04-19 f614347a41aa29d5050e3da3a921cdc204c23dde

 src/main/java/com/zy/crm/manager/controller/WeeklyController.java

@@ -370,6 +370,7 @@
                    weeklyDailyPlanService.insert(weeklyDailyPlan);
                    WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality();
                    weeklyDailyReality.sync(weeklyDailyPlan);
                    weeklyDailyReality.setWorkContent("");
                    weeklyDailyRealityService.insert(weeklyDailyReality);

                } catch (Exception e){
@@ -593,7 +594,22 @@
                throw new CoolException("更新周计划主表失败");
            }

            List<CstmrUtilsParam> cstmrUtilsParamList = new ArrayList<>();
            List<WeeklyDailyPlan> weeklyDailyPlanList = weeklyDailyPlanService.selectList(new EntityWrapper<WeeklyDailyPlan>().eq("weekly_id", weekly.getId()));
            List<Long> ids = new ArrayList<>();
            for (WeeklyDailyPlan  weeklyDailyPlan: param.getWeeklyDailyPlanList()) {
                if (!Cools.isEmpty(weeklyDailyPlan.getId())) {
                    ids.add(weeklyDailyPlan.getId());
                }
            }
            try{
                for (WeeklyDailyPlan weeklyDailyPlan2:weeklyDailyPlanList){
                    if (!ids.contains(weeklyDailyPlan2.getId())){
                        weeklyDailyPlanService.deleteById(weeklyDailyPlan2.getId());
                    }
                }
            }catch (Exception e){

            }
            for (WeeklyDailyPlan  weeklyDailyPlan: param.getWeeklyDailyPlanList()){
                WeeklyDailyPlan weeklyDailyPlan1 = new WeeklyDailyPlan();
                if (!Cools.isEmpty(weeklyDailyPlan.getId())){
@@ -634,9 +650,6 @@

                    try{
                        weeklyDailyPlanService.insert(weeklyDailyPlan);
                        WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality();
                        weeklyDailyReality.sync(weeklyDailyPlan);
                        weeklyDailyRealityService.insert(weeklyDailyReality);
                    } catch (Exception e){
                        log.error("新增日计划失败"+e);
                        throw new CoolException("新增日计划失败");
@@ -666,9 +679,10 @@
                throw new CoolException("参数为空：WeeklyId");
            } else if (Cools.isEmpty(param.getType())){
                throw new CoolException("参数为空：Type");
            } else if (Cools.isEmpty(param.getWeeklyType())){
                throw new CoolException("参数为空：Weekly");
            }
//            else if (Cools.isEmpty(param.getWeeklyType())){
//                throw new CoolException("参数为空：Weekly");
//            }
            Date now = new Date();
            Weekly weekly = weeklyService.selectById(param.getWeeklyId());
            weekly.setUpdateBy(getUserId());
@@ -689,23 +703,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("更新失败：id:"+weeklyDailyPlanId);
                    if (Cools.isEmpty(weeklyDailyReality1)){
                        throw new CoolException("更新失败：id:"+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);