From 5c6158377e1228c77780ea2402b18cdd7a9ebab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 7 May 2025 22:18:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yanzhu/manage/mapper/ProPlanScheduleMapper.java | 4 ++-- .../resources/mapper/manage/ProPlanScheduleMapper.xml | 4 ++-- .../manage/service/impl/ProPlanScheduleServiceImpl.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java index 243c4676..421996d2 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java @@ -70,7 +70,7 @@ public interface ProPlanScheduleMapper /** * 更新总进度 * @param proId - * @param totalschedule + * @param totalSchedule */ - public void updateProPlanTotalSchedule(@Param("proId") Long proId, @Param("totalschedule") String totalschedule); + public void updateProPlanTotalSchedule(@Param("proId") Long proId, @Param("totalSchedule") String totalSchedule); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml index 00f860e0..6b9dc656 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml @@ -157,10 +157,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" join ( select max(id) as max_id from pro_plan_schedule - where project_id = #{proid} + where project_id = #{proId} and is_del = '0' ) as b on a.id = b.max_id - set a.total_schedule = #{totalschedule} + set a.total_schedule = #{totalSchedule} \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java index 59b1dfd5..6b5b021f 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java @@ -185,7 +185,7 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService private void RecursionEditStartDate(ProPlan plan){ if(plan.getStartDate()!=null){ int res = proPlanMapper.updateProPlan(plan); - if(res>0 && plan.getTaskOutlineLevel()>1){ + if(res>0){ ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId()); if(entity!=null){ List belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId()); @@ -227,7 +227,7 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService } }else{ int res = proPlanMapper.updateProPlanStartDate(plan); - if(res>0 && plan.getTaskOutlineLevel()>1){ + if(res>0){ ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId()); if(entity!=null){ List belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId()); @@ -277,7 +277,7 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService private void RecursionEditFinishDate(ProPlan plan){ if(plan.getFinishDate()!=null){ int res = proPlanMapper.updateProPlan(plan); - if(res>0 && plan.getTaskOutlineLevel()>1){ + if(res>0){ // 判断当前结构其它部位是否已全部完成 List brothers = proPlanMapper.selectProPlanBrothers(plan.getProjectId(),plan.getParentId()); if(brothers.size()==0){ @@ -326,7 +326,7 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService } }else{ int res = proPlanMapper.updateProPlanFinishDate(plan); - if(res>0 && plan.getTaskOutlineLevel()>1){ + if(res>0){ ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId()); if(entity!=null){ List belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId());