diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java index 47d84305a2..ce47c3ca40 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java @@ -82,6 +82,11 @@ public class PointRuleEntity extends BaseEpmetEntity { */ private String upLimitPrefix; + /** + * 上限积分计算周期;不限:unlimit;首次:first;天:day;月:周:week;month;年:year + */ + private String rulePeriod; + /** * 获得积分值 */ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql index de6294d923..88088724de 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql @@ -9,6 +9,7 @@ CREATE TABLE `point_rule` ( `UP_LIMIT` int(11) DEFAULT '-1' COMMENT '积分上限 -1表示不涉及积分上限;', `UP_LIMIT_DESC` varchar(64) DEFAULT NULL COMMENT '积分上限描述', `UP_LIMIT_PREFIX` varchar(64) DEFAULT '' COMMENT '积分示例中 积分上限前缀', + `RULE_PERIOD` varchar(32) DEFAULT NULL COMMENT '上限积分计算周期;不限:unlimit;首次:first;天:day;月:周:week;month;年:year', `POINT` int(11) DEFAULT '0' COMMENT '单位积分值', `POINT_UNIT` varchar(32) DEFAULT NULL COMMENT '获得积分单位 次:time;分钟:minute;小时:hour', `ENABLED_FLAG` varchar(1) DEFAULT '0' COMMENT '是否启用 0-否,1-是', diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml index f1001ae7d9..5171f21a59 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml @@ -13,6 +13,7 @@ +