KPI / fw-morax

Commit f8520ca48b82191e0f3440db388956351ef1e2d9

Authored by 张志伟
1 parent f4b9a6ec

:zap: feature(*): 代码整理 

- 代码整理
Inline Side-by-side
Showing 6 changed files with 24 additions and 6 deletions
doc/ddl.sql
  View file @f8520ca
... ... @@ -246,7 +246,7 @@ CREATE TABLE salary_general_settin
246 246 (
247 247 id BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
248 248 leader_visibility TINYINT(1) COMMENT '管理层可见',
249   - dates_of_appeal VARCHAR(10) NOT NULL DEFAULT '1,5' COMMENT '可申诉日期;eg: 1,20 逗号隔开只存开始和结束',
  249 + dates_of_appeal VARCHAR(10) NOT NULL DEFAULT '3,5' COMMENT '可申诉日期;eg: 1,20 逗号隔开只存开始和结束',
250 250 payoff_date INT(2) COMMENT '薪资发放日期;取值1-28（每月）',
251 251 payoff_limit INT(11) COMMENT '薪资发放公户限额;元 0元则不限制',
252 252 group_id BIGINT(20) NOT NULL COMMENT '集团id',
... ...
doc/fw_morax_v2.sql
  View file @f8520ca
... ... @@ -1097,7 +1097,7 @@ CREATE TABLE `salary_general_settin`
1097 1097 (
1098 1098 `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
1099 1099 `leader_visibility` tinyint(1) DEFAULT NULL COMMENT '管理层可见',
1100   - `dates_of_appeal` varchar(10) NOT NULL DEFAULT '1,5' COMMENT '可申诉日期;eg: 1,20 逗号隔开只存开始和结束',
  1100 + `dates_of_appeal` varchar(10) NOT NULL DEFAULT '3,5' COMMENT '可申诉日期;eg: 1,20 逗号隔开只存开始和结束',
1101 1101 `payoff_date` int DEFAULT NULL COMMENT '薪资发放日期;取值1-28（每月）',
1102 1102 `payoff_limit` int DEFAULT NULL COMMENT '薪资发放公户限额;元 0元则不限制',
1103 1103 `group_id` bigint NOT NULL COMMENT '集团id',
... ...
doc/霏微-绩效薪酬.chnr.json
  View file @f8520ca
... ... @@ -3653,7 +3653,7 @@
3653 3653 "primaryKey": false,
3654 3654 "notNull": true,
3655 3655 "autoIncrement": false,
3656   - "defaultValue": "1,5",
  3656 + "defaultValue": "3,5",
3657 3657 "hideInGraph": false,
3658 3658 "refDict": "",
3659 3659 "domain": "",
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/salary/SalaryGroupProjectHitLog.java
  View file @f8520ca
... ... @@ -2,7 +2,6 @@ package cn.fw.morax.domain.db.salary;
2 2  
3 3 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
4 4 import cn.fw.morax.domain.enums.StarLevelEnum;
5   -import com.baomidou.mybatisplus.annotation.TableLogic;
6 5 import lombok.*;
7 6  
8 7 import java.math.BigDecimal;
... ... @@ -62,6 +61,5 @@ public class SalaryGroupProjectHitLog extends BaseAuditableTimeEntity<SalaryGrou
62 61 /**
63 62 * 逻辑删除
64 63 */
65   - @TableLogic
66 64 private Boolean yn;
67 65 }
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/task/GenericTask.java 0 → 100644
  View file @f8520ca
  1 +package cn.fw.morax.server.task;
  2 +
  3 +import lombok.extern.slf4j.Slf4j;
  4 +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
  5 +import org.springframework.stereotype.Component;
  6 +
  7 +/**
  8 + * 通用定时器
  9 + *
  10 + * @author : kurisu
  11 + * @version : 2.0
  12 + * @className : GenericTask
  13 + * @description : 通用定时器
  14 + * @date : 2022-12-28 14:44
  15 + */
  16 +@Component
  17 +@Slf4j
  18 +@ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on")
  19 +public class GenericTask {
  20 +}
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/data/salary/impl/SalaryGeneralSettinServiceImpl.java
  View file @f8520ca
... ... @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
17 17 @Service
18 18 @Slf4j
19 19 public class SalaryGeneralSettinServiceImpl extends ServiceImpl<SalaryGeneralSettinDao, SalaryGeneralSettin> implements SalaryGeneralSettinService {
20   - private final static String DEFAULT_DATES_OF_APPEAL = "1,5";
  20 + private final static String DEFAULT_DATES_OF_APPEAL = "3,5";
21 21  
22 22 @Override
23 23 @Transactional(rollbackFor = Exception.class)
... ...