Merge branch 'dev'

a.js

@@ -137,3 +137,26 @@ console.log(flattenTree(complexForest, 'xh', 'parentXh'));
 
 
 // [{ "xh": "1", "zb": "项目资本金", "dw": "万元", "parentXh": null, "children": [{ "xh": "1.1", "zb": "能建方出资", "dw": "万元", "parentXh": "1", "children": [] }, { "xh": "1.2", "zb": "外部股东", "dw": "万元", "parentXh": "1", "children": [] }] }, { "xh": "2", "zb": "贷款", "dw": "万元", "parentXh": null, "children": [{ "xh": "2.1", "zb": "其中：并非表项目我方贷款/投保额", "dw": "万元", "parentXh": "2", "children": [] }] }, { "xh": "3", "zb": "其他出资", "dw": "万元", "parentXh": null, "children": [{ "xh": "3.1", "zb": "其中：能建方出资", "dw": "万元", "parentXh": "3", "children": [] }] }, { "xh": "", "zb": "批复总出资", "dw": "万元", "parentXh": null, "children": [] }]
+
+
+function disTree(tree) {
+    let parallel = [];
+    function addToParallel(nodes) {
+        nodes.forEach(node => {
+            parallel.push({
+                ...node,
+                children: undefined
+            });
+            if (node.children && node.children.length) {
+                addToParallel(node.children);
+            }
+        });
+    }
+    addToParallel(tree)
+    return parallel
+}
+
+
+console.log(disTree( [
+        1,2,3
+    ]))
\ No newline at end of file

db/index.js

@@ -182,5 +182,5 @@ Project.hasMany(ProjectXmtzze, { foreignKey: 'projectId', as: 'projectXmtzzes' }
 ProjectXmtzze.belongsTo(Project, { foreignKey: 'projectId' });
 
 /**项目-项目流转记录 */
-Project.hasMany(FlowRecord, { foreignKey: 'projectId', as: 'flowRecords' });
-FlowRecord.belongsTo(Project, { foreignKey: 'projectId' });
+// Project.hasMany(FlowRecord, { foreignKey: 'projectId', as: 'flowRecords' });
+// FlowRecord.belongsTo(Project, { foreignKey: 'projectId' });
\ No newline at end of file

db/model/jt/c.md

@@ -7,3 +7,15 @@
         投管项目审批人员 -- 看见所有项目公司人员
    1.2 投管新建项目 --- 投管
    同步发起 一个startFlow 流程记录 发起人 发起时间 项目状态（待审批-已审批）
+
+
+   /**
+         * 处理项目审批及消息 依靠项目状态流转 
+         * 1. 发起人角色为项目公司项目发起人 xmgs_xmfqr;
+         * 2. 流转状态为 1待处理 
+         * 3. 消息发送给 项目公司项目审批人 xmgs_xmspr，需要写一个审批接口 ：项目基本信息不变，状态需要改为 2 项目公司初审：通过则变为3，不通过则变为1;
+         * 4. 若是投管部门自主创建项目，则项目状态直接到 5 待投管审核---退回则到1
+         * 5. 投管后续立项推送、决策推送状态再行处理
+         */
+        //B. 找到本公司审批人员发送消息-- 如果找不到人 则提示项目已保存，联系管理员添加【项目公司项目审批人】角色
+        //A. 创建发起记录
\ No newline at end of file

module/projectModule.js

@@ -5,8 +5,6 @@ const _ = require("lodash");
 const { Op } = require('sequelize');
 const sequelize = require('sequelize');
 const moment = require('moment');
-const userModule = require('../module/userModule');
-const projectModule = require('../module/projectModule');
 
 
 
@@ -14,18 +12,63 @@ const projectModule = require('../module/projectModule');
 
 
 async function handleProjectData(ret, queryAttrs) {
-    let rawAttributes = DB.Project.rawAttributes;
-    console.log(rawAttributes, "====")
-    let queryRawAtr = [];
+    let rawAttributes = _.cloneDeep(DB.Project.rawAttributes);
+    console.log(ret, "====")
+    let queryRawAtr = [], resourceKeys = [];
     for (let index = 0; index < queryAttrs.length; index++) {
         const element = queryAttrs[index];
-        if(rawAttributes[element]) {
-            queryRawAtr.push(rawAttributes[element]);
+        if (rawAttributes[element]) {
+            queryRawAtr.push(rawAttributes[element]); //查询得所有字段
+            if (['danxuan'].includes(rawAttributes[element] && rawAttributes[element].zjType)) { //其中需要处理的资源库字段，单选、
+                resourceKeys.push(element);
             }
         }
-    console.log(queryRawAtr);
-    let groupAttr = _.groupBy(queryRawAtr, 'zjType');
-    return groupAttr;
+    }
+    let resources = await getResourceByKeys(resourceKeys);
+
+    let newRet = [];
+    for (let index = 0; index < ret.rows.length; index++) {
+        const element = ret.rows[index];
+        console.log(element);
+        for (const key in element) {
+            if(!_.isEmpty(resources[key])) {
+                element[key] = resources[key][element[key]]
+            }
+            
+        }
+        newRet.push(element);
+    }
+    //获取对应得资源库说明
+    ret.rows = newRet;
+    return ret;
+}
+
+
+async function getResourceByKeys(keys) {
+    if (!(keys && keys.length)) {
+        return {};
+    }
+    let ret = await DB.Resources.findAll({
+        where: { key: { [Op.in]: keys } ,del: 0},
+        include: [
+            {
+                model: DB.ResourcesInfo,
+                as: 'resourcesInfos',
+            }
+        ]
+    });
+    let obj = {};
+    for (let index = 0; index < ret.length; index++) {
+        const element = ret[index];
+        element.resourcesInfos = element.resourcesInfos || [];
+        let oobj = {};
+        for (let i = 0; i < element.resourcesInfos.length; i++) {
+            const e = element.resourcesInfos[i];
+            oobj[e.key] = e.value;
+        }
+        obj[element.key] = oobj;
+    }
+    return obj;
 }
 
 

router/projectRouter.js

@@ -8,12 +8,25 @@ const projectController = require('../controller/projectController');
 /**
  * 项目相关
  */
-router.post('/createProject', projectController.createProject);
+
+//获取项目可选字段--字符串 数值 单选 多选 //表格字段不能导出，可以rongyu存储到表内再行导出
+router.post('/getProjectFields', projectController.getProjectFields);
+
+router.post('/createProject', projectController.createProject); //创建项目
+router.post('/saveProjectPreLixiang', projectController.saveProjectPreLixiang); //保存项目
+
+router.post('/startLixiang', projectController.startLixiang);//发起立项审批----TODO:待完成与能建对接
+
+// -----------------------接收能建立项结果信息，更新立项批复信息等字段------------------------------------------
+
+router.post('/saveJuece', projectController.saveJuece); //决策保存
+router.post('/startJuece', projectController.startJuece);
+
+
 router.post('/updateProject', projectController.updateProject);
 router.post('/deleteProject', projectController.deleteProject);
 router.post('/listProject', projectController.listProject);
 router.post('/getProjectInfo', projectController.getProjectInfo);
-router.post('/getProjectFields', projectController.getProjectFields);
 
 router.post('/exportExcel', projectController.exportExcel);