update

controller/projectTzController.js

@@ -206,11 +206,15 @@ async function createTzkz(req, res, next) {
         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];
+            element.tables = element.tables || [];
+            for (let i = 0; i < element.tables.length; i++) {
+                let ei = element.tables[i];
                 ei.groupBy = index;
                 ei.projectId = req.body.projectId;
                 ei.sourceId = ret.id;
+                ei.bqsj = element.bqsj;
+                ei.sqsj = element.sqsj;
+                ei.key = element.key;
                 flattenArr.push(ei);
             }
         }
@@ -271,11 +275,15 @@ async function updateTzkz(req, res, next) {
         let ids3 = [], infos3 = [], newtzkztzekzs = [];
         for (let index = 0; index < tzkztzekzs.length; index++) {
             const element = tzkztzekzs[index];
-            for (let i = 0; i < element.length; i++) {
-                let ei = element[i];
+            element.tables = element.tables || [];
+            for (let i = 0; i < element.tables.length; i++) {
+                let ei = element.tables[i];
                 ei.groupBy = index;
                 ei.projectId = req.body.projectId;
                 ei.sourceId = ret.id;
+                ei.bqsj = element.bqsj;
+                ei.sqsj = element.sqsj;
+                ei.key = element.key;
                 if (!ei.id) {
                     if (!_.isEmpty(ei)) {
                         newtzkztzekzs.push(ei);
@@ -388,8 +396,20 @@ async function getTzkzInfo(req, res, next) {
             where: { projectId: tzkz.projectId, sourceId: tzkz.id },
             raw: true
         });
-        tzkz.tzkztzekzs = _.values(_.groupBy(tzkztzekzs, 'groupBy')) || [[]]
-
+        let tzeGroupByObj = _.groupBy(tzkztzekzs, 'groupBy');
+        let keyindexs = _.keys(tzeGroupByObj);
+        let newTze = [];
+        for (let index = 0; index < keyindexs.length; index++) {
+            const element = keyindexs[index];
+            let obj ={
+                tables: tzeGroupByObj[element],
+                bqsj: tzeGroupByObj[element] && tzeGroupByObj[element][0] && tzeGroupByObj[element][0].bqsj  ,
+                sqsj:tzeGroupByObj[element] && tzeGroupByObj[element][0] && tzeGroupByObj[element][0].sqsj,
+                key: tzeGroupByObj[element] && tzeGroupByObj[element][0] && tzeGroupByObj[element][0].key,
+            };
+            newTze.push(obj);
+        }
+        tzkz.tzkztzekzs = newTze;
         return res.sendData(tzkz);
     } catch (error) {
         next(error);

db/model/jt/tzTzkzTzekz.js

@@ -34,7 +34,7 @@ const TzTzkzTzekz = sequelize.define('TzTzkzTzekz', {
         comment: "批复概算",
     },
     tkjgs: {
-        type:DataTypes.DECIMAL(20, 8),
+        type: DataTypes.DECIMAL(20, 8),
         comment: "同口径概算",
     },
     pfys: {
@@ -77,7 +77,9 @@ const TzTzkzTzekz = sequelize.define('TzTzkzTzekz', {
         type: DataTypes.STRING,
         comment: "竣工决算审计",
     },
-
+    key: {
+        type: DataTypes.STRING,
+    },
     // tzkzId: {
     //     type: DataTypes.INTEGER,
     //     comment: "所属投资控制主表id",