theo 3 лет назад
Родитель
Сommit
259ea86f38
2 измененных файлов с 28 добавлено и 2 удалено
  1. 2 2
      backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php
  2. 26 0
      sql/upgrade/1350.sql

+ 2 - 2
backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -498,11 +498,11 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                        'prop'=>'ORI_BONUS_BD',
 //                    ],
 //                ],
-                'REAL_BONUS_QUARTER' => [
+                'BONUS_QUARTER' => [
                     'header' => 'Quarterly Bonus',// 季度分红
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['REAL_BONUS_QUARTER'],
+                            'value' => $row['BONUS_QUARTER'],
                         ]))->result();
                     },
                     'headerOther' => [

+ 26 - 0
sql/upgrade/1350.sql

@@ -34,3 +34,29 @@ CREATE TABLE `AR_CALC_BONUS_QUARTER`  (
   `CREATED_AT` datetime(0) NOT NULL,
   PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2005 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+DROP TABLE IF EXISTS `AR_QTR_CALC_WEIGHT`;
+CREATE TABLE `AR_QTR_CALC_WEIGHT`  (
+    `ID` int(11) NOT NULL AUTO_INCREMENT,
+    `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+    `MAX_SORT` int(11) NULL DEFAULT NULL,
+    `WEIGHT` decimal(16, 3) NULL DEFAULT NULL,
+    `PERIOD_NUM` int(11) NULL DEFAULT NULL,
+    `CALC_MONTH` int(11) NULL DEFAULT NULL,
+    `CALC_YEAR` int(11) NULL DEFAULT NULL,
+    PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 512 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+DROP TABLE IF EXISTS `AR_QTR_CALC_SCORE`;
+CREATE TABLE `AR_QTR_CALC_SCORE`  (
+    `ID` int(11) NOT NULL AUTO_INCREMENT,
+    `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `CNT` int(11) NOT NULL,
+    `SCORE` decimal(16, 3) NOT NULL,
+    `CALC_MONTH` int(11) NULL DEFAULT NULL,
+    `CALC_YEAR` int(11) NULL DEFAULT NULL,
+    PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 256 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+alter table `AR_CALC_BONUS` add column ORI_BONUS_QUARTER decimal(16,2) not null default 0.00 comment "季度奖-原奖金";
+alter table `AR_CALC_BONUS` add column BONUS_QUARTER decimal(16,2) not null default 0.00 comment "季度奖";