update

controller/projectTzController.js

@@ -190,14 +190,17 @@ async function createTzkz(req, res, next) {
         }
         //处理文件
         req.body.qtjsmbzdpc = (req.body.qtjsmbzdpc || []).map(o => { return o && o.id || o });
+// 创建提前
+        let ret = await DB.TzTzkz.create(req.body);
+
         //处理财务评价指标
-        let tzkzcwpjs = (req.body.tzkzcwpjs || []).map(o => { o.projectId = req.body.projectId; return o; });
+        let tzkzcwpjs = (req.body.tzkzcwpjs || []).map(o => { o.projectId = req.body.projectId; o.sourceId = ret.id; return o; });
         delete req.body.tzkzcwpjs;
         //处理决策批复意见
-        let tzkzjcpfyjs = (req.body.tzkzjcpfyjs || []).map(o => { o.projectId = req.body.projectId; return o; });;
+        let tzkzjcpfyjs = (req.body.tzkzjcpfyjs || []).map(o => { o.projectId = req.body.projectId;o.sourceId = ret.id;  return o; });;
         delete req.body.tzkzjcpfyjs;
         //处理投资收益
-        let tzkztzsys = (req.body.tzkztzsys || []).map(o => { o.projectId = req.body.projectId; return o; });;
+        let tzkztzsys = (req.body.tzkztzsys || []).map(o => { o.projectId = req.body.projectId;o.sourceId = ret.id;  return o; });;
         delete req.body.tzkztzsys;
         //处理投资额控制
         let flattenArr = [];
@@ -209,14 +212,15 @@ async function createTzkz(req, res, next) {
                 let ei = element[i];
                 ei.groupBy = index;
                 ei.projectId = req.body.projectId;
+                ei.sourceId = ret.id;
                 flattenArr.push(ei);
             }
         }
         //处理安全质量环保
-        let tzkzaqzlhbs = (req.body.tzkzaqzlhbs || []).map(o => { o.projectId = req.body.projectId; return o; });
+        let tzkzaqzlhbs = (req.body.tzkzaqzlhbs || []).map(o => { o.projectId = req.body.projectId; o.sourceId = ret.id; return o; });
         delete req.body.tzkzaqzlhbs;
         //处理工期
-        let tzkzgqs = (req.body.tzkzgqs || []).map(o => { o.projectId = req.body.projectId; return o; });
+        let tzkzgqs = (req.body.tzkzgqs || []).map(o => { o.projectId = req.body.projectId;o.sourceId = ret.id;  return o; });
         delete req.body.tzkzgqs;
 
         //创建
