From ab9b9cf68adf1e009700aacb4eccd3e5af535ab5 Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Wed, 16 Oct 2024 09:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/controller/HuzhouUploadfileinfoController.java    | 3 +++
 .../huzhou/service/impl/HuzhouPlaninfoServiceImpl.java       | 5 ++++-
 .../huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java   | 5 +++--
 .../modules/huzhou/vo/SuperLeaderApprovalDetailsOV.java      | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java
index 4aad3ca..7c7f380 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java
@@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 
 @RestController
@@ -52,12 +53,14 @@ public class HuzhouUploadfileinfoController {
             fileInputStream = new FileInputStream(path);
             file = new File(path);
         }
+        response.addHeader("content-disposition","attachment;filename="+URLEncoder.encode(fileName,"UTF-8")+";filename*=UTF-8''"+ URLEncoder.encode(fileName,"UTF-8"));
         response.setContentType("application/octet-stream");
         if(file!=null){
             response.addHeader("Content-Length", "" + file.length());
         }else{
             response.addHeader("Content-Length", "" + fileInputStream.available());
         }
+
 //        response.setContentType("multipart/form-data");
         BufferedInputStream inputStream =null;
         try {
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 0411a76..f211f3d 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
@@ -609,7 +609,10 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
 
     @Override
     public IPage<HuzhouProjectinfoOV> projectPlanPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize, String newStage) {
-//        runtimeService.deleteProcessInstance("412777","停止流程");
+//        runtimeService.deleteProcessInstance("371898","停止流程");
+//        runtimeService.deleteProcessInstance("371950","停止流程");
+//        runtimeService.deleteProcessInstance("415628","停止流程");
+//        runtimeService.deleteProcessInstance("415680","停止流程");
 
         IPage<HuzhouProjectinfoOV> infoPageList = projectinfoService.getProjectInfoAndChildPageList(projectinfo, pageNo, pageSize,newStage);
         return infoPageList;
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 0b86090..d530827 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
@@ -306,7 +306,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             huzhouPlaninfo1.setActualEndTime(new Date());
             planinfoService.updateById(huzhouPlaninfo1);
 
-        } else if ("可研报告送审稿编制".equals(taskName)) {
+        } else if ("可研报告终稿编制".equals(taskName)) {
            //finalFeasibilityReportDraft
            WorkFlow workFlow = workflowService.createFlow("finalFeasibilityReportDraft",planinfoid);
            Task task = workFlow.getTask();
@@ -451,10 +451,11 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         if(processInstance==null&&"1".equals(flag)){
             HuzhouPlaninfo byId = planinfoService.getById(planinfoid);
             String taskName = StrUtil.trim(byId.getTaskName());
-            if("可研报告送审稿编制".equals(taskName)){
+            if("可研报告终稿编制".equals(taskName)){
                 //查询是否已有完成的流程。有两个以上
                 queryWrapper.clear();
                 queryWrapper.eq(HuzhouProcessinfo::getProjectid,planinfoid);
+
                 processinfos = processinfoService.list(queryWrapper);
 
                 if(processinfos.size()>=2){
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SuperLeaderApprovalDetailsOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SuperLeaderApprovalDetailsOV.java
index d26dce3..5aedb5f 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SuperLeaderApprovalDetailsOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SuperLeaderApprovalDetailsOV.java
@@ -33,6 +33,7 @@ public class SuperLeaderApprovalDetailsOV {
     private String reformCount;
     private String idList;
     private String urtDep;
+    private String isfinished;
 }