update

controller/projectRcController.js

@@ -225,6 +225,9 @@ async function getTzghList(req, res, next) {
         if (req.body.planYear) {
             where.planYear = req.body.planYear;
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
         if (req.body.attributes && req.body.attributes.length) {
             search.attributes = req.body.attributes;

controller/projectThController.js

@@ -135,6 +135,9 @@ async function getYyqtzhsList(req, res, next) {
                 del: 0
             }
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -339,6 +342,9 @@ async function getYyqtzjcList(req, res, next) {
         //         del: 0
         //     }
         // }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -422,6 +428,9 @@ async function getTzhpjList(req, res, next) {
         //         del: 0
         //     }
         // }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -519,6 +528,9 @@ async function getYjglList(req, res, next) {
         //         del: 0
         //     }
         // }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {

controller/projectTzController.js

@@ -122,6 +122,9 @@ async function getTzmbzrsList(req, res, next) {
                 del: 0
             }
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -406,6 +409,9 @@ async function getTzkzList(req, res, next) {
                 del: 0
             }
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -622,6 +628,9 @@ async function getZdfxList(req, res, next) {
                 del: 0
             }
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -757,6 +766,9 @@ async function getJsqtzhsList(req, res, next) {
                 del: 0
             }
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -963,6 +975,9 @@ async function getJsqtzjcList(req, res, next) {
         //         del: 0
         //     }
         // }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
         search.raw = true;
         if (req.body.attributes && req.body.attributes.length) {
@@ -1102,6 +1117,9 @@ async function getZdsxspList(req, res, next) {
                 del: 0
             }
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {
@@ -1220,6 +1238,9 @@ async function getXmtcList(req, res, next) {
                 del: 0
             }
         }
+        if(req.body.projectId) {
+            where.projectId = req.body.projectId;
+        }
         search.where = where;
 
         if (req.body.attributes && req.body.attributes.length) {

db/model/jt/project.js

@@ -238,7 +238,7 @@ const Project = sequelize.define('Project', {
     // 投资主体审核情况 -- 立项已经建表
     // qthysyqk: { type: DataTypes.TEXT, allowNull: true, comment: "其他会议审议情况" },
     jcqthysyqk: { type: DataTypes.TEXT, allowNull: true, comment: "决策-其他会议审议情况", _mark: 'juece', },
-    jczzpfyj: { type: DataTypes.STRING, allowNull: true, comment: "决策-最终批复意见", _mark: 'juece', },
+    jczzpfyj: { type: DataTypes.STRING(10), allowNull: true, comment: "决策-最终批复意见", _mark: 'juece', },
     jcxmpfsj: { type: DataTypes.DATE, allowNull: true, comment: "决策-项目批复时间", _mark: 'juece', },
     jcxmpfwh: { type: DataTypes.STRING, allowNull: true, comment: "决策-项目批复文号", _mark: 'juece', },
     jcwtgzyyyyyq: { type: DataTypes.TEXT, allowNull: true, comment: "决策-未通过主要原因与要求", _mark: 'juece', },
@@ -518,7 +518,7 @@ const Project = sequelize.define('Project', {
     },
     "mgxfx": {
         "name": "经济可行性-敏感性分析",
-        "type": DataTypes.STRING,
+        "type": DataTypes.TEXT,
     },
     "gcsy": {
         "name": "工程收益",