update

controller/projectTzController.js

@@ -16,9 +16,9 @@ async function createTzmbzrs(req, res, next) {
             return res.sendError(errorMessage.paramsError);
         }
         //处理文件参数
-        req.body.zrswj = (req.body.zrswj || []).map(o => { return o && o.id });
-        req.body.chwj = (req.body.chwj || []).map(o => { return o && o.id });
-        req.body.jyglzrs = (req.body.jyglzrs || []).map(o => { return o && o.id });
+        req.body.zrswj = (req.body.zrswj || []).map(o => { return o && o.id || o });
+        req.body.chwj = (req.body.chwj || []).map(o => { return o && o.id || o });
+        req.body.jyglzrs = (req.body.jyglzrs || []).map(o => { return o && o.id || o });
         //处理 责任指标 表
         let tzmbzrsZbs = (req.body.tzmbzrsZbs || []).map(o => { o.projectId = req.body.projectId; return o });
         delete req.body.tzmbzrsZbs;
@@ -132,10 +132,76 @@ async function getTzmbzrsInfo(req, res, next) {
     }
 }
 
+async function createTzkz(req, res, next) {
+    try {
+        if(!req.body.projectId) {
+            return res.sendError(errorMessage.paramsError);
+        }
+        //处理文件
+        req.body.qtjsmbzdpc = (req.body.qtjsmbzdpc || []).map(o => {return o && o.id || o});
+        //处理财务评价指标
+        let tzkzcwpjs = (req.body.tzkzcwpjs || []).map(o => {o.projectId = req.body.projectId; return o;});
+        delete req.body.tzkzcwpjs;
+        //处理决策批复意见
+        let tzkzjcpfyjs = (req.body.tzkzjcpfyjs || []).map(o => {o.projectId = req.body.projectId; return o;});;
+        delete req.body.tzkzjcpfyjs;
+        //处理投资收益
+        let tzkztzsys = (req.body.tzkztzsys || []).map(o => {o.projectId = req.body.projectId; return o;});;
+        delete req.body.tzkztzsys;
+        //处理投资额控制
+        let flattenArr = [];
+        let tzkztzekzs = req.body.tzkztzekzs || [[]]; //二维数组 多次上报
+        delete req.body.tzkztzekzs;
+        for (let index = 0; index < tzkztzekzs.length; index++) {
+            const element = tzkztzekzs[index];
+            for (let i = 0; i < element.length; i++) {
+                let ei = element[i];
+                ei.groupBy = index;
+                ei.projectId = req.body.projectId;
+                flattenArr.push(ei);
+            }
+        }
+        //创建
+        await DB.TzTzkzCwpj.bulkCreate(tzkzcwpjs);
+        await DB.TzTzkzJcpfyj.bulkCreate(tzkzjcpfyjs);
+        await DB.TzTzkzTzsy.bulkCreate(tzkztzsys);
+        await DB.TzTzkzTzekz.bulkCreate(flattenArr);
+        let ret = await DB.TzTzkz.create(req.body);
+        return res.sendData(ret);
+    } catch (error) {
+        next(error);
+    }
+}
+async function updateTzkz(req, res, next) {
+    try {
+        //
+    } catch (error) {
+        next(error);
+    }
+}
+async function getTzkzList(req, res, next) {
+    try {
+        //
+    } catch (error) {
+        next(error);
+    }
+}
+async function getTzkzInfo(req, res, next) {
+    try {
+        //
+    } catch (error) {
+        next(error);
+    }
+}
+
 
 module.exports = {
     createTzmbzrs,
     updateTzmbzrs,
     getTzmbzrsList,
-    getTzmbzrsInfo
+    getTzmbzrsInfo,
+    createTzkz,
+    getTzkzInfo,
+    getTzkzList,
+    updateTzkz,
 }
\ No newline at end of file

db/index.js

@@ -42,7 +42,7 @@ const TzTzmbzrs = require("./model/jt/tzTzmbzrs");
 const TzTzmbzrsZb = require("./model/jt/tzTzmbzrsZb");
 
 const TzTzkz = require("./model/jt/tzTzkz");
-const TzTzjzJcpfyj = require("./model/jt/tzTzjzJcpfyj");
+const TzTzkzJcpfyj = require("./model/jt/tzTzkzJcpfyj");
 const TzTzkzTzekz = require("./model/jt/tzTzkzTzekz");
 const TzTzkzCwpj = require("./model/jt/tzTzkzCwpj");
 const TzTzkzTzsy = require('./model/jt/tzTzkzTzsy');
@@ -89,7 +89,7 @@ global.DB = {
   TzTzmbzrs,
   TzTzmbzrsZb,
   TzTzkz,
-  TzTzjzJcpfyj,
+  TzTzkzJcpfyj,
   TzTzkzTzekz,
   TzTzkzCwpj,
   TzTzkzTzsy,

db/model/jt/tzTzkzCwpj.js

@@ -31,11 +31,6 @@ const TzTzkzCwpj = sequelize.define('TzTzkzCwpj', {
         comment: "主要差异说明",
     },
 
-
-    tzkzId: {
-        type: DataTypes.INTEGER,
-        comment: "所属投资控制主表id",
-    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",

db/model/jt/tzTzjzJcpfyj.js → db/model/jt/tzTzkzJcpfyj.js

@@ -4,7 +4,7 @@ const moment = require('moment');
 
 //投中管理-投资控制 -批复意见落实情况表 --  决策条件落实情况
 
-const TzTzjzJcpfyj = sequelize.define('TzTzjzJcpfyj', {
+const TzTzkzJcpfyj = sequelize.define('TzTzkzJcpfyj', {
     id: {
         type: DataTypes.INTEGER,
         primaryKey: true,
@@ -83,10 +83,10 @@ const TzTzjzJcpfyj = sequelize.define('TzTzjzJcpfyj', {
         comment: "备注"
     },
 
-    tzkzId: {
-        type: DataTypes.INTEGER,
-        comment: "所属投资控制主表id",
-    },
+    // tzkzId: {
+    //     type: DataTypes.INTEGER,
+    //     comment: "所属投资控制主表id",
+    // },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",
@@ -118,14 +118,14 @@ const TzTzjzJcpfyj = sequelize.define('TzTzjzJcpfyj', {
 });
 
 // 同步模型到数据库（创建表）
-TzTzjzJcpfyj.sync({
+TzTzkzJcpfyj.sync({
     force: false,
     // force: true ,//会删除已存在表并重新创建
     // alter: true
 })
     .then(() => {
-        console.log('TzTzjzJcpfyj 表同步成功');
+        console.log('TzTzkzJcpfyj 表同步成功');
     });
 
 
-module.exports = TzTzjzJcpfyj;
\ No newline at end of file
+module.exports = TzTzkzJcpfyj;
\ No newline at end of file

db/model/jt/tzTzkzTzekz.js

@@ -25,7 +25,7 @@ const TzTzkzTzekz = sequelize.define('TzTzkzTzekz', {
         type: DataTypes.INTEGER,
         comment: "决策估算",
     },
-    pfgs: {
+    pfgusuan: {
         type: DataTypes.INTEGER,
         comment: "批复估算",
     },
@@ -69,13 +69,16 @@ const TzTzkzTzekz = sequelize.define('TzTzkzTzekz', {
         type: DataTypes.DATE,
         comment: "上期时间",
     },
-
-
-
-    tzkzId: {
+    groupBy: {
         type: DataTypes.INTEGER,
-        comment: "所属投资控制主表id",
+        comment: "用来分组 区分期数"
     },
+
+
+    // tzkzId: {
+    //     type: DataTypes.INTEGER,
+    //     comment: "所属投资控制主表id",
+    // },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",

db/model/jt/tzTzkzTzsy.js

@@ -10,15 +10,16 @@ const TzTzkzTzsy = sequelize.define('TzTzkzTzsy', {
         primaryKey: true,
         autoIncrement: true
     },
+    xh: { type: DataTypes.STRING, allowNull: true, comment: "序号" },
     pjzb: { type: DataTypes.STRING, allowNull: true, comment: "评价指标" },
     jczb: { type: DataTypes.STRING, comment: '决策指标' },
     xzzb: { type: DataTypes.STRING, comment: '现状指标' },
 
 
-    tzkzId: {
-        type: DataTypes.INTEGER,
-        comment: "所属投资控制主表id",
-    },
+    // tzkzId: {
+    //     type: DataTypes.INTEGER,
+    //     comment: "所属投资控制主表id",
+    // },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",

db/model/jt/tzTzmbzrs.js

@@ -12,6 +12,7 @@ const TzTzmbzrs = sequelize.define('TzTzmbzrs', {
 
     projectName: {
         type: DataTypes.STRING,
+        comment: "项目名称",
     },
     tzzt: {
         type: DataTypes.STRING,
@@ -21,6 +22,10 @@ const TzTzmbzrs = sequelize.define('TzTzmbzrs', {
         type: DataTypes.STRING,
         comment: "项目地点",
     },
+    zrslx: {
+        type: DataTypes.STRING,
+        comment: "责任书类型  全生命周期投资目标责任书、建设投资目标责任书、运营期投资目标责任书、年度投资目标责任书文件",
+    },
     xmkgrq: {
         type: DataTypes.DATE,
         get() {
@@ -82,9 +87,9 @@ const TzTzmbzrs = sequelize.define('TzTzmbzrs', {
 
 // 同步模型到数据库（创建表）
 TzTzmbzrs.sync({
-    force: false,
+    // force: false,
     // force: true ,//会删除已存在表并重新创建
-    // alter: true
+    alter: true
 })
     .then(() => {
         console.log('TzTzmbzrs 表同步成功');

router/projectRouter.js

@@ -54,6 +54,12 @@ router.post('/updateTzmbzrs', projectTzController.updateTzmbzrs);
 router.post('/getTzmbzrsList', projectTzController.getTzmbzrsList);
 router.post('/getTzmbzrsInfo', projectTzController.getTzmbzrsInfo);
 
+//投资控制
+
+router.post('/createTzkz', projectTzController.createTzkz);
+router.post('/updateTzkz', projectTzController.updateTzkz);
+router.post('/getTzkzList', projectTzController.getTzkzList);
+router.post('/getTzkzInfo', projectTzController.getTzkzInfo);