提交脚本

project_data/sql/0.0.5/soc/soc.sql

@@ -34,7 +34,7 @@ DROP PROCEDURE
                         ADD COLUMN `effective_time` datetime NULL COMMENT '计划生效日期' AFTER `withdraw_time`;
                     update core_drill_plan set publish_time =update_time WHERE publish_time is null and plan_status=1;
                     update core_drill_plan set withdraw_time =update_time WHERE withdraw_time is null and plan_status=2;
-                    update core_drill_plan set effective_time =update_time WHERE effective_time is null and plan_status=1;
+                    update core_drill_plan set effective_time =update_time WHERE effective_time is null and (plan_status=1 or plan_status=2);
             END IF;
 
                 -- 预案演练表增加字段:最后一次下发时间/最后一次撤回时间/计划生效日期
@@ -49,7 +49,7 @@ DROP PROCEDURE
                         ADD COLUMN `effective_time` datetime NULL COMMENT '计划生效日期' AFTER `withdraw_time`;
                     update core_edu_training_plan set publish_time =update_time WHERE publish_time is null and plan_status=1;
                     update core_edu_training_plan set withdraw_time =update_time WHERE withdraw_time is null and plan_status=2;
-                    update core_edu_training_plan set effective_time =update_time WHERE effective_time is null and plan_status=1;
+                    update core_edu_training_plan set effective_time =update_time WHERE effective_time is null and (plan_status=1 or plan_status=2);
             END IF;