明树Git Lab

Commit 1023fb35 authored by zfp1's avatar zfp1

1

parent df309e98
Pipeline #106057 passed with stage
in 4 seconds
......@@ -224,12 +224,11 @@ async function createTzkz(req, res, next) {
//处理工期
let tzkzgqs = (req.body.tzkzgqs || []).map(o => { o.projectId = req.body.projectId; o.sourceId = ret.id; return o; });
delete req.body.tzkzgqs;
//创建
await DB.TzTzkzCwpj.bulkCreate(tzkzcwpjs);
await DB.TzTzkzJcpfyj.bulkCreate(tzkzjcpfyjs);
await DB.TzTzkzTzsy.bulkCreate(tzkztzsys);
await DB.TzTzkzTzekz.bulkCreate(flattenArr);
let a = await DB.TzTzkzJcpfyj.bulkCreate(tzkzjcpfyjs);
let b = await DB.TzTzkzTzsy.bulkCreate(tzkztzsys);
let c = await DB.TzTzkzTzekz.bulkCreate(flattenArr);
await DB.TzTzkzGq.bulkCreate(tzkzgqs);
await DB.TzTzkzAqzlhb.bulkCreate(tzkzaqzlhbs);
return res.sendData(ret);
......@@ -396,6 +395,7 @@ async function getTzkzInfo(req, res, next) {
where: { projectId: tzkz.projectId, sourceId: tzkz.id },
raw: true
});
console.log(tzkztzekzs, "========================================================")
let tzeGroupByObj = _.groupBy(tzkztzekzs, 'groupBy');
let keyindexs = _.keys(tzeGroupByObj);
let newTze = [];
......
......@@ -48,6 +48,8 @@ const TzTzkzJcpfyj = require("./model/jt/tzTzkzJcpfyj");
const TzTzkzTzekz = require("./model/jt/tzTzkzTzekz");
const TzTzkzCwpj = require("./model/jt/tzTzkzCwpj");
const TzTzkzTzsy = require('./model/jt/tzTzkzTzsy');
const TzTzkzGq = require('./model/jt/tzTzkzGq');
const TzTzkzAqzlhb = require('./model/jt/tzTzkzAqzlhb');
const TzZdfx = require("./model/jt/tzZdfx");
const TzZdfxcz = require("./model/jt/tzZdfxcz");
......@@ -124,6 +126,10 @@ global.DB = {
TzTzkzTzekz,
TzTzkzCwpj,
TzTzkzTzsy,
TzTzkzGq,
TzTzkzAqzlhb,
TzZdfx,
TzZdfxcz,
TzZdfxcwzb,
......
......@@ -19,7 +19,7 @@ const TzTzkzAqzlhb = sequelize.define('TzTzkzAqzlhb', {
comment: "来源(管理策划、会议纪要、其他要求等) "
},
sffsaqzlhbwt: {
type: DataTypes.INTEGER,
type: DataTypes.STRING,
comment: "是否发生安全质量环保问题被行政处罚",
},
......@@ -63,9 +63,9 @@ const TzTzkzAqzlhb = sequelize.define('TzTzkzAqzlhb', {
// 同步模型到数据库(创建表)
TzTzkzAqzlhb.sync({
force: false,
// force: false,
// force: true ,//会删除已存在表并重新创建
// alter: true
alter: true
})
.then(() => {
console.log('TzTzkzAqzlhb 表同步成功');
......
......@@ -30,7 +30,7 @@ const TzTzkzCwpj = sequelize.define('TzTzkzCwpj', {
type: DataTypes.TEXT,
comment: "主要差异说明",
},
sourceId: {
sourceId: {
type: DataTypes.INTEGER,
comment: "所属投资控制主表id"
},
......@@ -63,7 +63,7 @@ sourceId: {
TzTzkzCwpj.sync({
// force: false,
// force: true ,//会删除已存在表并重新创建
// alter: true
alter: true
})
.then(() => {
console.log('TzTzkzCwpj 表同步成功');
......
......@@ -127,9 +127,9 @@ const TzTzkzJcpfyj = sequelize.define('TzTzkzJcpfyj', {
// 同步模型到数据库(创建表)
TzTzkzJcpfyj.sync({
force: false,
// force: false,
// force: true ,//会删除已存在表并重新创建
// alter: true
alter: true
})
.then(() => {
console.log('TzTzkzJcpfyj 表同步成功');
......
......@@ -56,9 +56,9 @@ const TzTzkzTzsy = sequelize.define('TzTzkzTzsy', {
// 同步模型到数据库(创建表)
TzTzkzTzsy.sync({
force: false,
// force: false,
// force: true ,//会删除已存在表并重新创建
// alter: true
alter: true
})
.then(() => {
console.log('TzTzkzTzsy 表同步成功');
......
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