update

controller/projectTzController.js

@@ -180,6 +180,23 @@ async function getTzmbzrsInfo(req, res, next) {
     }
 }
 
+async function getProTzmbzrs(req, res, next) {
+    try {
+        if(!req.body.projectId) {
+            return res.sendError(errorMessage.paramsError);
+        }
+        let mbzrss = await DB.TzTzmbzrs.findAll({
+            where: {projectId: req.body.projectId, del: 0},
+            attributes: ['zrslx'],
+            raw: true
+        });
+        mbzrss = _.compact(mbzrss.map(o => {return o.zrslx}));
+        return res.sendData(mbzrss);
+    } catch (error) {
+        next(error);
+    }
+}
+
 
 async function createTzkz(req, res, next) {
     try {
@@ -992,10 +1009,11 @@ async function createXmtc(req, res, next) {
         }
         // 1. 文件
         req.body.tcwj = (req.body.tcwj || []).map(o => { return o && o.id || o });
-        let tccwzbs = (req.body.tccwzbs || []).map(o => { o.projectId = req.body.projectId; return o; });
+        let ret = await DB.TzXmtc.create(req.body);
+
+        let tccwzbs = (req.body.tccwzbs || []).map(o => { o.projectId = req.body.projectId;o.sourceId = ret.id; return o; });
         delete req.body.tccwzbs;
         await DB.TzXmtcCwzb.bulkCreate(tccwzbs);
-        let ret = await DB.TzXmtc.create(req.body);
         return res.sendData(ret);
     } catch (error) {
         next(error);
@@ -1019,7 +1037,7 @@ async function getXmtcInfo(req, res, next) {
             return res.sendError(errorMessage.resourceNotFound);
         }
         let tccwzbs = await DB.TzXmtcCwzb.findAll({
-            where: { projectId: xmtc.projectId },
+            where: { projectId: xmtc.projectId, sourceId: xmtc.id },
             raw: true,
         });
 
@@ -1039,6 +1057,7 @@ async function updateXmtc(req, res, next) {
         for (let index = 0; index < tccwzbs.length; index++) {
             const element = tccwzbs[index];
             element.projectId = req.body.projectId;
+            element.sourceId = req.body.id;
             element.wj = (element.wj || []).map(o => { return o && o.id || o });
             if (element.id) {
                 ids.push(element.id);
@@ -1047,7 +1066,7 @@ async function updateXmtc(req, res, next) {
                 newArr.push(element);
             }
         }
-        await DB.TzXmtcCwzb.destroy({ where: { projectId: req.body.projectId, id: { [Op.notIn]: ids } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
+        await DB.TzXmtcCwzb.destroy({ where: { projectId: req.body.projectId, sourceId: req.body.id, id: { [Op.notIn]: ids } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
         await DB.TzXmtcCwzb.bulkCreate(newArr);//创建新的 没有id的
         await Promise.all(info.map(item => { return DB.TzXmtcCwzb.update(item, { where: { id: item.id } }) }));
         delete req.body.tccwzbs;
@@ -1097,6 +1116,7 @@ async function deleteTzmbzrsInfo(req, res, next) {
         next(error);
     }
 }
+
 async function deleteTzkz(req, res, next) {
     try {
         await DB.TzTzkz.update({ del: 1 }, { where: { id: req.body.id } });
@@ -1174,4 +1194,5 @@ module.exports = {
     deleteJsqtzhs,
     deleteJsqtzjc,
     deleteZdsxsp,
+    getProTzmbzrs,
 }
\ No newline at end of file

db/model/jt/thTzhpj.js

@@ -22,11 +22,50 @@ const ThTzhpj = sequelize.define('ThTzhpj', {
         type: DataTypes.JSON,
         comment: "后评价报告",
     },
+    hpjsj: {
+        type: DataTypes.DATE,
+        get() {
+            const rawValue = this.getDataValue('hpjsj');
+            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+        }
+    },
+    hpjbgbzdw: {
+        type: DataTypes.STRING,
+        comment: "报告编制单位",
+    },
+    hpjpsdw: {
+        type: DataTypes.STRING,
+        comment: "评审单位",
+    },
+    hpjpjjg: {
+        type: DataTypes.TEXT,
+        comment: "后评价评价结果",
+    },
+
+
     qsmzqpj: {
         type: DataTypes.JSON,
         comment: "全生命周期评价",
     },
-
+    qsmsj: {
+        type: DataTypes.DATE,
+        get() {
+            const rawValue = this.getDataValue('qsmsj');
+            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+        }
+    },
+    qsmbgbzdw: {
+        type: DataTypes.STRING,
+        comment: "全生命报告编制单位",
+    },
+    qsmpsdw: {
+        type: DataTypes.STRING,
+        comment: "全生命评审单位",
+    },
+    qsmpjjg: {
+        type: DataTypes.TEXT,
+        comment: "全生命评价结果",
+    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",
@@ -59,9 +98,9 @@ const ThTzhpj = sequelize.define('ThTzhpj', {
 
 // 同步模型到数据库（创建表）
 ThTzhpj.sync({
-    force: false,
+    // force: false,
     // force: true ,//会删除已存在表并重新创建
-    // alter: true
+    alter: true
 })
     .then(() => {
         console.log('ThTzhpj 表同步成功');

db/model/jt/thTzhpjwtzg.js

@@ -41,7 +41,10 @@ const ThTzhpjwtzg = sequelize.define('ThTzhpjwtzg', {
         type: DataTypes.INTEGER,
         comment: "是否关闭",
     },
-
+     sourceId: {
+        type: DataTypes.INTEGER,
+        comment: "所属投资控制主表id"
+    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",
@@ -74,9 +77,9 @@ const ThTzhpjwtzg = sequelize.define('ThTzhpjwtzg', {
 
 // 同步模型到数据库（创建表）
 ThTzhpjwtzg.sync({
-    force: false,
+    // force: false,
     // force: true ,//会删除已存在表并重新创建
-    // alter: true
+    alter: true
 })
     .then(() => {
         console.log('ThTzhpjwtzg 表同步成功');

db/model/jt/thYyqtzhszb.js

@@ -48,7 +48,10 @@ const ThYyqtzhszb = sequelize.define('ThYyqtzhszb', {
         type: DataTypes.INTEGER,
         comment: "分组"
     },
-
+ sourceId: {
+        type: DataTypes.INTEGER,
+        comment: "所属投资控制主表id"
+    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",

db/model/jt/thYyqtzjcTzfx.js

@@ -28,7 +28,10 @@ const ThYyqtzjcTzfx = sequelize.define('ThYyqtzjcTzfx', {
         type: DataTypes.JSON,
         comment: "投资（成本）分析会资料"
     },
-    
+     sourceId: {
+        type: DataTypes.INTEGER,
+        comment: "所属投资控制主表id"
+    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",

db/model/jt/thYyqtzjcZxjc.js

@@ -38,7 +38,10 @@ const ThYyqtzjcZxjc = sequelize.define('ThYyqtzjcZxjc', {
         comment: "附件材料"
     },
 
-
+ sourceId: {
+        type: DataTypes.INTEGER,
+        comment: "所属投资控制主表id"
+    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",

db/model/jt/thYyqtzjcrcjc.js

 
 
 
-const { DataTypes } = require('sequelize');
-const sequelize = require('../index');
-const moment = require('moment');
+// const { DataTypes } = require('sequelize');
+// const sequelize = require('../index');
+// const moment = require('moment');
 
-//投中管理-  建设期投资检查 ---日常检查  对投资目标偏差每半年进行一次系统盘点，上传分析材料
-const ThYyqtzjcrcjc = sequelize.define('ThYyqtzjcrcjc', {
-    id: {
-        type: DataTypes.INTEGER,
-        primaryKey: true,
-        autoIncrement: true
-    },
-    kssj: {
-        type: DataTypes.DATE,
-        comment: "开始时间",
-        get() {
-            const rawValue = this.getDataValue('kssj');
-            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
-        }
-    },
-    jssj: {
-        type: DataTypes.DATE,
-        comment: "结束时间",
-        get() {
-            const rawValue = this.getDataValue('jssj');
-            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
-        }
-    },
-    pdnrsm: {
-        type: DataTypes.TEXT,
-        comment: "盘点内容说明"
-    },
-    fxcl: {
-        type: DataTypes.JSON,
-        comment: "分析材料"
-    },
+// //投中管理-  建设期投资检查 ---日常检查  对投资目标偏差每半年进行一次系统盘点，上传分析材料
+// const ThYyqtzjcrcjc = sequelize.define('ThYyqtzjcrcjc', {
+//     id: {
+//         type: DataTypes.INTEGER,
+//         primaryKey: true,
+//         autoIncrement: true
+//     },
+//     kssj: {
+//         type: DataTypes.DATE,
+//         comment: "开始时间",
+//         get() {
+//             const rawValue = this.getDataValue('kssj');
+//             return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+//         }
+//     },
+//     jssj: {
+//         type: DataTypes.DATE,
+//         comment: "结束时间",
+//         get() {
+//             const rawValue = this.getDataValue('jssj');
+//             return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+//         }
+//     },
+//     pdnrsm: {
+//         type: DataTypes.TEXT,
+//         comment: "盘点内容说明"
+//     },
+//     fxcl: {
+//         type: DataTypes.JSON,
+//         comment: "分析材料"
+//     },
 
 
-    projectId: {
-        type: DataTypes.INTEGER,
-        comment: "所属项目ID",
-    },
-    del: {
-        type: DataTypes.INTEGER,
-        defaultValue: 0,
-        comment: "0 正常 1 删除"
-    },
-    createdAt: {
-        type: DataTypes.DATE,
-        defaultValue: new Date(),
-        get() {
-            const rawValue = this.getDataValue('createdAt');
-            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
-        }
-    },
-    updatedAt: { // 同样处理 updatedAt
-        type: DataTypes.DATE,
-        defaultValue: new Date(),
-        get() {
-            const rawValue = this.getDataValue('updatedAt');
-            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
-        }
-    }
-}, {
-    tableName: 'jt_th_yyqtzjcrcjc', // 指定表名（如果与模型名不同）
-    timestamps: true, // 是否自动添加 createdAt 和 updatedAt 字段（覆盖全局设置）
-});
+//     projectId: {
+//         type: DataTypes.INTEGER,
+//         comment: "所属项目ID",
+//     },
+//     del: {
+//         type: DataTypes.INTEGER,
+//         defaultValue: 0,
+//         comment: "0 正常 1 删除"
+//     },
+//     createdAt: {
+//         type: DataTypes.DATE,
+//         defaultValue: new Date(),
+//         get() {
+//             const rawValue = this.getDataValue('createdAt');
+//             return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+//         }
+//     },
+//     updatedAt: { // 同样处理 updatedAt
+//         type: DataTypes.DATE,
+//         defaultValue: new Date(),
+//         get() {
+//             const rawValue = this.getDataValue('updatedAt');
+//             return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+//         }
+//     }
+// }, {
+//     tableName: 'jt_th_yyqtzjcrcjc', // 指定表名（如果与模型名不同）
+//     timestamps: true, // 是否自动添加 createdAt 和 updatedAt 字段（覆盖全局设置）
+// });
 
-// 同步模型到数据库（创建表）
-ThYyqtzjcrcjc.sync({
-    // force: false,
-    // force: true ,//会删除已存在表并重新创建
-    alter: true
-})
-    .then(() => {
-        console.log('ThYyqtzjcrcjc 表同步成功');
-    });
+// // 同步模型到数据库（创建表）
+// ThYyqtzjcrcjc.sync({
+//     // force: false,
+//     // force: true ,//会删除已存在表并重新创建
+//     alter: true
+// })
+//     .then(() => {
+//         console.log('ThYyqtzjcrcjc 表同步成功');
+//     });
 
 
-module.exports = ThYyqtzjcrcjc;
+// module.exports = ThYyqtzjcrcjc;
\ No newline at end of file

db/model/jt/tzXmtcCwzb.js

@@ -20,7 +20,10 @@ const TzXmtcCwzb = sequelize.define('TzXmtcCwzb', {
         comment: "指标数值",
     },
 
-
+ sourceId: {
+        type: DataTypes.INTEGER,
+        comment: "所属投资控制主表id"
+    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",

router/projectRouter.js

@@ -53,14 +53,16 @@ router.post('/getProFlowRecord', projectController.getProFlowRecord)
  * 投中管理
  */
 
-//目标责任书
+//2.1 目标责任书
 router.post('/createTzmbzrs', projectTzController.createTzmbzrs);
 router.post('/updateTzmbzrs', projectTzController.updateTzmbzrs);
 router.post('/getTzmbzrsList', projectTzController.getTzmbzrsList);
 router.post('/getTzmbzrsInfo', projectTzController.getTzmbzrsInfo);
 router.post('/deleteTzmbzrs', projectTzController.deleteTzmbzrsInfo);
 
-//投资控制
+router.post('/getProTzmbzrs', projectTzController.getProTzmbzrs);
+
+//2.2 投资控制
 
 router.post('/createTzkz', projectTzController.createTzkz);
 router.post('/updateTzkz', projectTzController.updateTzkz);
@@ -68,27 +70,27 @@ router.post('/deleteTzkz', projectTzController.deleteTzkz);
 router.post('/getTzkzList', projectTzController.getTzkzList);
 router.post('/getTzkzInfo', projectTzController.getTzkzInfo);
 
-//重大风险防控
+//2.3 重大风险防控
 router.post('/createZdfx', projectTzController.createZdfx);
 router.post('/updateZdfx', projectTzController.updateZdfx);
 router.post('/deleteZdfx', projectTzController.deleteZdfx);
 router.post('/getZdfxList', projectTzController.getZdfxList);
 router.post('/getZdfxInfo', projectTzController.getZdfxInfo);
 
-//建设期投资回收
+//2.4 建设期投资回收
 router.post('/createJsqtzhs', projectTzController.createJsqtzhs);
 router.post('/updateJsqtzhs', projectTzController.updateJsqtzhs);
 router.post('/deleteJsqtzhs', projectTzController.deleteJsqtzhs);
 router.post('/getJsqtzhsList', projectTzController.getJsqtzhsList);
 router.post('/getJsqtzhsInfo', projectTzController.getJsqtzhsInfo);
 
-//建设期投资检查
+//2.5 建设期投资检查
 router.post('/createJsqtzjc', projectTzController.createJsqtzjc);
 router.post('/updateJsqtzjc', projectTzController.updateJsqtzjc);
 router.post('/deleteJsqtzjc', projectTzController.deleteJsqtzjc);
 router.post('/getJsqtzjcList', projectTzController.getJsqtzjcList);
 router.post('/getJsqtzjcInfo', projectTzController.getJsqtzjcInfo);
-//重大事项审批
+//2.6 重大事项审批
 router.post('/createZdsxsp', projectTzController.createZdsxsp);
 router.post('/updateZdsxsp', projectTzController.updateZdsxsp);
 router.post('/deleteZdsxsp', projectTzController.deleteZdsxsp);
@@ -96,7 +98,7 @@ router.post('/getZdsxspList', projectTzController.getZdsxspList);
 router.post('/getZdsxspInfo', projectTzController.getZdsxspInfo);
 
 
-//项目退出-------以下sourceId待改
+//2.8 项目退出-------以下sourceId待改
 router.post('/createXmtc', projectTzController.createXmtc);
 router.post('/updateXmtc', projectTzController.updateXmtc);
 router.post('/getXmtcList', projectTzController.getXmtcList);
@@ -107,24 +109,24 @@ router.post('/getXmtcInfo', projectTzController.getXmtcInfo);
  * 投后
  */
 
-//运营期投资回收
+//运营期投资回收  --- 参考建设期投资回收
 router.post('/createYyqtzhs', projectThController.createYyqtzhs);
 router.post('/updateYyqtzhs', projectThController.updateYyqtzhs);
 router.post('/getYyqtzhsList', projectThController.getYyqtzhsList);
 router.post('/getYyqtzhsInfo', projectThController.getYyqtzhsInfo);
 
-// 运营期投资检查
+//3.2 运营期投资检查  参考建设期投资检查
 router.post('/createYyqtzjc', projectThController.createYyqtzjc);
 router.post('/updateYyqtzjc', projectThController.updateYyqtzjc);
 router.post('/getYyqtzjcList', projectThController.getYyqtzjcList);
 router.post('/getYyqtzjcInfo', projectThController.getYyqtzjcInfo);
 
-//投资后评价
+//3.3 投资后评价
 router.post('/createTzhpj', projectThController.createTzhpj);
 router.post('/updateTzhpj', projectThController.updateTzhpj);
 router.post('/getTzhpjList', projectThController.getTzhpjList);
 router.post('/getTzhpjInfo', projectThController.getTzhpjInfo);
-//移交管理
+//3.4 移交管理
 router.post('/createYjgl', projectThController.createYjgl);
 router.post('/updateYjgl', projectThController.updateYjgl);
 router.post('/getYjglList', projectThController.getYjglList);