update

controller/projectController.js

@@ -837,6 +837,7 @@ async function listProject(req, res, next) {
         if(req.body.menuType) {
             where.projectLzType = {[Op.in]: projectLzTypes}
         }
+        search.where = where;
         search.limit = limit;
         search.offset = offset;
         if (req.body.attributes && req.body.attributes.length) {

controller/templateController.js

@@ -8,15 +8,9 @@ const ExcelJS = require('exceljs');
 const path = require('path');
 const errorMessage = require("../utils/errorMessage");
 
-async function getExcelTemplate(req, res, next) {
-    try {
-        let { tampName, projectId, startYear, endYear } = req.query;
+
+async function getXmtzzjllTem({ startYear, endYear, tampName, projectId }) {
     const workbook = new ExcelJS.Workbook();
-        if (tampName === 'xmtzzjll') { // 项目投资资金流量表
-            if (!startYear || !endYear) {
-                errorMessage.paramsError.message = "当前模板开始年份和结束年份不能为空";
-                return res.sendError(errorMessage.paramsError);
-            }
     // 1. 读取空模板文件
     const inputFilePath = path.join(__dirname, '../public/template/项目投资资金流量表.xlsx');
     // 2. 处理excel 文件，动态生成表格
@@ -79,12 +73,22 @@ async function getExcelTemplate(req, res, next) {
             cell.border = BLACK_BORDER; //边框
         });
     });
-            // 3. 将处理后的文件发送给前端
-            res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-            res.setHeader('Content-Disposition', 'attachment; filename=' + encodeURIComponent('项目投资资金流量表.xlsx'));
     const buffer = await workbook.xlsx.writeBuffer();
-            // 发送文件并结束响应
-            res.end(buffer);
+    return buffer;
+}
+
+async function getExcelTemplate(req, res, next) {
+    try {
+        let { tampName, projectId, startYear, endYear } = req.query;
+        startYear = startYear || new Date().getFullYear();
+        endYear = endYear || Number(startYear + 33);
+        let keyName = {
+            xmtzzjll: "项目投资资金流量表"
+        }
+        const workbook = new ExcelJS.Workbook();
+        let buffer;
+        if (tampName === 'xmtzzjll') { // 项目投资资金流量表
+            buffer = await getXmtzzjllTem({ startYear, endYear, tampName, projectId });
         } else if (tampName === 'tjjh') { // 投决计划模板{
             if (!startYear || !endYear) {
                 errorMessage.paramsError.message = "当前模板开始年份和结束年份不能为空";
@@ -163,6 +167,11 @@ async function getExcelTemplate(req, res, next) {
         else {
             res.status(400).json({ message: '未知的模板名称' });
         }
+        // 3. 将处理后的文件发送给前端
+        res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        res.setHeader('Content-Disposition', 'attachment; filename=' + encodeURIComponent(`${keyName[tampName]}.xlsx`));
+        // 发送文件并结束响应
+        res.end(buffer);
     } catch (error) {
         next(error);
     }
@@ -194,7 +203,7 @@ async function importExcelTempData(req, res, next) {
             const workbook = new ExcelJS.Workbook();
             workbook.calcProperties.fullCalcOnLoad = true;
             await workbook.xlsx.load(req.file.buffer, {
-                ignoreNodes:['relationships', 'styles', 'calcChain', 'drawings', 'core']
+                ignoreNodes: ['relationships', 'styles', 'calcChain', 'drawings', 'core']
             });
             const worksheet = await workbook.getWorksheet(1);
 
@@ -202,7 +211,7 @@ async function importExcelTempData(req, res, next) {
             worksheet.eachRow((row, rowIndex) => {
                 let colText = [];
                 row.eachCell((col, colIndex) => {
-                    console.log(col.result, col.value, "--", col.text,"-", col.toString());
+                    console.log(col.result, col.value, "--", col.text, "-", col.toString());
                     if (rowIndex == 3 && colIndex > 3) {
                         console.log(col);
                         headers.push(col.text);