浏览代码

PSSR主清单导出

wangggziwen 6 月之前
父节点
当前提交
c8511191a9

+ 16 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -69,6 +69,9 @@ import java.io.OutputStream;
 import java.nio.file.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static com.ruoyi.framework.config.RuoYiConfig.getProfile;
 
@@ -794,7 +797,19 @@ public class TPssrApproveController extends BaseController {
             if (condition.equals("0")) {
                 aboveall.setApproveStatus(2L);
                 aboveall.setConfirmationDate(new Date());
-                this.genZip(aboveall);//生成子项文件压缩包
+
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        TPssrApproveController controller = new TPssrApproveController();
+                        try {
+                            controller.genZip(aboveall);//生成子项文件压缩包
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
             }
         }
         tPssrAboveallService.updateTPssrAboveall(aboveall);

+ 7 - 7
ui/src/views/pssr/aboveall/index.vue

@@ -129,13 +129,13 @@
             @click="gotoSubIndex(scope.row)"
           >检查内容
           </el-button>
-          <!--<el-button-->
-            <!--size="mini"-->
-            <!--type="text"-->
-            <!--icon="el-icon-download"-->
-            <!--@click="handleZip(scope.row)"-->
-          <!--&gt;打包-->
-          <!--</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="handleZip(scope.row)"
+          >打包
+          </el-button>
           <!--<el-button-->
             <!--size="mini"-->
             <!--type="text"-->