明树Git Lab

Commit 57c90c20 authored by zfp1's avatar zfp1

update

parent c0bde601
Pipeline #104511 passed with stage
in 3 seconds
...@@ -350,7 +350,7 @@ async function xiangmujuecegengxin(body, projectLzType) { ...@@ -350,7 +350,7 @@ async function xiangmujuecegengxin(body, projectLzType) {
await Promise.all(pns2.map(item => { DB.ProjectGdxx.update(item, { where: { id: item.id } }) })); await Promise.all(pns2.map(item => { DB.ProjectGdxx.update(item, { where: { id: item.id } }) }));
// 处理 projectXmtzzes // 处理 projectXmtzzes
let projectXmtzzes = body.projectXmtzzes || []; let projectXmtzzes = body.projectXmtzzes || [];
projectXmtzzes = utils.flattenTree(projectXmtzzes, 'xh', 'parentXh'); projectXmtzzes = utils.flattenTree(projectXmtzzes, 'key', 'parentKey');
let pnids3 = [], pns3 = [], newprojectXmtzzes = []; let pnids3 = [], pns3 = [], newprojectXmtzzes = [];
projectXmtzzes.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectXmtzzes.push(o); } } else { pnids3.push(o.id); pns3.push(o); } return o }); projectXmtzzes.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectXmtzzes.push(o); } } else { pnids3.push(o.id); pns3.push(o); } return o });
await DB.ProjectXmtzze.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids3 } } }); await DB.ProjectXmtzze.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids3 } } });
......
...@@ -29,9 +29,13 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', { ...@@ -29,9 +29,13 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', {
type: DataTypes.DECIMAL(19, 2), type: DataTypes.DECIMAL(19, 2),
comment: "人民币计价" comment: "人民币计价"
}, },
parentXh: { key: {
type: DataTypes.STRING, type: DataTypes.STRING,
comment: "上级ID" comment: "key"
},
parentKey: {
type: DataTypes.STRING,
comment: "parentKey"
}, },
projectId: { projectId: {
...@@ -67,7 +71,7 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', { ...@@ -67,7 +71,7 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', {
// 同步模型到数据库(创建表) // 同步模型到数据库(创建表)
ProjectXmtzze.sync({ ProjectXmtzze.sync({
force: false, // force: false,
// force: true ,//会删除已存在表并重新创建 // force: true ,//会删除已存在表并重新创建
// alter: true // alter: true
}) })
......
...@@ -216,8 +216,8 @@ async function getProjectInfo({ id }) { ...@@ -216,8 +216,8 @@ async function getProjectInfo({ id }) {
project.projectXmtzzes = await DB.ProjectXmtzze.findAll({ where: { projectId: id }, raw: true }); project.projectXmtzzes = await DB.ProjectXmtzze.findAll({ where: { projectId: id }, raw: true });
project.projectXmtzzes = utils.buildTree2(project.projectXmtzzes, { project.projectXmtzzes = utils.buildTree2(project.projectXmtzzes, {
keyName: "xh", keyName: "key",
parentKeyName: 'parentXh', parentKeyName: 'parentKey',
}); });
//处理文件 还原成项目各个字段拥有的文件 //处理文件 还原成项目各个字段拥有的文件
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment