明树Git Lab

Commit f6a4df2e authored by zfp1's avatar zfp1

update

parent 57c90c20
Pipeline #104514 passed with stage
in 3 seconds
...@@ -446,6 +446,9 @@ async function xiangmujuecegengxin(body, projectLzType) { ...@@ -446,6 +446,9 @@ async function xiangmujuecegengxin(body, projectLzType) {
// 上会议案 // 上会议案
let shya = _.compact(body.shya || []); let shya = _.compact(body.shya || []);
shya.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'shya' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'shya' } }); shya.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'shya' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'shya' } });
// 里程碑计划审批表
let lcbjhspb = _.compact(body.lcbjhspb || []);
lcbjhspb.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lcbjhspb' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'lcbjhspb' } });
// 处理文件 // 处理文件
//1. 删除 //1. 删除
await DB.ProjectFile.destroy({ await DB.ProjectFile.destroy({
......
...@@ -71,7 +71,7 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', { ...@@ -71,7 +71,7 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', {
// 同步模型到数据库(创建表) // 同步模型到数据库(创建表)
ProjectXmtzze.sync({ ProjectXmtzze.sync({
// force: false, force: false,
// force: true ,//会删除已存在表并重新创建 // force: true ,//会删除已存在表并重新创建
// alter: true // alter: true
}) })
......
...@@ -214,7 +214,7 @@ async function getProjectInfo({ id }) { ...@@ -214,7 +214,7 @@ async function getProjectInfo({ id }) {
project.projectTzzjlls = await DB.ProjectTzzjll.findAll({ where: { projectId: id }, raw: true }); project.projectTzzjlls = await DB.ProjectTzzjll.findAll({ where: { projectId: id }, raw: true });
project.projectTzzts = await DB.ProjectTzzt.findAll({ where: { projectId: id }, raw: true }); project.projectTzzts = await DB.ProjectTzzt.findAll({ where: { projectId: id }, raw: true });
project.projectXmtzzes = await DB.ProjectXmtzze.findAll({ where: { projectId: id }, raw: true }); project.projectXmtzzes = await DB.ProjectXmtzze.findAll({ where: { projectId: id }, raw: true });
project.projectZqrzs = await DB.ProjectZqrz.findAll({ where: { projectId: id }, raw: true });
project.projectXmtzzes = utils.buildTree2(project.projectXmtzzes, { project.projectXmtzzes = utils.buildTree2(project.projectXmtzzes, {
keyName: "key", keyName: "key",
parentKeyName: 'parentKey', 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