From f29f6f0220bd2f0d4b8b42698fd54d740a9dbd29 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 13 Feb 2023 17:21:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/ConstructionPlanManage.java | 27 ++++++---------------- .../controller/AnnualPlanController.java | 7 ++++++ .../projectlib/manage/AnnualPlanLibManage.java | 5 ++++ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java index b5e9ff9..3d528d3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java @@ -1,26 +1,15 @@ package com.ningdatech.pmapi.projectdeclared.manage; -import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ningdatech.basic.function.VUtils; -import com.ningdatech.basic.model.PageVo; -import com.ningdatech.pmapi.common.enums.ProjectProessStageEnum; +import com.ningdatech.pmapi.common.enumeration.ProjectProessStageEnum; import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; -import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft; -import com.ningdatech.pmapi.projectdeclared.entity.dto.*; -import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDeclaredDetailVO; -import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo; -import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService; +import com.ningdatech.pmapi.projectdeclared.entity.dto.ConstructionPlanDto; +import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; -import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto; import com.ningdatech.pmapi.projectlib.model.entity.Project; -import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; -import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; -import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.wflow.bean.entity.WflowModels; import com.wflow.exception.BusinessException; @@ -29,16 +18,13 @@ import com.wflow.workflow.service.ProcessInstanceService; import com.wflow.workflow.service.ProcessModelService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.util.Collections; -import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; /** * @Classname DeclaredProjectManage @@ -61,6 +47,7 @@ public class ConstructionPlanManage { /** * 提交预审 + * * @param dto * @return */ @@ -104,7 +91,7 @@ public class ConstructionPlanManage { log.info("提交预审项目成功 【{}】", instanceId); //保存建设项目 - modifyProject(projectInfo, instanceId,dto.getConstructionPlanFile()); + modifyProject(projectInfo, instanceId, dto.getConstructionPlanFile()); return instanceId; } @@ -115,14 +102,14 @@ public class ConstructionPlanManage { * @param project * @param instanceId */ - private void modifyProject(Project project, String instanceId,String constructionPlanFile) { + private void modifyProject(Project project, String instanceId, String constructionPlanFile) { //流程启动之后 入库项目 重要业务信息 用于列表查询 展示 try { project.setUpdateOn(LocalDateTime.now()); project.setInstCode(instanceId); project.setConstructionPlanFile(constructionPlanFile); //调用状态机 进入下一个通过状态 - stateMachineUtils.execute(project,stateMachineUtils.getProjectStatusPassEvent(project.getStatus())); + stateMachineUtils.execute(project, stateMachineUtils.getProjectStatusPassEvent(project.getStatus())); projectService.updateById(project); } catch (Exception e) { log.error("提交建设方案 项目信息修改 错误 ", e); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java index d50be49..7098b1d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java @@ -14,6 +14,7 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -66,4 +67,10 @@ public class AnnualPlanController { annualPlanLibManage.importAnnualPlan(file); } + @GetMapping("/exportAnnualPlanEditTable") + @ApiOperation("导出年度计划编辑表") + public void exportAnnualPlanEditTable(HttpServletResponse response) { + annualPlanLibManage.exportAnnualPlanEditTable(response); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java index 0391c86..7b0ceba 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java @@ -28,6 +28,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -199,4 +200,8 @@ public class AnnualPlanLibManage { } } + public void exportAnnualPlanEditTable(HttpServletResponse response) { + // TODO + } + }