所属项目修改问题

app/service/tender.js

@@ -334,7 +334,7 @@ module.exports = app => {
             try {
                 if (tender.spid !== postData.spid) {
                     if (postData.spid) await this.ctx.service.subProject.addRelaTender(conn, postData.spid, id);
-                    if (tender.spid) await this.ctx.service.subProject.removeRelaTender(conn, postData.spid, id);
+                    if (tender.spid) await this.ctx.service.subProject.removeRelaTender(conn, tender.spid, id);
                 }
                 rowData.spid = postData.spid || '';
                 const result = await conn.update(this.tableName, rowData);

sql/update.sql

@@ -57,3 +57,15 @@ ADD COLUMN `dsk_projects` json NULL COMMENT '大司空项目信息' AFTER `dsk_a
 
 ALTER TABLE `zh_tender`
 ADD COLUMN `spid` varchar(36) NOT NULL DEFAULT '' COMMENT 'zh_sub_project.id' AFTER `s_type`;
+
+CREATE TABLE `zh_expr`  (
+  `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tid` int(11) UNSIGNED NOT NULL COMMENT '标段id',
+  `calc_module` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'stage' COMMENT '计算模块',
+  `calc_tag` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'contract' COMMENT '计算标记',
+  `calc_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '计算关联id',
+  `expr` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '计算公式',
+  `expr_bak` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '上一次计算公式',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_common`(`tid`, `calc_module`, `calc_tag`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic;