Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/const/project_setting.js

@@ -9,11 +9,11 @@
  */
 // 重新发送通知设置
 const notice_setting = {
-    fixed: 6, // 固定间隔
+    fixed: 12, // 固定间隔
     activity: { // 活动间隔
-        first: 6,
+        first: 12,
         second: 6,
-        later: 6,
+        later: 3,
     },
     mode: 'fixed', // 默认模式
     shield_times: { // 屏蔽时间段

sql/update.sql

@@ -61,3 +61,14 @@ ALTER TABLE `zh_role_rpt_rel`
 ADD COLUMN `business_id` VARCHAR(45) NULL AFTER `sid`,
 ADD INDEX `bz_idx` (`tender_id` ASC, `business_id` ASC);
 ;
+
+update zh_rpt_archive A
+set A.tender_id = (select tid from zh_stage B where B.id = A.stage_id)
+where (A.stage_id is not null) && (A.stage_id > 0)
+;
+
+update zh_rpt_archive_encryption A
+set A.tender_id = (select tid from zh_stage B where B.id = A.stage_id)
+where (A.stage_id is not null) && (A.stage_id > 0)
+;
+