From 39741a57e8821d83a6b14ea63ed6182a18e32b5c Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Thu, 6 Apr 2023 10:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constans/DsFormConstants.java | 17 ------ .../constans/OrganizationConstants.java | 55 ------------------- .../SystemFoundationSettingsConstants.java | 17 ------ .../impl/CompanyDepartmentServiceImpl.java | 4 +- 4 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/DsFormConstants.java delete mode 100644 skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/OrganizationConstants.java delete mode 100644 skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/SystemFoundationSettingsConstants.java diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/DsFormConstants.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/DsFormConstants.java deleted file mode 100644 index ab0d3cce..00000000 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/DsFormConstants.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.common.constans; - -/** - * @ClassName: DsFormConstants - * @Description: 动态表单常量类 - * @author: skyeye云系列--卫志强 - * @date: 2022/1/8 17:17 - * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -public class DsFormConstants { - -} diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/OrganizationConstants.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/OrganizationConstants.java deleted file mode 100644 index c66ab9a6..00000000 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/OrganizationConstants.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.common.constans; - -import java.util.Arrays; - -/** - * @ClassName: OrganizationConstants - * @Description: 组织管理常量类 - * @author: skyeye云系列--卫志强 - * @date: 2021/8/30 20:01 - * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -public class OrganizationConstants { - - /** - * 企业部门-加班结算类型 - */ - public static enum OvertimeSettlementType { - SINGLE_SALARY_SETTLEMENT("单倍薪资结算", 1), - ONE_POINT_FIVE_SALARY_SETTLEMENT("1.5倍薪资结算", 2), - DOUBLE_SALARY_SETTLEMENT("双倍薪资结算", 3), - COMPENSATORY_LEAVE_SETTLEMENT("补休结算", 6); - - private String title; - private Integer type; - - OvertimeSettlementType(String title, Integer type) { - this.title = title; - this.type = type; - } - - public static String getTitleByType(int type) { - OvertimeSettlementType overtimeSettlementType = Arrays.stream(OvertimeSettlementType.values()) - .filter(bean -> bean.getType() == type).findFirst().orElse(null); - if (overtimeSettlementType == null) { - return ""; - } else { - return overtimeSettlementType.getTitle(); - } - } - - public String getTitle() { - return title; - } - - public Integer getType() { - return type; - } - } - -} diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/SystemFoundationSettingsConstants.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/SystemFoundationSettingsConstants.java deleted file mode 100644 index 04140b15..00000000 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/SystemFoundationSettingsConstants.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.common.constans; - -/** - * @ClassName: SystemFoundationSettingsConstants - * @Description: 系统基础设置常量类 - * @author: skyeye云系列--卫志强 - * @date: 2021/11/13 14:43 - * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -public class SystemFoundationSettingsConstants { - -} diff --git a/skyeye-promote/skyeye-organization/src/main/java/com/skyeye/organization/service/impl/CompanyDepartmentServiceImpl.java b/skyeye-promote/skyeye-organization/src/main/java/com/skyeye/organization/service/impl/CompanyDepartmentServiceImpl.java index c4598701..68f2b2e4 100644 --- a/skyeye-promote/skyeye-organization/src/main/java/com/skyeye/organization/service/impl/CompanyDepartmentServiceImpl.java +++ b/skyeye-promote/skyeye-organization/src/main/java/com/skyeye/organization/service/impl/CompanyDepartmentServiceImpl.java @@ -8,8 +8,8 @@ import cn.hutool.core.collection.CollectionUtil; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; -import com.skyeye.common.constans.OrganizationConstants; import com.skyeye.common.entity.search.CommonPageInfo; +import com.skyeye.common.enumeration.OvertimeSettlementType; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.ToolUtil; @@ -56,7 +56,7 @@ public class CompanyDepartmentServiceImpl extends SkyeyeBusinessServiceImpl { Integer overtimeSettlementType = Integer.parseInt(bean.get("overtimeSettlementType").toString()); - bean.put("overtimeSettlementTypeName", OrganizationConstants.OvertimeSettlementType.getTitleByType(overtimeSettlementType)); + bean.put("overtimeSettlementTypeName", OvertimeSettlementType.getTitleByType(overtimeSettlementType)); }); return beans; }