增加年度计划编辑表导出

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);

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

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