update

db/model/jt/projectBjtj.js

@@ -14,7 +14,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
         comment: "业务类型"
     },
     dwgczjSz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "单位工程造价数值"
     },
     dwgczjDw: {
@@ -22,7 +22,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
         comment: "单位工程造价单位"
     },
     xsfwnlSz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "销售服务能力数值"
     },
     xsfwnlDw: {
@@ -30,7 +30,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
         comment: "销售服务能力单位"
     },
     njfhlSz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "年均负荷率数值"
     },
     njfhlDw: {
@@ -38,7 +38,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
         comment: "年均负荷率单位"
     },
     dwscfwzcbSz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "单位生产服务总成本数值"
     },
     dwscfwzcbDw: {
@@ -46,7 +46,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
         comment: "单位生产服务总成本单位"
     },
     dwsjSz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "单位售价(含税)数值"
     },
     dwsjDw: {
@@ -58,7 +58,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
         comment: "盈亏平衡点类型",
     },
     ykphdsz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "盈亏平衡点数值"
     },
     ykphddw: {

db/model/jt/projectCwpjzb.js

@@ -13,15 +13,15 @@ const projectCwpjzb = sequelize.define('projectCwpjzb', {
         comment: "指标名称"
     },
     tzpgjdjzz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "投资评估阶段基准值"
     },
     tzpgjdpfz: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "投资评估阶段批复值"
     },
     num: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "数量"
     },
     unit: {

db/model/jt/projectGdxx.js

@@ -21,15 +21,15 @@ const ProjectGdxx = sequelize.define('ProjectGdxx', {
         comment: "持股比例(%)"
     },
     cze: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "出资额(万元)"
     },
     yjzczb: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "应缴注册资本(万元)"     
     },
     ycxmzbj: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "应出项目资本金(万元)"     
     },
     hzfqk: {

db/model/jt/projectJsgm.js

@@ -13,7 +13,7 @@ const ProjectJsgm = sequelize.define('ProjectJsgm', {
         comment: "指标名称"
     },
     num: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "数量"
     },
     unit: {

db/model/jt/projectTjjh_del.js

@@ -11,7 +11,7 @@ const ProjectTjjh = sequelize.define('ProjectTjjh', {
     },
     xh: { type: DataTypes.STRING, allowNull: true, comment: "序号" },
     sjx: { type: DataTypes.STRING, allowNull: true, comment: "数据项" },
-    hj: { type: DataTypes.DECIMAL(20, 4), allowNull: true, comment: "数据项" },
+    hj: { type: DataTypes.DECIMAL(19, 2), allowNull: true, comment: "数据项" },
     sz: { type: DataTypes.JSON, allowNull: true, comment: "数值" },
     rawNum: { type: DataTypes.INTEGER }, //行数
     projectId: {

db/model/jt/projectXmtzze.js

@@ -26,7 +26,7 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', {
         defaultValue: "万元"
     },
     rmbjj: {
-        type: DataTypes.DECIMAL(20, 4),
+        type: DataTypes.DECIMAL(19, 2),
         comment: "人民币计价"
     },
     parentXh: {

module/projectModule.js

@@ -34,10 +34,9 @@ async function handleProjectData(ret, queryAttrs) {
         const element = ret.rows[index];
         // console.log(element);
         for (const key in element) {
-            console.log(rawAttributes[key].zjType, element[key],"=======", !_.isNumber(element[key]))
+            // console.log(rawAttributes[key].zjType, element[key],"=======", !_.isNumber(element[key]))
             if ((_.isNumber(element[key])) && rawAttributes[key].zjType) {
                 if (rawAttributes[key].zjType == "danxuan") {
-                    console.log(rawAttributes[key].zjType, element[key],"===111====")
 
                     resouInfoIds.push(element[key]);
                 } 
@@ -54,7 +53,7 @@ async function handleProjectData(ret, queryAttrs) {
     for (let index = 0; index < ret.rows.length; index++) {
         const element = ret.rows[index];
         for (const key in element) {
-            console.log(element, element[key], rawAttributes[key].zjType);
+            // console.log(element, element[key], rawAttributes[key].zjType);
             if (_.isNumber(element[key]) && rawAttributes[key].zjType) {
                 if (rawAttributes[key].zjType == "danxuan") {
                     console.log(resMap[String(element[key])], String(element[key]), "=========================")
@@ -66,6 +65,10 @@ async function handleProjectData(ret, queryAttrs) {
                     }
                 }
             }
+            // // console.log(rawAttributes[key].type.key)
+            // if(rawAttributes[key].type.key == 'DECIMAL') {
+            //     element[key] = parseFloat(element[key]);
+            // }
 
         }
         newRet.push(element);