|
|
@@ -11,9 +11,6 @@ CREATE TABLE `zh_change_settle_list` (
|
|
|
PRIMARY KEY (`id`)
|
|
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT = '变更已结算清单表（用于修订和重审时生成，防止已结算变更清单被删除）';
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
-ALTER TABLE `calculation`.`zh_rpt_archive`
|
|
|
-=======
|
|
|
CREATE TABLE `zh_notice_again` (
|
|
|
`id` int NOT NULL AUTO_INCREMENT,
|
|
|
`pid` int NOT NULL COMMENT '项目id',
|
|
|
@@ -38,8 +35,7 @@ ADD COLUMN `notice_again` json NULL DEFAULT NULL COMMENT '审批信息重新发
|
|
|
ALTER TABLE `zh_project`
|
|
|
ADD COLUMN `notice_setting` json NULL DEFAULT NULL COMMENT '重新发送通知设置';
|
|
|
|
|
|
-ALTER TABLE `zh_rpt_archive_encryption`
|
|
|
->>>>>>> 52c6737b81a4f76352fe152a1ca944d6bda9aba0
|
|
|
+ALTER TABLE `calculation`.`zh_rpt_archive`
|
|
|
ADD COLUMN `business_id` VARCHAR(45) NULL COMMENT '有其他业务情况，统一在这里标识(类uuid)，要结合stage_id来看，如stage_id > 0，则是标段和期，< 0则是其他业务，如 -300 -> 变更令；-301 - 变更方案；-302 - 变更立项 -303 - 变更申请' AFTER `stage_id`,
|
|
|
ADD COLUMN `tender_id` INT(11) NULL AFTER `business_id`,
|
|
|
ADD INDEX `PRJ_STG_BZ` (`prj_id` ASC, `stage_id` ASC, `business_id` ASC);
|