@@ -226,7 +230,6 @@ async function createTzkz(req, res, next) {
         await DB.TzTzkzTzekz.bulkCreate(flattenArr);
         await DB.TzTzkzGq.bulkCreate(tzkzgqs);
         await DB.TzTzkzAqzlhb.bulkCreate(tzkzaqzlhbs);
-        let ret = await DB.TzTzkz.create(req.body);
         return res.sendData(ret);
     } catch (error) {
         next(error);
@@ -237,26 +240,30 @@ async function updateTzkz(req, res, next) {
         if (!req.body.projectId) {
             return res.sendError(errorMessage.paramsError);
         }
+        let ret = await DB.TzTzkz.findOne({where: {id: req.body.id}, raw: true});
+        if(!(ret && ret.id)) {
+            return res.sendError(errorMessage.resourceNotFound);
+        }
         //处理文件
         req.body.qtjsmbzdpc = (req.body.qtjsmbzdpc || []).map(o => { return o && o.id || o });
 
         //处理财务评价指标
         let ids = [], infos = [], newtzkzcwpjs = [];
-        req.body.tzkzcwpjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; newtzkzcwpjs.push(o); } } else { ids.push(o.id); infos.push(o); } return o });
+        req.body.tzkzcwpjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; o.sourceId = ret.id;newtzkzcwpjs.push(o); } } else { ids.push(o.id); infos.push(o); } return o });
         await DB.TzTzkzCwpj.destroy({ where: { projectId: req.body.projectId, id: { [Op.notIn]: ids } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
         await DB.TzTzkzCwpj.bulkCreate(newtzkzcwpjs);//创建新的 没有id的
         await Promise.all(infos.map(item => { DB.TzTzkzCwpj.update(item, { where: { id: item.id } }) }));
         delete req.body.tzkzcwpjs;
         //处理决策批复意见
         let ids1 = [], infos1 = [], newtzkzjcpfyjs = [];
-        req.body.tzkzjcpfyjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; newtzkzjcpfyjs.push(o); } } else { ids1.push(o.id); infos1.push(o); } return o });
+        req.body.tzkzjcpfyjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId;o.sourceId = ret.id; newtzkzjcpfyjs.push(o); } } else { ids1.push(o.id); infos1.push(o); } return o });
         await DB.TzTzkzJcpfyj.destroy({ where: { projectId: req.body.projectId, id: { [Op.notIn]: ids1 } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
         await DB.TzTzkzJcpfyj.bulkCreate(newtzkzjcpfyjs);//创建新的 没有id的
         await Promise.all(infos1.map(item => { DB.TzTzkzJcpfyj.update(item, { where: { id: item.id } }) }));
         delete req.body.tzkzjcpfyjs;
         //处理投资收益
         let ids2 = [], infos2 = [], newtzkztzsys = [];
-        req.body.tzkztzsys.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; newtzkztzsys.push(o); } } else { ids2.push(o.id); infos2.push(o); } return o });
+        req.body.tzkztzsys.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; o.sourceId = ret.id;newtzkztzsys.push(o); } } else { ids2.push(o.id); infos2.push(o); } return o });
         await DB.TzTzkzTzsy.destroy({ where: { projectId: req.body.projectId, id: { [Op.notIn]: ids2 } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
         await DB.TzTzkzTzsy.bulkCreate(newtzkztzsys);//创建新的 没有id的
         await Promise.all(infos2.map(item => { DB.TzTzkzTzsy.update(item, { where: { id: item.id } }) }));
@@ -270,6 +277,7 @@ async function updateTzkz(req, res, next) {
                 let ei = element[i];
                 ei.groupBy = index;
                 ei.projectId = req.body.projectId;
+                ei.sourceId = ret.id;
                 if (!ei.id) {
                     if (!_.isEmpty(ei)) {
                         newtzkztzekzs.push(ei);
@@ -286,14 +294,14 @@ async function updateTzkz(req, res, next) {
 
         //处理工期
         let ids4 = [], infos4 = [], newtzkzgqs = [];
-        req.body.tzkzgqs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; newtzkzgqs.push(o); } } else { ids4.push(o.id); infos4.push(o); } return o });
+        req.body.tzkzgqs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; o.sourceId = ret.id;newtzkzgqs.push(o); } } else { ids4.push(o.id); infos4.push(o); } return o });
         await DB.TzTzkzGq.destroy({ where: { projectId: req.body.projectId, id: { [Op.notIn]: ids4 } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
         await DB.TzTzkzGq.bulkCreate(newtzkzgqs);//创建新的 没有id的
         await Promise.all(infos4.map(item => { DB.TzTzkzGq.update(item, { where: { id: item.id } }) }));
         delete req.body.tzkzgqs;
         //处理环保
         let ids5 = [], infos5 = [], newtzkzaqzlhbs = [];
-        req.body.tzkzaqzlhbs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; newtzkzaqzlhbs.push(o); } } else { ids5.push(o.id); infos5.push(o); } return o });
+        req.body.tzkzaqzlhbs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId;o.sourceId = ret.id; newtzkzaqzlhbs.push(o); } } else { ids5.push(o.id); infos5.push(o); } return o });
         await DB.TzTzkzAqzlhb.destroy({ where: { projectId: req.body.projectId, id: { [Op.notIn]: ids5 } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
         await DB.TzTzkzAqzlhb.bulkCreate(newtzkzaqzlhbs);//创建新的 没有id的
         await Promise.all(infos5.map(item => { DB.TzTzkzAqzlhb.update(item, { where: { id: item.id } }) }));
@@ -361,25 +369,25 @@ async function getTzkzInfo(req, res, next) {
         }
         // 
         let tzkzcwpjs = await DB.TzTzkzCwpj.findAll({
-            where: { projectId: tzkz.projectId },
+            where: { projectId: tzkz.projectId, sourceId: tzkz.id },
             raw: true,
         });
         tzkz.tzkzcwpjs = tzkzcwpjs || [];
 
         let tzkzjcpfyjs = await DB.TzTzkzJcpfyj.findAll({
-            where: { projectId: tzkz.projectId },
+            where: { projectId: tzkz.projectId, sourceId: tzkz.id },
             raw: true
         });
         tzkz.tzkzjcpfyjs = tzkzjcpfyjs || [];
 
         let tzkztzsys = await DB.TzTzkzTzsy.findAll({
-            where: { projectId: tzkz.projectId },
+            where: { projectId: tzkz.projectId, sourceId: tzkz.id },
             raw: true
         });
         tzkz.tzkztzsys = tzkztzsys || [];
 
         let tzkztzekzs = await DB.TzTzkzTzekz.findAll({
-            where: { projectId: tzkz.projectId },
+            where: { projectId: tzkz.projectId, sourceId: tzkz.id },
             raw: true
         });
         tzkz.tzkztzekzs = _.values(_.groupBy(tzkztzekzs, 'groupBy')) || [[]]
@@ -395,11 +403,13 @@ async function createZdfx(req, res, next) {
         if (!req.body.projectId) {
             return res.sendError(errorMessage.paramsError);
         }
+        let ret = await DB.TzZdfx.create(req.body);
+
         // //处理财务指标
         // let zdfxcwzbs = (req.body.zdfxcwzbs || []).map(o => { o.projectId = req.body.projectId; return o; });
         // delete req.body.zdfxcwzbs;
         //处理风险处置
-        let zdfxczs = (req.body.zdfxczs || []).map(o => { o.projectId = req.body.projectId; return o; });
+        let zdfxczs = (req.body.zdfxczs || []).map(o => { o.projectId = req.body.projectId; o.sourceId = ret.id; return o; });
         delete req.body.zdfxczs;
         // // 处理风险情况
         // let zdfxqks = (req.body.zdfxqks || []).map(o => { o.projectId = req.body.projectId; return o; });
@@ -408,7 +418,6 @@ async function createZdfx(req, res, next) {
         // await DB.TzZdfxcwzb.bulkCreate(zdfxcwzbs);
         await DB.TzZdfxcz.bulkCreate(zdfxczs);
         // await DB.TzZdfxqk.bulkCreate(zdfxqks);
-        let ret = await DB.TzZdfx.create(req.body);
         return res.sendData(ret);
     } catch (error) {
         next(error);
@@ -432,7 +441,7 @@ async function getZdfxInfo(req, res, next) {
             return res.sendError(errorMessage.resourceNotFound);
         }
         // let zdfxcwzbs = await DB.TzZdfxcwzb.findAll({ where: { projectId: zdfx.projectId }, raw: true });
-        let zdfxczs = await DB.TzZdfxcz.findAll({ where: { projectId: zdfx.projectId }, raw: true });
+        let zdfxczs = await DB.TzZdfxcz.findAll({ where: { projectId: zdfx.projectId, sourceId: zdfx.id }, raw: true });
         // let zdfxqks = await DB.TzZdfxqk.findAll({ where: { projectId: zdfx.projectId }, raw: true });
         // zdfx.zdfxcwzbs = zdfxcwzbs;
         zdfx.zdfxczs = zdfxczs;
@@ -447,6 +456,10 @@ async function updateZdfx(req, res, next) {
         if (!req.body.projectId) {
             return res.sendError(errorMessage.paramsError);
         }
+        let ret = await DB.TzZdfx.findOne({where: {id: req.body.id}, raw: true});
+        if(!(ret && ret.id)) {
+            return res.sendError(errorMessage.resourceNotFound);
+        }
         // //处理财务指标
         // let ids = [], infos = [], newzdfxcwzbs = [];
         // req.body.zdfxcwzbs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; newzdfxcwzbs.push(o); } } else { ids.push(o.id); infos.push(o); } return o });
@@ -456,7 +469,7 @@ async function updateZdfx(req, res, next) {
         // delete req.body.zdfxcwzbs;
         //处理风险处置
         let ids1 = [], infos1 = [], newzdfxczs = [];
-        req.body.zdfxczs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; newzdfxczs.push(o); } } else { ids1.push(o.id); infos1.push(o); } return o });
+        req.body.zdfxczs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = req.body.projectId; o.sourceId = ret.id;newzdfxczs.push(o); } } else { ids1.push(o.id); infos1.push(o); } return o });
         await DB.TzZdfxcz.destroy({ where: { projectId: req.body.projectId, id: { [Op.notIn]: ids1 } } }); // 删除id不在传入id数组里面的（用户在界面删除的）
         await DB.TzZdfxcz.bulkCreate(newzdfxczs);//创建新的 没有id的
         await Promise.all(infos1.map(item => { DB.TzZdfxcz.update(item, { where: { id: item.id } }) }));
@@ -469,8 +482,8 @@ async function updateZdfx(req, res, next) {
         // await Promise.all(infos2.map(item => { DB.TzZdfxcwzb.update(item, { where: { id: item.id } }) }));
         // delete req.body.zdfxqks;
 
-        let ret = await DB.TzZdfx.update(req.body, { where: { id: req.body.id } });
-        return res.sendData(ret);
+        await DB.TzZdfx.update(req.body, { where: { id: req.body.id } });
+        return res.sendData();
     } catch (error) {
         next(error);
     }

db/model/jt/tzZdfxcz.js

@@ -68,6 +68,10 @@ const TzZdfxcz = sequelize.define('TzZdfxcz', {
         comment: "风险发现方式"
     },
 
+ sourceId: {
+        type: DataTypes.INTEGER,
+        comment: "所属投资控制主表id"
+    },
     projectId: {
         type: DataTypes.INTEGER,
         comment: "所属项目ID",