流程相关修改,新增联合验收审批流程

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<PlanSelectVo> rs =planinfoService.getPlanNames(projectid);
+        return Result.OK(rs);
+    }
 }

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<HuzhouPlaninfo> {
      * @param projectid
      */
     void modifyPlanSpecialProject(MultipartFile multipartFile, String projectid,HttpServletResponse response) throws IOException;
+
+    void updateScheduledTime(HuzhouPlaninfo huzhouPlaninfo);
+
+    List<PlanSelectVo> getPlanNames(String projectid);
 }

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<HuzhouPlaninfoMapper,
 //        subUpdateWrapper.set(HuzhouSubProjectinfo::getUpdatePlanFlag, "2");
 //        subProjectInfoMapper.update(null, subUpdateWrapper);
     }
+
+    @Override
+    public void updateScheduledTime(HuzhouPlaninfo huzhouPlaninfo) {
+        baseMapper.updateById(huzhouPlaninfo);
+    }
+
+    @Override
+    public List<PlanSelectVo> getPlanNames(String projectid) {
+        List<String> updatePlanList = Arrays.asList("初验阶段", "试运行阶段","终验阶段");
+        LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectid);
+        queryWrapper.in(HuzhouPlaninfo::getTaskName,updatePlanList);
+        List<HuzhouPlaninfo> planInfoList = planInfoMapper.selectList(queryWrapper);
+
+        List<PlanSelectVo> rs = new ArrayList<>();
+        for (HuzhouPlaninfo planInfo : planInfoList) {
+            rs.add(new PlanSelectVo(planInfo.getTaskName(),planInfo.getId()));
+        }
+        return rs;
+    }
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java

@@ -164,6 +164,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             queryWrapper.eq(HuzhouPlaninfo::getProjectId,planinfo.getProjectId());
             queryWrapper.eq(HuzhouPlaninfo::getTaskName,"试运行阶段");
             HuzhouPlaninfo source = planinfoMapper.selectOne(queryWrapper);
+
             if (source != null && huzhouProjectinfo.getAdminDivision().equals("市本级") ) {
                 HuzhouPlaninfo target = new HuzhouPlaninfo();
                 BeanUtils.copyProperties(source,target,"id","actualStartTime","actualEndTime");
@@ -177,6 +178,16 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
                 target.setScheduledStartTime(setDate);
                 target.setScheduledEndTime(setDate);
                 planinfoMapper.insert(target);
+
+                // 添加计划
+                HuzhouPlaninfo target2 = new HuzhouPlaninfo();
+                BeanUtils.copyProperties(source,target2,"id","actualStartTime","actualEndTime");
+                target2.setTaskName("联合验收审批");
+                target2.setTaskFile("《验收文件》");
+                target2.setIsfinish("0");
+                target2.setScheduledStartTime(setDate);
+                target2.setScheduledEndTime(setDate);
+                planinfoMapper.insert(target2);
             }
         }
 
@@ -387,7 +398,25 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             huzhouPlaninfo.setIsfinish("1");
             huzhouPlaninfo.setActualStartTime(new Date());
             planinfoService.updateById(huzhouPlaninfo);
-        }else{
+        } else if ("联合验收审批".equals(taskName)) {
+            WorkFlow workFlow = workflowService.createFlow("JAA", planinfoid);
+            Task task = workFlow.getTask();
+            String taskId = task.getId();
+            String processInstanceId = workFlow.getProcessInstanceId();
+            Map<String, Object> 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");

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;
+}