From bba21d388cb4acf62d45b0eb738b554a81235ad0 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 22 Jul 2025 15:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=96=B0=E5=A2=9E=E8=81=94=E5=90=88=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HuzhouPlanController.java | 15 +++++++++ .../service/IHuzhouPlaninfoService.java | 5 +++ .../impl/HuzhouPlaninfoServiceImpl.java | 21 +++++++++++++ .../impl/HuzhouPlaninfofileServiceImpl.java | 31 ++++++++++++++++++- .../admin/modules/huzhou/vo/PlanSelectVo.java | 13 ++++++++ 5 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PlanSelectVo.java diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java index 55ff2c2..1e5b0c8 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java @@ -17,13 +17,16 @@ import com.easy.admin.modules.huzhou.listener.ProjectPlanListener; import com.easy.admin.modules.huzhou.service.IHuzhouPlaninfoService; import com.easy.admin.modules.huzhou.vo.HuzhouPlaninfoOV; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; +import com.easy.admin.modules.huzhou.vo.PlanSelectVo; import com.easy.admin.modules.huzhou.vo.TaskLevelDetailVo; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -224,4 +227,16 @@ public class HuzhouPlanController { Boolean flag = planinfoService.taskNameIsFinished(projectid); return Result.OK(flag); } + + @PutMapping("/updateScheduledTime") + public Result updateScheduledTime(@RequestBody HuzhouPlaninfo huzhouPlaninfo) { + planinfoService.updateScheduledTime(huzhouPlaninfo); + return Result.OK(); + } + + @GetMapping("/getPlanNames") + public Result getPlanNames(@Param("projectid") String projectid) { + List rs =planinfoService.getPlanNames(projectid); + return Result.OK(rs); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java index 55d2220..9733217 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.easy.admin.common.core.common.select.Select; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; +import com.easy.admin.modules.huzhou.vo.PlanSelectVo; import com.easy.admin.modules.huzhou.vo.TaskLevelDetailVo; import org.apache.poi.ss.usermodel.Sheet; import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo; @@ -133,4 +134,8 @@ public interface IHuzhouPlaninfoService extends IService { * @param projectid */ void modifyPlanSpecialProject(MultipartFile multipartFile, String projectid,HttpServletResponse response) throws IOException; + + void updateScheduledTime(HuzhouPlaninfo huzhouPlaninfo); + + List getPlanNames(String projectid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index 81c1036..88c34fa 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -22,6 +22,7 @@ import com.easy.admin.modules.huzhou.entity.*; import com.easy.admin.modules.huzhou.listener.ProjectPlanListener; import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; +import com.easy.admin.modules.huzhou.vo.PlanSelectVo; import com.easy.admin.modules.huzhou.vo.TaskLevelDetailVo; import com.easy.admin.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; @@ -1763,4 +1764,24 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl getPlanNames(String projectid) { + List updatePlanList = Arrays.asList("初验阶段", "试运行阶段","终验阶段"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectid); + queryWrapper.in(HuzhouPlaninfo::getTaskName,updatePlanList); + List planInfoList = planInfoMapper.selectList(queryWrapper); + + List rs = new ArrayList<>(); + for (HuzhouPlaninfo planInfo : planInfoList) { + rs.add(new PlanSelectVo(planInfo.getTaskName(),planInfo.getId())); + } + return rs; + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index 067d13a..b465174 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -164,6 +164,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl variables = new HashMap<>(); + variables.put("taskLeadingDepartment", strings); + runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第四个人变量信息 + //发起人节点处理 + taskService.setVariableLocal(taskId, "approvalStatue", "1");//添加审批状态 通过 + String comment = "同意"; + taskService.addComment(taskId, processInstanceId, comment);//添加审批意见 + taskService.complete(taskId, variables); + HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); + huzhouPlaninfo.setId(planinfoid); + huzhouPlaninfo.setIsfinish("1"); + huzhouPlaninfo.setActualStartTime(new Date()); + planinfoService.updateById(huzhouPlaninfo); + } else { HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); huzhouPlaninfo.setId(planinfoid); huzhouPlaninfo.setIsfinish("2"); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PlanSelectVo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PlanSelectVo.java new file mode 100644 index 0000000..d02f04d --- /dev/null +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PlanSelectVo.java @@ -0,0 +1,13 @@ +package com.easy.admin.modules.huzhou.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PlanSelectVo { + private String label; + private String value; +}