From c01e63040c2ad7dacde5e6f1534e3dbf390cc9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 22 Mar 2022 21:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE&=E8=B4=A6?=
=?UTF-8?q?=E5=A5=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/salary/web/SalarySobController.java | 15 +
src/com/engine/salary/biz/SalarySobBiz.java | 64 +++
.../engine/salary/biz/SalarySobRangeBiz.java | 67 +++
.../cmd/TaxAgent/TaxAgentGetFromCmd.java | 14 +-
.../entity/salaryitem/bo/SalaryItemBO.java | 18 +-
.../salaryitem/dto/SalaryItemListDTO.java | 3 +
.../salaryitem/dto/SysSalaryItemListDTO.java | 3 +
.../salaryitem/param/SalaryItemSaveParam.java | 40 +-
.../param/SalaryItemSearchParam.java | 38 +-
.../param/SysSalaryItemSearchParam.java | 14 +-
.../entity/salaryitem/po/SalaryItemPO.java | 1 +
.../entity/salaryitem/po/SysSalaryItemPO.java | 1 +
.../entity/salarysob/bo/SalarySobBO.java | 147 +++++++
.../entity/salarysob/bo/SalarySobCycleBO.java | 90 +++++
.../entity/salarysob/bo/SalarySobRangeBO.java | 128 ++++++
.../salarysob/bo/SalarySobRangeSaveBO.java | 90 +++++
.../salarysob/dto/SalarySobBasicFormDTO.java | 149 +++++++
.../salarysob/dto/SalarySobListDTO.java | 53 +++
.../salarysob/dto/SalarySobRangeListDTO.java | 51 +++
.../SalarySobAdjustRuleItemQueryParam.java | 33 ++
.../param/SalarySobAdjustRuleQueryParam.java | 27 ++
.../param/SalarySobAdjustRuleSaveParam.java | 52 +++
.../param/SalarySobBasicSaveParam.java | 46 ++-
.../param/SalarySobCheckRuleQueryParam.java | 27 ++
.../param/SalarySobCheckRuleSaveParam.java | 49 +++
.../param/SalarySobItemSaveParam.java | 101 +++++
.../param/SalarySobListQueryParam.java | 20 +
.../param/SalarySobRangeEmpQueryParam.java | 31 ++
.../param/SalarySobRangeQueryParam.java | 29 ++
.../param/SalarySobRangeSaveParam.java | 68 ++++
.../param/UpdateCheckRuleFormulaParam.java | 34 ++
.../salarysob/po/SalarySobAdjustRulePO.java | 87 ++++
.../salarysob/po/SalarySobCheckRulePO.java | 77 ++++
.../po/SalarySobDefaultEmpFieldPO.java | 72 ++++
.../salarysob/po/SalarySobDefaultItemPO.java | 80 ++++
.../salarysob/po/SalarySobEmpFieldPO.java | 79 ++++
.../entity/salarysob/po/SalarySobItemPO.java | 3 +
.../entity/salarysob/po/SalarySobPO.java | 6 +
.../entity/salarysob/po/SalarySobRangePO.java | 86 ++++
.../salarysob/SalaryEmployeeStatusEnum.java | 13 +-
.../exception/SalaryRunTimeException.java | 2 +-
src/com/engine/salary/init.sql | 31 +-
.../mapper/salarysob/SalarySobMapper.java | 70 ++++
.../mapper/salarysob/SalarySobMapper.xml | 358 ++++++++++++++++
.../salarysob/SalarySobRangeMapper.java | 88 ++++
.../mapper/salarysob/SalarySobRangeMapper.xml | 362 +++++++++++++++++
.../salary/service/SalarySobRangeService.java | 67 +++
.../salary/service/SalarySobService.java | 38 +-
.../service/impl/SalaryItemServiceImpl.java | 12 +-
.../impl/SalarySobRangeServiceImpl.java | 160 ++++++++
.../service/impl/SalarySobServiceImpl.java | 382 ++++++++++++++++++
.../salary/web/SalarySobController.java | 285 +++++++++++++
.../salary/web/TaxDeclarationController.java | 77 ----
.../salary/wrapper/SalarySobRangeWrapper.java | 79 ++++
.../salary/wrapper/SalarySobWrapper.java | 170 ++++++++
55 files changed, 3997 insertions(+), 190 deletions(-)
create mode 100644 src/com/api/salary/web/SalarySobController.java
create mode 100644 src/com/engine/salary/biz/SalarySobBiz.java
create mode 100644 src/com/engine/salary/biz/SalarySobRangeBiz.java
create mode 100644 src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java
create mode 100644 src/com/engine/salary/entity/salarysob/bo/SalarySobCycleBO.java
create mode 100644 src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
create mode 100644 src/com/engine/salary/entity/salarysob/bo/SalarySobRangeSaveBO.java
create mode 100644 src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java
create mode 100644 src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java
create mode 100644 src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleItemQueryParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleQueryParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleSaveParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleQueryParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleSaveParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobRangeEmpQueryParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobRangeQueryParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/param/UpdateCheckRuleFormulaParam.java
create mode 100644 src/com/engine/salary/entity/salarysob/po/SalarySobAdjustRulePO.java
create mode 100644 src/com/engine/salary/entity/salarysob/po/SalarySobCheckRulePO.java
create mode 100644 src/com/engine/salary/entity/salarysob/po/SalarySobDefaultEmpFieldPO.java
create mode 100644 src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemPO.java
create mode 100644 src/com/engine/salary/entity/salarysob/po/SalarySobEmpFieldPO.java
create mode 100644 src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
create mode 100644 src/com/engine/salary/mapper/salarysob/SalarySobMapper.java
create mode 100644 src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
create mode 100644 src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.java
create mode 100644 src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
create mode 100644 src/com/engine/salary/service/SalarySobRangeService.java
create mode 100644 src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
create mode 100644 src/com/engine/salary/service/impl/SalarySobServiceImpl.java
create mode 100644 src/com/engine/salary/web/SalarySobController.java
create mode 100644 src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
create mode 100644 src/com/engine/salary/wrapper/SalarySobWrapper.java
diff --git a/src/com/api/salary/web/SalarySobController.java b/src/com/api/salary/web/SalarySobController.java
new file mode 100644
index 000000000..716d3a195
--- /dev/null
+++ b/src/com/api/salary/web/SalarySobController.java
@@ -0,0 +1,15 @@
+package com.api.salary.web;
+
+import javax.ws.rs.Path;
+
+/**
+ * 薪资账套
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Path("/bs/hrmsalary/salarysob")
+public class SalarySobController extends com.engine.salary.web.SalarySobController {
+}
diff --git a/src/com/engine/salary/biz/SalarySobBiz.java b/src/com/engine/salary/biz/SalarySobBiz.java
new file mode 100644
index 000000000..a96758926
--- /dev/null
+++ b/src/com/engine/salary/biz/SalarySobBiz.java
@@ -0,0 +1,64 @@
+package com.engine.salary.biz;
+
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import com.engine.salary.mapper.salarysob.SalarySobMapper;
+import org.apache.ibatis.session.SqlSession;
+import weaver.conn.mybatis.MyBatisFactory;
+
+import java.util.List;
+
+public class SalarySobBiz {
+ public SalarySobPO getById(Long id) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobMapper mapper = sqlSession.getMapper(SalarySobMapper.class);
+ return mapper.getById(id);
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+
+ public List listSome(SalarySobPO build) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobMapper mapper = sqlSession.getMapper(SalarySobMapper.class);
+ return mapper.listSome(build);
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+ public List listByParam(SalarySobPO build) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobMapper mapper = sqlSession.getMapper(SalarySobMapper.class);
+ return mapper.listByParam(build);
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+ public void insert(SalarySobPO salarySobPO) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobMapper mapper = sqlSession.getMapper(SalarySobMapper.class);
+ mapper.insertIgnoreNull(salarySobPO);
+ sqlSession.commit();
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+ public void updateById(SalarySobPO newSalarySobPO) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobMapper mapper = sqlSession.getMapper(SalarySobMapper.class);
+ mapper.updateIgnoreNull(newSalarySobPO);
+ sqlSession.commit();
+ } finally {
+ sqlSession.close();
+ }
+
+ }
+}
diff --git a/src/com/engine/salary/biz/SalarySobRangeBiz.java b/src/com/engine/salary/biz/SalarySobRangeBiz.java
new file mode 100644
index 000000000..fd0b3f0e4
--- /dev/null
+++ b/src/com/engine/salary/biz/SalarySobRangeBiz.java
@@ -0,0 +1,67 @@
+package com.engine.salary.biz;
+
+import com.engine.salary.entity.salarysob.po.SalarySobRangePO;
+import com.engine.salary.mapper.salarysob.SalarySobRangeMapper;
+import org.apache.ibatis.session.SqlSession;
+import weaver.conn.mybatis.MyBatisFactory;
+
+import java.util.Collection;
+import java.util.List;
+
+public class SalarySobRangeBiz {
+
+
+ public List listSome(SalarySobRangePO build) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobRangeMapper mapper = sqlSession.getMapper(SalarySobRangeMapper.class);
+ return mapper.listSome(build);
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+ public void batchInsert(Collection needInsertSalarySobRanges) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobRangeMapper mapper = sqlSession.getMapper(SalarySobRangeMapper.class);
+ mapper.batchInsert(needInsertSalarySobRanges);
+ sqlSession.commit();
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+ public void updateById(SalarySobRangePO po) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobRangeMapper mapper = sqlSession.getMapper(SalarySobRangeMapper.class);
+ mapper.updateIgnoreNull(po);
+ sqlSession.commit();
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+ public void deleteByIds(Collection ids) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobRangeMapper mapper = sqlSession.getMapper(SalarySobRangeMapper.class);
+ mapper.deleteByIds(ids);
+ sqlSession.commit();
+ } finally {
+ sqlSession.close();
+ }
+ }
+
+ public void deleteBySalarySobIds(Collection salarySobIds) {
+ SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
+ try {
+ SalarySobRangeMapper mapper = sqlSession.getMapper(SalarySobRangeMapper.class);
+ mapper.deleteBySalarySobIds(salarySobIds);
+ sqlSession.commit();
+ } finally {
+ sqlSession.close();
+ }
+ }
+}
diff --git a/src/com/engine/salary/cmd/TaxAgent/TaxAgentGetFromCmd.java b/src/com/engine/salary/cmd/TaxAgent/TaxAgentGetFromCmd.java
index f90fcab85..98ea603ff 100644
--- a/src/com/engine/salary/cmd/TaxAgent/TaxAgentGetFromCmd.java
+++ b/src/com/engine/salary/cmd/TaxAgent/TaxAgentGetFromCmd.java
@@ -4,21 +4,15 @@ import com.api.browser.bean.SearchConditionGroup;
import com.api.browser.bean.SearchConditionItem;
import com.api.browser.util.ConditionFactory;
import com.api.browser.util.ConditionType;
-import com.cloudstore.eccom.constant.WeaBoolAttr;
-import com.cloudstore.eccom.pc.table.WeaTable;
-import com.cloudstore.eccom.pc.table.WeaTableColumn;
-import com.cloudstore.eccom.result.WeaResultMsg;
import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext;
import com.engine.core.interceptor.CommandContext;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import weaver.conn.RecordSet;
-import weaver.general.PageIdConst;
import weaver.hrm.User;
-import weaver.systeminfo.SystemEnv;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class TaxAgentGetFromCmd extends AbstractCommonCommand> {
diff --git a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
index 39fb97005..3060b74d3 100644
--- a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
+++ b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
@@ -145,12 +145,6 @@ public class SalaryItemBO {
public static SalaryItemPO convert2SalaryItemPO(SalaryItemSaveParam saveParam, Long employeeId) {
String name = saveParam.getName();
- if(StringUtils.isNotBlank(name)){
-
- }
-
-
-
Date now = new Date();
// long id = IdGenerator.generate();
SalaryItemPO salaryItemPO = SalaryItemPO.builder()
@@ -159,15 +153,15 @@ public class SalaryItemBO {
.name(saveParam.getName())
.systemType(SalarySystemTypeEnum.CUSTOM.getValue())
.sysSalaryItemId(NumberUtils.LONG_ZERO)
- .category(saveParam.getCategory().getValue())
- .itemType(saveParam.getItemType().getValue())
+ .category(saveParam.getCategory())
+ .itemType(saveParam.getItemType())
.useDefault(saveParam.getUseDefault())
.useInEmployeeSalary(saveParam.getUseInEmployeeSalary())
- .roundingMode(Optional.ofNullable(saveParam.getRoundingMode()).map(SalaryRoundingModeEnum::getValue).orElse(SalaryRoundingModeEnum.ROUNDING.getValue()))
+ .roundingMode(Optional.ofNullable(SalaryRoundingModeEnum.parseByValue(saveParam.getRoundingMode())).map(SalaryRoundingModeEnum::getValue).orElse(SalaryRoundingModeEnum.ROUNDING.getValue()))
.pattern(Optional.ofNullable(saveParam.getPattern()).orElse(2))
- .valueType(saveParam.getValueType().getValue())
- .datasource(saveParam.getValueType() == SalaryValueTypeEnum.INPUT ? SalaryDataSourceEnum.INPUT_IMPORT.getValue() : SalaryDataSourceEnum.CUSTOM_FORMULA.getValue())
- .formulaId(saveParam.getValueType() == SalaryValueTypeEnum.FORMULA ? Optional.ofNullable(saveParam.getFormulaId()).orElse(NumberUtils.LONG_ZERO) : NumberUtils.LONG_ZERO)
+ .valueType(saveParam.getValueType())
+ .datasource(Objects.equals(saveParam.getValueType(), SalaryValueTypeEnum.INPUT.getValue()) ? SalaryDataSourceEnum.INPUT_IMPORT.getValue() : SalaryDataSourceEnum.CUSTOM_FORMULA.getValue())
+ .formulaId(Objects.equals(saveParam.getValueType(), SalaryValueTypeEnum.FORMULA.getValue()) ? Optional.ofNullable(saveParam.getFormulaId()).orElse(NumberUtils.LONG_ZERO) : NumberUtils.LONG_ZERO)
.description(saveParam.getDescription())
.canEdit(NumberUtils.INTEGER_ONE)
.canDelete(NumberUtils.INTEGER_ONE)
diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java
index 805fee59e..4ea3bb5bc 100644
--- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java
+++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java
@@ -79,4 +79,7 @@ public class SalaryItemListDTO {
//是否可以编辑
private boolean canEdit;
+
+ @SalaryTableColumn(text = "操作", width = "20%", column = "operate")
+ private String operate;
}
diff --git a/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemListDTO.java
index d5a1451db..33c177821 100644
--- a/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemListDTO.java
+++ b/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemListDTO.java
@@ -50,4 +50,7 @@ public class SysSalaryItemListDTO {
@SalaryTableColumn(text = "取值方式", width = "10%", column = "valueType")
private String valueType;
+
+ @SalaryTableColumn(text = "操作", width = "20%", column = "operate")
+ private String operate;
}
diff --git a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java
index 5afb1048d..8da2dfa1c 100644
--- a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java
+++ b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java
@@ -33,8 +33,12 @@ public class SalaryItemSaveParam {
@DataCheck(require = true, max = 40, message = "名称不允许为空,名称不能超过40个字符")
private String name;
- //是否是系统内置的薪资项目
- private SalarySystemTypeEnum systemType;
+ /**
+ * 是否是系统内置的薪资项目
+ *
+ * @see SalarySystemTypeEnum
+ */
+ private Integer systemType;
//默认使用
private Integer useDefault;
@@ -42,24 +46,40 @@ public class SalaryItemSaveParam {
//薪资档案引用
private Integer useInEmployeeSalary;
- //属性
+ /**
+ * 属性
+ *
+ * @see SalaryItemCategoryEnum
+ */
@DataCheck(require = true, message = "属性不允许为空")
- private SalaryItemCategoryEnum category;
+ private Integer category;
- //类型
+ /**
+ * 类型
+ *
+ * @see SalaryItemTypeEnum
+ */
@DataCheck(require = true, message = "类型不允许为空")
- private SalaryItemTypeEnum itemType;
+ private Integer itemType;
- //舍入规则
- private SalaryRoundingModeEnum roundingMode;
+ /**
+ * 舍入规则
+ *
+ * @see SalaryRoundingModeEnum
+ */
+ private Integer roundingMode;
//保留小数位
@DataCheck(require = true, type = ValidTypeEnum.NUMBER, max = 5, message = "小数位最多为5")
private Integer pattern;
- //取值方式
+ /**
+ * 取值方式
+ *
+ * @see SalaryValueTypeEnum
+ */
@DataCheck(require = true, message = "取值方式不允许为空")
- private SalaryValueTypeEnum valueType;
+ private Integer valueType;
//公式
private Long formulaId;
diff --git a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSearchParam.java b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSearchParam.java
index 7c66b7e1d..37f5a4aaa 100644
--- a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSearchParam.java
+++ b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSearchParam.java
@@ -1,6 +1,10 @@
package com.engine.salary.entity.salaryitem.param;
import com.engine.salary.entity.base.BaseQueryParam;
+import com.engine.salary.enums.SalaryItemCategoryEnum;
+import com.engine.salary.enums.SalaryItemTypeEnum;
+import com.engine.salary.enums.SalaryOnOffEnum;
+import com.engine.salary.enums.SalaryValueTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -22,25 +26,45 @@ import java.util.Collection;
@AllArgsConstructor
public class SalaryItemSearchParam extends BaseQueryParam {
- //名称@see
+ //名称
private String name;
- //备注@see
+ //备注
private String description;
- //属性 SalaryItemCategoryEnum
+ /**
+ * 属性
+ *
+ * @see SalaryItemCategoryEnum
+ */
private Integer category;
- //分类 @see SalaryItemTypeEnum
+ /**
+ * 分类
+ *
+ * @see SalaryItemTypeEnum
+ */
private Integer itemType;
- //是否薪资档案引用@see SalaryOnOffEnum
+ /**
+ * 是否薪资档案引用
+ *
+ * @see SalaryOnOffEnum
+ */
private Integer useInEmployeeSalary;
- //是否默认使用@see SalaryOnOffEnum
+ /**
+ * 是否默认使用
+ *
+ * @see SalaryOnOffEnum
+ */
private Integer useDefault;
- //取值方式@seeSalaryValueTypeEnum
+ /**
+ * 取值方式
+ *
+ * @see SalaryValueTypeEnum
+ */
private Integer valueType;
//需要排除的系统薪资项目@see
diff --git a/src/com/engine/salary/entity/salaryitem/param/SysSalaryItemSearchParam.java b/src/com/engine/salary/entity/salaryitem/param/SysSalaryItemSearchParam.java
index b60c7fb6c..72c1a32a2 100644
--- a/src/com/engine/salary/entity/salaryitem/param/SysSalaryItemSearchParam.java
+++ b/src/com/engine/salary/entity/salaryitem/param/SysSalaryItemSearchParam.java
@@ -1,6 +1,8 @@
package com.engine.salary.entity.salaryitem.param;
import com.engine.salary.entity.base.BaseQueryParam;
+import com.engine.salary.enums.SalaryItemCategoryEnum;
+import com.engine.salary.enums.SalaryItemTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -25,10 +27,18 @@ public class SysSalaryItemSearchParam extends BaseQueryParam {
//名称
private String name;
- //属性 SalaryItemCategoryEnum
+ /**
+ * 属性
+ *
+ * @see SalaryItemCategoryEnum
+ */
private String category;
- //分类 SalaryItemTypeEnum
+ /**
+ * 分类
+ *
+ * @see SalaryItemTypeEnum
+ */
private String itemType;
//需要排除的系统薪资项目
diff --git a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
index cf06c470f..d47e76d0e 100644
--- a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
+++ b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
@@ -1,5 +1,6 @@
package com.engine.salary.entity.salaryitem.po;
+import com.engine.salary.enums.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salaryitem/po/SysSalaryItemPO.java b/src/com/engine/salary/entity/salaryitem/po/SysSalaryItemPO.java
index 296d277e5..793a77d24 100644
--- a/src/com/engine/salary/entity/salaryitem/po/SysSalaryItemPO.java
+++ b/src/com/engine/salary/entity/salaryitem/po/SysSalaryItemPO.java
@@ -1,5 +1,6 @@
package com.engine.salary.entity.salaryitem.po;
+import com.engine.salary.enums.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java
new file mode 100644
index 000000000..607d967a5
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java
@@ -0,0 +1,147 @@
+package com.engine.salary.entity.salarysob.bo;
+
+import com.engine.salary.constant.SalaryDefaultTenantConstant;
+import com.engine.salary.entity.salarysob.dto.SalarySobBasicFormDTO;
+import com.engine.salary.entity.salarysob.dto.SalarySobListDTO;
+import com.engine.salary.entity.salarysob.param.SalarySobBasicSaveParam;
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import com.engine.salary.enums.SalaryCycleTypeEnum;
+import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
+import com.engine.salary.exception.SalaryRunTimeException;
+import com.engine.salary.util.SalaryI18nUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 薪资账套
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+
+public class SalarySobBO {
+
+ /**
+ * 薪资账套基础设置保存参数转换成薪资账套基础设置po
+ *
+ * @param saveParam 薪资账套基础设置保存参数
+ * @param employeeId 人员id
+ * @return
+ */
+ public static SalarySobPO convert2PO(SalarySobBasicSaveParam saveParam, Long employeeId) {
+ Date now = new Date();
+ if (saveParam == null) {
+ throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "参数错误"));
+ }
+ return SalarySobPO.builder()
+// .id(IdGenerator.generate())
+ .name(saveParam.getName())
+ .incomeCategory(saveParam.getTaxableItems())
+ .salaryCycleType(saveParam.getSalaryCycleType())
+ .salaryCycleFromDay(saveParam.getSalaryCycleFromDay())
+ .taxCycleType(saveParam.getTaxCycleType())
+ .attendCycleType(saveParam.getAttendCycleType())
+ .attendCycleFromDay(saveParam.getAttendCycleFromDay())
+ .socialSecurityCycleType(saveParam.getSocialSecurityCycleType())
+ .disable(NumberUtils.INTEGER_ZERO)
+ .creator(employeeId)
+ .createTime(now)
+ .updateTime(now)
+ .deleteType(NumberUtils.INTEGER_ZERO)
+ .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+ .build();
+ }
+
+ /**
+ * 薪资账套po转换成列表dto
+ *
+ * @param salarySobs 薪资账套po
+ * @return
+ */
+ public static List convert2ListDTO(Collection salarySobs) {
+ if (CollectionUtils.isEmpty(salarySobs)) {
+ return Collections.emptyList();
+ }
+ return salarySobs.stream()
+ .map(salarySobPO -> SalarySobListDTO.builder()
+ .id(salarySobPO.getId())
+ .name(salarySobPO.getName())
+ .salaryCycle(buildSalaryCycle(salarySobPO))
+ .disable(salarySobPO.getDisable())
+ .description(salarySobPO.getDescription())
+ .build())
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 解析薪资账套列表的薪资周期
+ *
+ * @param salarySobPO
+ * @return
+ */
+ private static String buildSalaryCycle(SalarySobPO salarySobPO) {
+ String salaryCycleStr;
+ SalaryCycleTypeEnum salaryCycleTypeEnum = SalaryCycleTypeEnum.parseByValue(salarySobPO.getSalaryCycleType());
+ if (salaryCycleTypeEnum == null) {
+ return StringUtils.EMPTY;
+ }
+ Integer salaryCycleFromDay = salarySobPO.getSalaryCycleFromDay();
+ switch (salaryCycleTypeEnum) {
+ case BEFORE_LAST_MONTH:
+ salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98395, "上上月1号——上上月最后一天")
+ : SalaryI18nUtil.getI18nLabel(98399, "上上月{0}号——上月{1}号")
+ .replace("{0}", "" + salaryCycleFromDay)
+ .replace("{1}", "" + (salaryCycleFromDay - 1));
+ break;
+ case LAST_MONTH:
+ salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98396, "上月1号——上月最后一天")
+ : SalaryI18nUtil.getI18nLabel(98400, "上月{0}号——本月{1}号")
+ .replace("{0}", "" + salaryCycleFromDay)
+ .replace("{1}", "" + (salaryCycleFromDay - 1));
+ break;
+ case THIS_MONTH:
+ salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98397, "上月1号——上月最后一天")
+ : SalaryI18nUtil.getI18nLabel(98401, "本月{0}号——下月{1}号")
+ .replace("{0}", "" + salaryCycleFromDay)
+ .replace("{1}", "" + (salaryCycleFromDay - 1));
+ break;
+ case NEXT_MONTH:
+ salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98398, "下月1号——下月最后一天")
+ : SalaryI18nUtil.getI18nLabel(98402, "下月{0}号——下下月{1}号")
+ .replace("{0}", "" + salaryCycleFromDay)
+ .replace("{1}", "" + (salaryCycleFromDay - 1));
+ break;
+ default:
+ salaryCycleStr = "";
+ }
+ return salaryCycleStr;
+ }
+
+ /**
+ * 薪资账套po转换成薪资账套详情dto
+ *
+ * @param salarySobPO 薪资账套po
+ * @return
+ */
+ public static SalarySobBasicFormDTO convert2FormDTO(SalarySobPO salarySobPO) {
+ return new SalarySobBasicFormDTO()
+ .setId(salarySobPO.getId())
+ .setName(salarySobPO.getName())
+ .setTaxableItems(IncomeCategoryEnum.parseByValue(salarySobPO.getIncomeCategory()))
+ .setSalaryCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getSalaryCycleType()))
+ .setSalaryCycleFromDay(salarySobPO.getSalaryCycleFromDay())
+ .setTaxCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getTaxCycleType()))
+ .setAttendCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getAttendCycleType()))
+ .setAttendCycleFromDay(salarySobPO.getAttendCycleFromDay())
+ .setSocialSecurityCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getSocialSecurityCycleType()))
+ .setEmployeeRange("1")
+ .setDescription(salarySobPO.getDescription());
+
+ }
+}
diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobCycleBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobCycleBO.java
new file mode 100644
index 000000000..baec64caf
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobCycleBO.java
@@ -0,0 +1,90 @@
+package com.engine.salary.entity.salarysob.bo;
+
+import com.engine.salary.common.LocalDateRange;
+import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import com.engine.salary.enums.SalaryCycleTypeEnum;
+
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.YearMonth;
+import java.util.Objects;
+
+/**
+ * 薪资账套的薪资周期、税款所属期、考勤周期、福利台账月份
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public class SalarySobCycleBO {
+
+ /**
+ * 根据薪资所属月计算出薪资账套的薪资周期、税款所属期、考勤周期、福利台账月份
+ *
+ * @param salarySob 薪资账套
+ * @param salaryMonth 薪资所属月
+ * @return
+ */
+ public static SalarySobCycleDTO buildSalarySobCycle(SalarySobPO salarySob, YearMonth salaryMonth) {
+ if (salarySob == null) {
+ return null;
+ }
+ return SalarySobCycleDTO.builder()
+ .salarySobId(salarySob.getId())
+ .salaryMonth(salaryMonth)
+ .taxCycle(buildCycle(salaryMonth, salarySob.getTaxCycleType()))
+ .socialSecurityCycle(buildCycle(salaryMonth, salarySob.getSocialSecurityCycleType()))
+ .salaryCycle(buildCycleDateRange(salaryMonth, salarySob.getSalaryCycleType(), salarySob.getSalaryCycleFromDay()))
+ .attendCycle(buildCycleDateRange(salaryMonth, salarySob.getAttendCycleType(), salarySob.getAttendCycleFromDay()))
+ .build();
+ }
+
+ /**
+ * 根据薪资所属月、薪资账套所设置的税款所属期（或福利台账月份）计算出税款所属期、福利台账的具体月份
+ *
+ * @param salaryMonth 薪资所属月
+ * @param cycleType 薪资账套所设置的税款所属期（或福利台账月份）
+ * @return
+ */
+ private static YearMonth buildCycle(YearMonth salaryMonth, Integer cycleType) {
+ if (Objects.equals(cycleType, SalaryCycleTypeEnum.BEFORE_LAST_MONTH.getValue())) {
+ return salaryMonth.plus(Period.ofMonths(-2));
+ }
+ if (Objects.equals(cycleType, SalaryCycleTypeEnum.LAST_MONTH.getValue())) {
+ return salaryMonth.plus(Period.ofMonths(-1));
+ }
+ if (Objects.equals(cycleType, SalaryCycleTypeEnum.THIS_MONTH.getValue())) {
+ return salaryMonth;
+ }
+ if (Objects.equals(cycleType, SalaryCycleTypeEnum.NEXT_MONTH.getValue())) {
+ return salaryMonth.plus(Period.ofMonths(1));
+ }
+ return null;
+ }
+
+ /**
+ * 根据薪资所属月、薪资账套所设置的薪资周期（或考勤周期）、薪资周期起始日（活考勤周期起始日）计算出薪资账套的薪资周期、考勤周期的具体日期范围
+ *
+ * @param salaryMonth 薪资所属月
+ * @param cycleType 薪资账套所设置的薪资周期（或考勤周期）
+ * @param fromDay 薪资账套所设置的薪资周期起始日（或考勤周期起始日）
+ * @return
+ */
+ private static LocalDateRange buildCycleDateRange(YearMonth salaryMonth, Integer cycleType, Integer fromDay) {
+ YearMonth result = buildCycle(salaryMonth, cycleType);
+ if (result == null) {
+ return null;
+ }
+ LocalDate fromDate = result.atEndOfMonth();
+ if (fromDate.getDayOfMonth() > fromDay) {
+ fromDate = result.atDay(fromDay);
+ }
+ LocalDate endDate = fromDate.plusMonths(1).plusDays(-1);
+ return LocalDateRange.builder()
+ .fromDate(fromDate)
+ .endDate(endDate)
+ .build();
+ }
+}
diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
new file mode 100644
index 000000000..8495077a6
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
@@ -0,0 +1,128 @@
+package com.engine.salary.entity.salarysob.bo;
+
+import com.engine.salary.entity.salarysob.param.SalarySobRangeEmpQueryParam;
+import com.engine.salary.entity.salarysob.po.SalarySobRangePO;
+import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
+import com.engine.salary.enums.salarysob.TargetTypeEnum;
+import com.engine.salary.util.SalaryEntityUtil;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 薪资账套人员范围
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public class SalarySobRangeBO {
+
+ /**
+ * 将薪资账套的人员范围转换成人员查询参数
+ *
+ * @param salarySobRanges 薪资账套的人员范围
+ * @return
+ */
+ public static List convert2EmployeeQueryParam(List salarySobRanges) {
+ if (CollectionUtils.isEmpty(salarySobRanges)) {
+ return Collections.emptyList();
+ }
+ Map> rangeMap = SalaryEntityUtil.group2Map(salarySobRanges, SalarySobRangePO::getTargetType);
+ List resultParams = Lists.newArrayListWithExpectedSize(rangeMap.size());
+ rangeMap.forEach((targetType, salarySobRangePOS) -> {
+ List employeeStatus = salarySobRangePOS.stream()
+ .map(e -> SalaryEmployeeStatusEnum.parseByValue(e.getEmployeeStatus()))
+ .filter(Objects::nonNull)
+ .map(e -> e.name().toLowerCase())
+ .distinct()
+ .collect(Collectors.toList());
+ if (employeeStatus.contains(SalaryEmployeeStatusEnum.ALL.name().toLowerCase())) {
+ employeeStatus = Collections.emptyList();
+ }
+ TargetTypeEnum targetTypeEnum = TargetTypeEnum.parseByValue(targetType);
+ SalarySobRangeEmpQueryParam queryParam = SalarySobRangeEmpQueryParam.builder()
+ .targetType(Optional.ofNullable(targetTypeEnum).map(TargetTypeEnum::name).orElse(StringUtils.EMPTY))
+ .targetIds(SalaryEntityUtil.properties(salarySobRangePOS, SalarySobRangePO::getTargetId))
+ .employeeStatus(employeeStatus)
+ .build();
+ resultParams.add(queryParam);
+ });
+ return resultParams;
+ }
+
+ /**
+ * 薪资账套的人员范围po转换成人员范围列表dto
+ *
+ * @param salarySobRanges 薪资账套的人员范围
+ * @param employeeComInfos 人员信息
+ * @param departmentComInfos 部门信息
+ * @param positionComInfos 岗位信息
+ * @return
+ */
+// public static List convert2ListDTO(List salarySobRanges,
+// List employeeComInfos,
+// List departmentComInfos,
+// List positionComInfos) {
+// if (CollectionUtils.isEmpty(salarySobRanges)) {
+// return Collections.emptyList();
+// }
+// Map employeeComInfoMap = SalaryEntityUtil.convert2Map(employeeComInfos, HrmEmployeeComInfo::getId, HrmEmployeeComInfo::getUsername);
+// Map departmentComInfoMap = SalaryEntityUtil.convert2Map(departmentComInfos, HrmDepartmentComInfo::getId, HrmDepartmentComInfo::getName);
+// Map positionComInfoMap = SalaryEntityUtil.convert2Map(positionComInfos, HrmPositionComInfo::getId, HrmPositionComInfo::getName);
+// return salarySobRanges.stream()
+// .map(salarySobRangePO -> {
+// TargetTypeEnum targetTypeEnum = TargetTypeEnum.parseByValue(salarySobRangePO.getTargetType());
+// SalaryEmployeeStatusEnum salaryEmployeeStatusEnum = SalaryEmployeeStatusEnum.parseByValue(salarySobRangePO.getEmployeeStatus());
+// return SalarySobRangeListDTO.builder()
+// .id(salarySobRangePO.getId())
+// .salarySobId(salarySobRangePO.getSalarySobId())
+// .targetType(targetTypeEnum)
+// .targetTypeName(Optional.ofNullable(targetTypeEnum)
+// .map(e -> SalaryI18nUtil.getI18nLabel(e.getLabelId(), e.getDefaultLabel()))
+// .orElse(StringUtils.EMPTY))
+// .targetId(salarySobRangePO.getTargetId())
+// .targetName(buildTargetName(salarySobRangePO, employeeComInfoMap, departmentComInfoMap, positionComInfoMap))
+// .employeeStatus(Optional.ofNullable(salaryEmployeeStatusEnum)
+// .map(e -> SalaryI18nUtil.getI18nLabel(e.getLabelId(), e.getDefaultLabel()))
+// .orElse(StringUtils.EMPTY))
+// .build();
+// })
+// .collect(Collectors.toList());
+// }
+
+ /**
+ * 解析薪资账套人员范围中对象的名称（可能是人员名称、部门名称、岗位名称……）
+ *
+ * @param salarySobRange 薪资账套的人员范围
+ * @param employeeComInfoMap 人员信息
+ * @param departmentComInfoMap 部门信息
+ * @param positionComInfoMap 岗位信息
+ * @return
+ */
+ private static String buildTargetName(SalarySobRangePO salarySobRange,
+ Map employeeComInfoMap,
+ Map departmentComInfoMap,
+ Map positionComInfoMap) {
+ TargetTypeEnum targetTypeEnum = TargetTypeEnum.parseByValue(salarySobRange.getTargetType());
+ if (Objects.isNull(targetTypeEnum)) {
+ return StringUtils.EMPTY;
+ }
+ switch (targetTypeEnum) {
+ case EMPLOYEE:
+ return employeeComInfoMap.getOrDefault(salarySobRange.getTargetId(), StringUtils.EMPTY);
+ case DEPT:
+ return departmentComInfoMap.getOrDefault(salarySobRange.getTargetId(), StringUtils.EMPTY);
+ case POSITION:
+ return positionComInfoMap.getOrDefault(salarySobRange.getTargetId(), StringUtils.EMPTY);
+ default:
+ return StringUtils.EMPTY;
+ }
+ }
+
+
+}
diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeSaveBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeSaveBO.java
new file mode 100644
index 000000000..9298aed4d
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeSaveBO.java
@@ -0,0 +1,90 @@
+package com.engine.salary.entity.salarysob.bo;
+
+import com.engine.salary.constant.SalaryDefaultTenantConstant;
+import com.engine.salary.entity.salarysob.param.SalarySobRangeSaveParam;
+import com.engine.salary.entity.salarysob.po.SalarySobRangePO;
+import com.engine.salary.util.SalaryEntityUtil;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 薪资账套的人员范围保存
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public class SalarySobRangeSaveBO {
+
+ /**
+ * 处理前端传回的保存参数，转换成对应的po（如果保存参数中的人员、部门、岗位等之前就已经添加过了，就不需要再次保存了）
+ *
+ * @param salarySobRanges
+ * @param saveParam
+ * @param employeeId
+ * @return
+ */
+ public static Result handle(List salarySobRanges, SalarySobRangeSaveParam saveParam, Long employeeId) {
+ Date now = new Date();
+ Result handleResult = Result.builder()
+ .needInsertSalarySobRanges(Lists.newArrayList())
+ .needUpdateSalarySobRanges(Lists.newArrayList())
+ .build();
+ if (CollectionUtils.isEmpty(saveParam.getTargetParams())) {
+ return handleResult;
+ }
+ Map salarySobRangeMap = SalaryEntityUtil.convert2Map(salarySobRanges, e -> e.getIncludeType() + "-" + e.getTargetType() + "-" + e.getTargetId());
+ for (SalarySobRangeSaveParam.SalarySobRangeTargetParam targetParam : saveParam.getTargetParams()) {
+ String key = saveParam.getIncludeType() + "-" + targetParam.getTargetType().getValue() + "-" + targetParam.getTargetId();
+ if (salarySobRangeMap.containsKey(key)) {
+ SalarySobRangePO salarySobRangePO = salarySobRangeMap.get(key);
+ salarySobRangePO.setEmployeeStatus(saveParam.getEmployeeStatus().getValue());
+ salarySobRangePO.setUpdateTime(now);
+ handleResult.getNeedUpdateSalarySobRanges().add(salarySobRangePO);
+ continue;
+ }
+ SalarySobRangePO salarySobRangePO = SalarySobRangePO.builder()
+// .id(IdGenerator.generate())
+ .salarySobId(saveParam.getSalarySobId())
+ .targetType(targetParam.getTargetType().getValue())
+ .targetId(targetParam.getTargetId())
+ .employeeStatus(saveParam.getEmployeeStatus().getValue())
+ .includeType(saveParam.getIncludeType())
+ .creator(employeeId)
+ .createTime(now)
+ .updateTime(now)
+ .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+ .deleteType(0)
+ .build();
+ handleResult.getNeedInsertSalarySobRanges().add(salarySobRangePO);
+ }
+ return handleResult;
+ }
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Result {
+
+ /**
+ * 需要更新的人员范围
+ */
+ private Collection needUpdateSalarySobRanges;
+
+ /**
+ * 需要新增的人员范围
+ */
+ private Collection needInsertSalarySobRanges;
+ }
+}
diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java
new file mode 100644
index 000000000..27b4bfc94
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java
@@ -0,0 +1,149 @@
+package com.engine.salary.entity.salarysob.dto;
+
+import com.engine.salary.component.WeaFormOption;
+import com.engine.salary.enums.SalaryCycleTypeEnum;
+import com.engine.salary.enums.SalarySobStatusEnum;
+import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
+import com.engine.salary.util.SalaryI18nUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 薪资账套基础信息表单
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySobBasicFormDTO {
+
+ //主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+// @SalaryForm(
+// label = "账套名称",
+// labelId = 93876,
+// items = {
+// @SalaryFormItem(itemType = WeaFormItemType.INPUT, required = true, maxLength = "40")
+// }
+// )
+// //薪资账套的名称")
+ private String name;
+
+// @SalaryForm(
+// label = "薪资类型",
+// labelId = 98380,
+// items = @SalaryFormItem(name = "taxableItems", itemType = WeaFormItemType.SELECT, required = true, optionsEnum = IncomeCategoryEnum.class)
+// )
+ //薪资类型")
+ private IncomeCategoryEnum taxableItems;
+
+// @SalaryForm(
+// label = "薪资周期",
+// labelId = 86155,
+// items = {
+// @SalaryFormItem(name = "salaryCycleType", itemType = WeaFormItemType.SELECT, required = true, optionsEnum = SalaryCycleTypeEnum.class),
+// @SalaryFormItem(name = "salaryCycleFromDay", itemType = WeaFormItemType.SELECT, required = true, options = "listCycleFromDayOption()")
+// }
+// )
+ //薪资周期")
+ private SalaryCycleTypeEnum salaryCycleType;
+
+ //薪资周期的起始日期")
+ private Integer salaryCycleFromDay;
+
+// @SalaryForm(
+// label = "税款所属期",
+// labelId = 86176,
+// items = {
+// @SalaryFormItem(itemType = WeaFormItemType.SELECT, required = true, optionsEnum = SalaryCycleTypeEnum.class)
+// }
+// )
+ //税款所属期")
+ private SalaryCycleTypeEnum taxCycleType;
+
+// @SalaryForm(
+// label = "考勤周期",
+// labelId = 87616,
+// items = {
+// @SalaryFormItem(name = "attendCycleType", itemType = WeaFormItemType.SELECT, required = true, optionsEnum = SalaryCycleTypeEnum.class),
+// @SalaryFormItem(name = "attendCycleFromDay", itemType = WeaFormItemType.SELECT, required = true, options = "listCycleFromDayOption()")
+// }
+// )
+ //考勤周期")
+ private SalaryCycleTypeEnum attendCycleType;
+
+ //考勤周期起始日期")
+ private Integer attendCycleFromDay;
+
+// @SalaryForm(
+// label = "福利台账月份",
+// labelId = 91560,
+// items = {
+// @SalaryFormItem(itemType = WeaFormItemType.SELECT, required = true, optionsEnum = SalaryCycleTypeEnum.class)
+// }
+// )
+ //福利台账月份")
+ private SalaryCycleTypeEnum socialSecurityCycleType;
+
+// @SalaryForm(
+// label = "核算人员范围",
+// labelId = 95789,
+// items = {
+// @SalaryFormItem(itemType = WeaFormItemType.CHECKBOX, required = true, options = "listEmployeeRangeOption()")
+// }
+// )
+ //核算人员范围")
+ private String employeeRange;
+
+ //目前薪资账套所处的步骤")
+ private SalarySobStatusEnum status;
+
+// @SalaryForm(
+// label = "备注",
+// labelId = 84961,
+// items = {
+// @SalaryFormItem(itemType = WeaFormItemType.TEXTAREA)
+// }
+// )
+ //备注")
+ private String description;
+
+ /**
+ * 薪资账套详情-薪资周期/考勤周期
+ *
+ * @return
+ */
+ public List listCycleFromDayOption() {
+ List resultList = Lists.newArrayListWithExpectedSize(31);
+ for (int i = 1; i <= 31; i++) {
+ resultList.add(new WeaFormOption(String.valueOf(i), SalaryI18nUtil.getI18nLabel(98382, "{0}号").replace("{0}", "" + i)));
+ }
+ return resultList;
+ }
+
+ /**
+ * 薪资账套详情-核算人员范围
+ *
+ * @return
+ */
+ public List listEmployeeRangeOption() {
+ WeaFormOption weaFormOption = new WeaFormOption("1", SalaryI18nUtil.getI18nLabel(98381, "【入职日期≤薪资周期止】且【离职日期≥薪资周期起】"));
+ weaFormOption.setDisabled(true);
+ return Collections.singletonList(weaFormOption);
+ }
+}
diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java
new file mode 100644
index 000000000..197a14d02
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java
@@ -0,0 +1,53 @@
+package com.engine.salary.entity.salarysob.dto;
+
+import com.cloudstore.eccom.pc.table.WeaTableType;
+import com.engine.salary.annotation.SalaryTable;
+import com.engine.salary.annotation.SalaryTableColumn;
+import com.engine.salary.annotation.SalaryTableOperate;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 薪资账套列表
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@SalaryTable(pageId = "b4f85287-e3f9-4d11-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = {
+ @SalaryTableOperate(index = "0", text = "编辑"),
+ @SalaryTableOperate(index = "1", text = "复制"),
+ @SalaryTableOperate(index = "2", text = "操作日志"),
+ @SalaryTableOperate(index = "3", text = "关联人员"),
+ @SalaryTableOperate(index = "4", text = "删除")
+})
+public class SalarySobListDTO {
+
+ //主键id
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @SalaryTableColumn(text = "账套名称", width = "10%", column = "name")
+ private String name;
+
+ @SalaryTableColumn(text = "薪资周期", width = "10%", column = "salaryCycle")
+ private String salaryCycle;
+
+ @SalaryTableColumn(text = "启用", width = "10%", column = "disable")
+ private Integer disable;
+
+ @SalaryTableColumn(text = "备注", width = "10%", column = "description")
+ private String description;
+
+ @SalaryTableColumn(text = "操作", width = "20%", column = "operate")
+ private String operate;
+}
diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
new file mode 100644
index 000000000..97dceb30d
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
@@ -0,0 +1,51 @@
+package com.engine.salary.entity.salarysob.dto;
+
+import com.cloudstore.eccom.pc.table.WeaTableType;
+import com.engine.salary.annotation.SalaryTable;
+import com.engine.salary.annotation.SalaryTableColumn;
+import com.engine.salary.enums.salarysob.TargetTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 薪资账套人员范围列表
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@SalaryTable(pageId = "b4f85287-e3f9-4d11-ad90-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX)
+public class SalarySobRangeListDTO {
+
+ //主键id
+ private Long id;
+
+ //薪资账套的id
+ private Long salarySobId;
+
+ /**
+ * 对象类型
+ *
+ * @see TargetTypeEnum
+ */
+ private Integer targetType;
+
+ @SalaryTableColumn(text = "对象类型", width = "10%", column = "targetTypeName")
+ private String targetTypeName;
+
+ @SalaryTableColumn(text = "对象", width = "10%", column = "targetName")
+ private String targetName;
+
+ //对象
+ private Long targetId;
+
+ @SalaryTableColumn(text = "员工状态", width = "10%", column = "employeeStatus")
+ private String employeeStatus;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleItemQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleItemQueryParam.java
new file mode 100644
index 000000000..64fabfc59
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleItemQueryParam.java
@@ -0,0 +1,33 @@
+package com.engine.salary.entity.salarysob.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+
+/**
+ * 调薪规则查询薪资项目
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySobAdjustRuleItemQueryParam {
+
+ /**
+ * 薪资账套的ID不允许为空
+ */
+ @DataCheck(require = true, message = "薪资账套的ID不允许为空")
+ private Long salarySobId;
+
+ //已经设置了需要排除的账套内的薪资项目副本id
+ private Collection excludeSalaryItemIds;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleQueryParam.java
new file mode 100644
index 000000000..6ec5a7461
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleQueryParam.java
@@ -0,0 +1,27 @@
+package com.engine.salary.entity.salarysob.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description: 调薪计薪规则查询参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 12/31/21 1:52 PM
+ * @version:v1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySobAdjustRuleQueryParam {
+
+ /**
+ * 薪资账套的ID不允许为空
+ */
+// //@NotNull(message = "LABEL:86575")
+// //薪资账套的id")
+ private Long salarySobId;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleSaveParam.java
new file mode 100644
index 000000000..b69b722fd
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobAdjustRuleSaveParam.java
@@ -0,0 +1,52 @@
+package com.engine.salary.entity.salarysob.param;
+
+import com.engine.salary.enums.salarysob.SalarySobAdjustRuleTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @description: 调薪计薪规则保存参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 12/31/21 11:03 AM
+ * @version:v1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySobAdjustRuleSaveParam {
+
+ /**
+ * 薪资账套的ID不允许为空
+ */
+// //@NotNull(message = "LABEL:86575")
+// //薪资账套的id")
+ private Long salarySobId;
+
+ //规则参数")
+ private List ruleParams;
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class RuleParam {
+
+ //薪资项目的id")
+ private Long salaryItemId;
+
+ //生效日期")
+ private Integer dayOfMonth;
+
+ //在生效日期之前调薪如何调整")
+ private SalarySobAdjustRuleTypeEnum beforeAdjustmentType;
+
+ //在生效日期之后调薪如何调整")
+ private SalarySobAdjustRuleTypeEnum afterAdjustmentType;
+ }
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java
index e6289eea3..dc91b3ca3 100644
--- a/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java
@@ -2,13 +2,14 @@ package com.engine.salary.entity.salarysob.param;
import com.engine.salary.enums.SalaryCycleTypeEnum;
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
+import com.engine.salary.util.valid.DataCheck;
+import com.engine.salary.util.valid.RuntimeTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-
/**
* 薪资账套保存参数
* Copyright: Copyright (c) 2022
@@ -24,60 +25,69 @@ import lombok.NoArgsConstructor;
public class SalarySobBasicSaveParam {
//主键id
+
+ @DataCheck(require = true, runtime = RuntimeTypeEnum.UPDATE, message = "id不允许为空")
private Long id;
- /**
- * 名称不允许为空
- * 名称不能超过40个字符长度
- */
//薪资账套的名称
+ @DataCheck(require = true, max = 40, message = "名称不允许为空且不能超过40个字符长度")
private String name;
/**
* 薪资类型不允许为空
+ *
+ * @see IncomeCategoryEnum
*/
- //薪资类型
- private IncomeCategoryEnum taxableItems;
+ @DataCheck(require = true, message = "薪资类型不允许为空")
+ private Integer taxableItems;
/**
* 薪资周期不允许为空
+ *
+ * @see SalaryCycleTypeEnum
*/
- //薪资周期
- private SalaryCycleTypeEnum salaryCycleType;
+ @DataCheck(require = true, message = "薪资周期不允许为空")
+ private Integer salaryCycleType;
/**
* 薪资周期的起始日期不允许为空
*/
- //薪资周期的起始日期
+ @DataCheck(require = true, message = "薪资周期的起始日期不允许为空")
private Integer salaryCycleFromDay;
/**
* 税款所属期不允许为空
+ *
+ * @see SalaryCycleTypeEnum
*/
- //税款所属期
- private SalaryCycleTypeEnum taxCycleType;
+ @DataCheck(require = true, message = "税款所属期不允许为空")
+ private Integer taxCycleType;
/**
* 考勤周期不允许为空
+ *
+ * @see SalaryCycleTypeEnum
*/
- //考勤周期
- private SalaryCycleTypeEnum attendCycleType;
+ @DataCheck(require = true, message = "考勤周期不允许为空")
+ private Integer attendCycleType;
/**
* 考勤周期起始日期不允许为空
*/
- //考勤周期起始日期
+ @DataCheck(require = true, message = "考勤周期起始日期不允许为空")
private Integer attendCycleFromDay;
/**
* 福利台账月份不允许为空
+ *
+ * @see SalaryCycleTypeEnum
*/
- //福利台账月份
- private SalaryCycleTypeEnum socialSecurityCycleType;
+ @DataCheck(require = true, message = "福利台账月份不允许为空")
+ private Integer socialSecurityCycleType;
/**
* 备注不能超过80个字符
*/
- //备注
+ @DataCheck(max = 80, message = "备注不能超过80个字符")
private String description;
}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleQueryParam.java
new file mode 100644
index 000000000..8b7f90f54
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleQueryParam.java
@@ -0,0 +1,27 @@
+package com.engine.salary.entity.salarysob.param;
+
+import com.engine.salary.common.BaseQueryParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description: 薪资账套校验规则查询参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 11/23/21 7:02 PM
+ * @version:v1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySobCheckRuleQueryParam extends BaseQueryParam {
+
+ //薪资账套id")
+ private Long salarySobId;
+
+ //名称")
+ private String name;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleSaveParam.java
new file mode 100644
index 000000000..1190d25f3
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobCheckRuleSaveParam.java
@@ -0,0 +1,49 @@
+package com.engine.salary.entity.salarysob.param;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @description: 薪资账套的校验规则保存参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 1/20/22 10:31 AM
+ * @version:v1.0
+ */
+@Data
+@Accessors(chain = true)
+public class SalarySobCheckRuleSaveParam {
+
+ //主键id")
+ private Long id;
+
+ /**
+ * 薪资账套的ID不允许为空
+ */
+ //@NotNull(message = "LABEL:86575")
+ //薪资账套id")
+ private Long salarySobId;
+
+ /**
+ * 名称不允许为空
+ */
+ //@NotEmpty(message = "LABEL:85607")
+ //@Length(max = 40, message = "LABEL:98177")
+ //规则名称")
+ private String name;
+
+ /**
+ * 校验规则公式不允许为空
+ */
+ //@NotNull(message = "LABEL:98647")
+
+ //公式id")
+ private Long formulaId;
+
+ /**
+ * 备注不能超过80个字符
+ */
+ //@Length(max = 80, message = "LABEL:98588")
+ //备注")
+ private String description;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java
new file mode 100644
index 000000000..a53476bfc
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java
@@ -0,0 +1,101 @@
+package com.engine.salary.entity.salarysob.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @description: 薪资账套薪资项目保存参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 11/25/21 2:43 PM
+ * @version:v1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySobItemSaveParam {
+
+ /**
+ * 薪资账套的ID不允许为空
+ */
+ //@NotNull(message = "LABEL:86575")
+ //薪资账套id")
+ private Long salarySobId;
+
+ /**
+ * 员工信息字段不能为空
+ */
+ //@NotEmpty(message = "LABEL:98610")
+ //薪资账套薪资项目保存参数-员工信息字段")
+ private List empFields;
+
+ //薪资账套薪资项目保存参数-薪资项目分组")
+ private List itemGroups;
+
+ //薪资账套薪资项目保存参数-薪资项目（未分类）")
+ private List items;
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ //"薪资账套薪资项目保存参数-员工基本信息字段")
+ public static class SalarySobEmpFieldParam {
+
+ //主键id")
+ private Long id;
+
+ //员工基本信息字段")
+ private String fieldId;
+
+ //显示顺序")
+ private Integer sortedIndex;
+ }
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ //"薪资账套薪资项目保存参数-薪资项目")
+ public static class SalarySobItemParam {
+
+ //主键id")
+ private Long id;
+
+ //薪资项目的id")
+ private Long salaryItemId;
+
+ //显示顺序")
+ private Integer sortedIndex;
+
+ //公式")
+ private Long formulaId;
+ }
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ //"薪资账套薪资项目保存参数-薪资项目分类")
+ public static class SalarySobItemGroupParam {
+
+ //主键id")
+ private Long id;
+
+ //@Max(value = 40, message = "LABEL:98177")
+ //@NotEmpty(message = "LABEL:86266")
+ //分类名称")
+ private String name;
+
+ //显示顺序")
+ private Integer sortedIndex;
+
+ //分类下的薪资项目")
+ private List items;
+ }
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
new file mode 100644
index 000000000..4e9e7af0a
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
@@ -0,0 +1,20 @@
+package com.engine.salary.entity.salarysob.param;
+
+import com.engine.salary.common.BaseQueryParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @description: 薪资账套列表查询参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 1/18/22 3:04 PM
+ * @version:v1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SalarySobListQueryParam extends BaseQueryParam {
+
+ //薪资账套名称")
+ private String name;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobRangeEmpQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeEmpQueryParam.java
new file mode 100644
index 000000000..cddc8f603
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeEmpQueryParam.java
@@ -0,0 +1,31 @@
+package com.engine.salary.entity.salarysob.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+
+/**
+ * @description: 薪资账套人员范围-直接查询
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 12/3/21 1:24 PM
+ * @version:v1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalarySobRangeEmpQueryParam {
+
+ //对象类型")
+ private String targetType;
+
+ //对象id")
+ private Collection targetIds;
+
+ //人员状态")
+ private Collection employeeStatus;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobRangeQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeQueryParam.java
new file mode 100644
index 000000000..41f66ec6b
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeQueryParam.java
@@ -0,0 +1,29 @@
+package com.engine.salary.entity.salarysob.param;
+
+import com.engine.salary.common.BaseQueryParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description: 薪资账套人员范围查询条件
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 11/22/21 11:10 AM
+ * @version:v1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//薪资账套人员范围查询条件")
+public class SalarySobRangeQueryParam extends BaseQueryParam {
+
+ //@NotNull(message = "LABEL:90405")
+ //薪资账套的id")
+ private Long salarySobId;
+
+ //对象名称")
+ private String targetName;
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
new file mode 100644
index 000000000..b3e4b5f9f
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
@@ -0,0 +1,68 @@
+package com.engine.salary.entity.salarysob.param;
+
+import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
+import com.engine.salary.enums.salarysob.TargetTypeEnum;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description: 薪资账套人员范围保存参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 11/11/21 10:05 AM
+ * @version:v1.0
+ */
+@Data
+//薪资账套人员范围保存参数")
+public class SalarySobRangeSaveParam {
+
+ /**
+ * 薪资账套的ID不允许为空
+ */
+ //@NotNull(message = "LABEL:86575")
+ //薪资账套的id")
+ private Long salarySobId;
+
+ /**
+ * 只能选择 关联人员范围/从范围中排除
+ */
+ //@NotNull(message = "LABEL:84026")
+ //@Min(message = "LABEL:84026", value = 0)
+ //@Max(message = "LABEL:84026", value = 1)
+ //是包含还是排除。0：排除、1：包含")
+ private Integer includeType;
+
+ /**
+ * 对象不能为空
+ */
+ //@NotEmpty(message = "LABEL:98598")
+ //对象")
+ private List targetParams;
+
+ /**
+ * 员工状态不允许为空
+ */
+ //@NotNull(message = "LABEL:98599")
+ //员工状态")
+ private SalaryEmployeeStatusEnum employeeStatus;
+
+ @Data
+ //薪资账套人员范围保存参数中的对象")
+ public static class SalarySobRangeTargetParam {
+
+ /**
+ * 对象类型不能为空
+ */
+ //@NotNull(message = "LABEL:98600")
+ //对象类型")
+ private TargetTypeEnum targetType;
+
+ /**
+ * 对象不能为空
+ */
+ //@NotNull(message = "LABEL:98598")
+ //对象id")
+ private Long targetId;
+ }
+}
diff --git a/src/com/engine/salary/entity/salarysob/param/UpdateCheckRuleFormulaParam.java b/src/com/engine/salary/entity/salarysob/param/UpdateCheckRuleFormulaParam.java
new file mode 100644
index 000000000..33e5e96c6
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/param/UpdateCheckRuleFormulaParam.java
@@ -0,0 +1,34 @@
+package com.engine.salary.entity.salarysob.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description: 更新校验规则的公式校验规则更新参数
+ * @author: xiajun
+ * @modified By: xiajun
+ * @date: Created in 12/8/21 10:35 AM
+ * @version:v1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateCheckRuleFormulaParam {
+
+ /**
+ * 校验规则ID不能为空
+ */
+ //@NotNull(message = "LABEL:98648")
+ //校验规则的id")
+ private Long id;
+
+ /**
+ * 校验规则公式能为空
+ */
+ //@NotNull(message = "LABEL:98647")
+ //校验规则的公式id")
+ private Long formulaId;
+}
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobAdjustRulePO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobAdjustRulePO.java
new file mode 100644
index 000000000..86bd64c40
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobAdjustRulePO.java
@@ -0,0 +1,87 @@
+package com.engine.salary.entity.salarysob.po;
+
+import com.engine.salary.enums.salarysob.SalarySobAdjustRuleTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 调薪计薪规则
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_salary_sob_adjust_rule
+public class SalarySobAdjustRulePO {
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 薪资账套id
+ */
+ private Long salarySobId;
+
+ /**
+ * 薪资项目id
+ */
+ private Long salaryItemId;
+
+ /**
+ * 生效日期
+ */
+ private Integer dayOfMonth;
+
+ /**
+ * 在生效日期之前调薪如何调整
+ *
+ * @see SalarySobAdjustRuleTypeEnum
+ */
+ private Integer beforeAdjustmentType;
+
+ /**
+ * 在生效日期之后调薪如何调整
+ *
+ * @see SalarySobAdjustRuleTypeEnum
+ */
+ private Integer afterAdjustmentType;
+
+ /**
+ * 租户key
+ */
+ private String tenantKey;
+
+ /**
+ * 创建人id
+ */
+ private Long creator;
+
+ /**
+ * 是否删除
+ */
+ private Integer deleteType;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ Collection ids;
+}
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobCheckRulePO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobCheckRulePO.java
new file mode 100644
index 000000000..857b82895
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobCheckRulePO.java
@@ -0,0 +1,77 @@
+package com.engine.salary.entity.salarysob.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 薪资账套校验规则
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_salary_sob_check_rule")
+public class SalarySobCheckRulePO {
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 薪资账套id
+ */
+ private Long salarySobId;
+
+ /**
+ * 名称
+ */
+ private String name;
+
+ /**
+ * 校验规则
+ */
+ private Long formulaId;
+
+ /**
+ * 备注
+ */
+ private String description;
+
+ /**
+ * 租户key
+ */
+ private String tenantKey;
+
+ /**
+ * 创建人id
+ */
+ private Long creator;
+
+ /**
+ * 是否删除
+ */
+ private Integer deleteType;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ Collection ids;
+}
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultEmpFieldPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultEmpFieldPO.java
new file mode 100644
index 000000000..af7faeb77
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultEmpFieldPO.java
@@ -0,0 +1,72 @@
+package com.engine.salary.entity.salarysob.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 薪资账套默认的员工信息字段
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_sob_default_emp_field")
+public class SalarySobDefaultEmpFieldPO {
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 字段code
+ */
+ private String fieldCode;
+
+ /**
+ * 排序字段
+ */
+ private Integer sortedIndex;
+
+ /**
+ * 是否可以删除
+ */
+ private Integer canDelete;
+
+ /**
+ * 租户key
+ */
+ private String tenantKey;
+
+ /**
+ * 创建人id
+ */
+ private Long creator;
+
+ /**
+ * 是否删除
+ */
+ private Integer deleteType;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ Collection ids;
+}
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemPO.java
new file mode 100644
index 000000000..b678a5e99
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemPO.java
@@ -0,0 +1,80 @@
+package com.engine.salary.entity.salarysob.po;
+
+import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 薪资账套默认包含的薪资项目
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_salary_sob_default_item")
+public class SalarySobDefaultItemPO {
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 薪资类型
+ *
+ * @see IncomeCategoryEnum
+ */
+ private Integer incomeCategory;
+
+ /**
+ * 系统默认的薪资项目id
+ */
+ private Long sysSalaryItemId;
+
+ /**
+ * 能否编辑
+ */
+ private Integer canEdit;
+
+ /**
+ * 能否删除
+ */
+ private Integer canDelete;
+
+ /**
+ * 租户key
+ */
+ private String tenantKey;
+
+ /**
+ * 创建人id
+ */
+ private Long creator;
+
+ /**
+ * 是否删除
+ */
+ private Integer deleteType;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ Collection ids;
+}
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobEmpFieldPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobEmpFieldPO.java
new file mode 100644
index 000000000..01d44a0ed
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobEmpFieldPO.java
@@ -0,0 +1,79 @@
+package com.engine.salary.entity.salarysob.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 薪资账套-薪资项目-员工基本信息
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_salary_sob_emp_field
+public class SalarySobEmpFieldPO {
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 薪资账套id
+ */
+ private Long salarySobId;
+
+ /**
+ * 字段code
+ */
+ private String fieldCode;
+
+ /**
+ * 排序字段
+ */
+ private Integer sortedIndex;
+
+ /**
+ * 是否可以删除
+ */
+ private Integer canDelete;
+
+ /**
+ * 租户key
+ */
+ private String tenantKey;
+
+ /**
+ * 创建人id
+ */
+ private Long creator;
+
+ /**
+ * 是否删除
+ */
+ private Integer deleteType;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ Collection ids;
+}
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
index 53bd242ed..1ec2e8e6d 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
@@ -5,6 +5,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.util.Collection;
import java.util.Date;
/**
@@ -81,4 +82,6 @@ public class SalarySobItemPO {
* 更新时间
*/
private Date updateTime;
+
+ Collection ids;
}
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
index f7f8d7af8..18a01d44e 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
@@ -4,7 +4,9 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.util.Collection;
import java.util.Date;
/**
@@ -12,8 +14,10 @@ import java.util.Date;
*/
@Data
@Builder
+@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
+//hrsa_salary_sob
public class SalarySobPO {
/**
* 主键id
@@ -80,4 +84,6 @@ public class SalarySobPO {
*/
private String tenantKey;
+ Collection ids;
+
}
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
new file mode 100644
index 000000000..d6a0da94b
--- /dev/null
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
@@ -0,0 +1,86 @@
+package com.engine.salary.entity.salarysob.po;
+
+import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
+import com.engine.salary.enums.salarysob.TargetTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Collection;
+import java.util.Date;
+
+/**
+ * 关联人员
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+//hrsa_salary_sob_range", autoResultMap = true)
+public class SalarySobRangePO {
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 薪资账套的id
+ */
+ private Long salarySobId;
+
+ /**
+ * 对象类型
+ * @see TargetTypeEnum
+ */
+ private Integer targetType;
+
+ /**
+ * 对象id
+ */
+ private Long targetId;
+
+ /**
+ * 人员状态
+ * @see SalaryEmployeeStatusEnum
+ */
+ private Integer employeeStatus;
+
+ /**
+ * 是包含还是排除 0：排除、1：包含
+ */
+ private Integer includeType;
+
+ /**
+ * 租户key
+ */
+ private String tenantKey;
+
+ /**
+ * 创建人id
+ */
+ private Long creator;
+
+ /**
+ * 是否删除
+ */
+ private Integer deleteType;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ Collection ids;
+}
diff --git a/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java b/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java
index 8bd27f2aa..4ca90ed99 100644
--- a/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java
+++ b/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java
@@ -6,12 +6,13 @@ import com.engine.salary.enums.BaseEnum;
import java.util.Objects;
/**
- * @description:
- * @author: xiajun
- * @modified By: xiajun
- * @date: Created in 11/22/21 5:26 PM
- * @version:v1.0
- */
+ * 人员状态
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
public enum SalaryEmployeeStatusEnum implements BaseEnum {
ALL(0, "全部", 85155),
diff --git a/src/com/engine/salary/exception/SalaryRunTimeException.java b/src/com/engine/salary/exception/SalaryRunTimeException.java
index 77b87830b..5f30b683d 100644
--- a/src/com/engine/salary/exception/SalaryRunTimeException.java
+++ b/src/com/engine/salary/exception/SalaryRunTimeException.java
@@ -2,7 +2,7 @@ package com.engine.salary.exception;
import lombok.extern.slf4j.Slf4j;
-@Slf4j
+
public class SalaryRunTimeException extends RuntimeException {
public SalaryRunTimeException(String message) {
super(message);
diff --git a/src/com/engine/salary/init.sql b/src/com/engine/salary/init.sql
index 87691d124..957f920b4 100644
--- a/src/com/engine/salary/init.sql
+++ b/src/com/engine/salary/init.sql
@@ -1,26 +1,27 @@
--缴税人表主键自增
-alter table hrsa_tax_agent modify id bigint auto_increment;
-alter table hrsa_tax_rate_base modify id bigint auto_increment;
-alter table hrsa_tax_rate_detail modify id bigint auto_increment;
-alter table hrsa_add_up_deduction modify id bigint auto_increment;
-alter table hrsa_add_up_situation modify id bigint auto_increment;
-alter table hrsa_other_deduction modify id bigint auto_increment;
-alter table hrsa_attend_quote_field modify id bigint auto_increment;
-alter table hrsa_attend_quote_sync_set modify id bigint auto_increment;
+alter table hrsa_tax_agent modify id bigint auto_increment;
+alter table hrsa_tax_rate_base modify id bigint auto_increment;
+alter table hrsa_tax_rate_detail modify id bigint auto_increment;
+alter table hrsa_add_up_deduction modify id bigint auto_increment;
+alter table hrsa_add_up_situation modify id bigint auto_increment;
+alter table hrsa_other_deduction modify id bigint auto_increment;
+alter table hrsa_attend_quote_field modify id bigint auto_increment;
+alter table hrsa_attend_quote_sync_set modify id bigint auto_increment;
-alter table hrsa_salary_item modify id bigint auto_increment;
+alter table hrsa_salary_item modify id bigint auto_increment;
+alter table hrsa_salary_sob modify id bigint auto_increment;
--福利方案主键自增增加
-alter table hrsa_social_security_scheme modify id bigint auto_increment;
-alter table hrsa_scheme_detail modify id bigint auto_increment;
-alter table hrsa_insurance_category modify id bigint auto_increment;
+alter table hrsa_social_security_scheme modify id bigint auto_increment;
+alter table hrsa_scheme_detail modify id bigint auto_increment;
+alter table hrsa_insurance_category modify id bigint auto_increment;
--福利台账
-alter table hrsa_social_archives modify id bigint auto_increment;
-alter table hrsa_fund_archives modify id bigint auto_increment;
-alter table hrsa_other_archives modify id bigint auto_increment;
+alter table hrsa_social_archives modify id bigint auto_increment;
+alter table hrsa_fund_archives modify id bigint auto_increment;
+alter table hrsa_other_archives modify id bigint auto_increment;
diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.java
new file mode 100644
index 000000000..bd5aa6fc3
--- /dev/null
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.java
@@ -0,0 +1,70 @@
+package com.engine.salary.mapper.salarysob;
+
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface SalarySobMapper {
+
+ /**
+ * 查询所有记录
+ *
+ * @return 返回集合，没有返回空List
+ */
+ List listAll();
+
+ /**
+ * 条件查询
+ *
+ * @return 返回集合，没有返回空List
+ */
+ List listSome(SalarySobPO SalarySobPO);
+
+
+ /**
+ * 根据主键查询
+ *
+ * @param id 主键
+ * @return 返回记录，没有返回null
+ */
+ SalarySobPO getById(Long id);
+
+ /**
+ * 新增，忽略null字段
+ *
+ * @param SalarySobPO 新增的记录
+ * @return 返回影响行数
+ */
+ int insertIgnoreNull(SalarySobPO SalarySobPO);
+
+ /**
+ * 修改，修改所有字段
+ *
+ * @param SalarySobPO 修改的记录
+ * @return 返回影响行数
+ */
+ int update(SalarySobPO SalarySobPO);
+
+ /**
+ * 修改，忽略null字段
+ *
+ * @param SalarySobPO 修改的记录
+ * @return 返回影响行数
+ */
+ int updateIgnoreNull(SalarySobPO SalarySobPO);
+
+ /**
+ * 删除记录
+ *
+ * @param SalarySobPO 待删除的记录
+ * @return 返回影响行数
+ */
+ int delete(SalarySobPO SalarySobPO);
+
+ void deleteByIds(@Param("ids") Collection ids);
+
+ List listByParam(@Param("param") SalarySobPO SalarySobPO);
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
new file mode 100644
index 000000000..e923c72e8
--- /dev/null
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
@@ -0,0 +1,358 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ t
+ .
+ id
+ , t.name
+ , t.income_category
+ , t.salary_cycle_type
+ , t.salary_cycle_from_day
+ , t.tax_cycle_type
+ , t.attend_cycle_type
+ , t.attend_cycle_from_day
+ , t.social_security_cycle_type
+ , t.disable
+ , t.description
+ , t.creator
+ , t.create_time
+ , t.update_time
+ , t.delete_type
+ , t.tenant_key
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO hrsa_salary_sob
+
+
+
+ id,
+
+
+ name,
+
+
+ income_category,
+
+
+ salary_cycle_type,
+
+
+ salary_cycle_from_day,
+
+
+ tax_cycle_type,
+
+
+ attend_cycle_type,
+
+
+ attend_cycle_from_day,
+
+
+ social_security_cycle_type,
+
+
+ disable,
+
+
+ description,
+
+
+ creator,
+
+
+ create_time,
+
+
+ update_time,
+
+
+ delete_type,
+
+
+ tenant_key,
+
+
+
+
+ #{id},
+
+
+ #{name},
+
+
+ #{incomeCategory},
+
+
+ #{salaryCycleType},
+
+
+ #{salaryCycleFromDay},
+
+
+ #{taxCycleType},
+
+
+ #{attendCycleType},
+
+
+ #{attendCycleFromDay},
+
+
+ #{socialSecurityCycleType},
+
+
+ #{disable},
+
+
+ #{description},
+
+
+ #{creator},
+
+
+ #{createTime},
+
+
+ #{updateTime},
+
+
+ #{deleteType},
+
+
+ #{tenantKey},
+
+
+
+
+
+
+ UPDATE hrsa_salary_sob
+
+ name=#{name},
+ income_category=#{incomeCategory},
+ salary_cycle_type=#{salaryCycleType},
+ salary_cycle_from_day=#{salaryCycleFromDay},
+ tax_cycle_type=#{taxCycleType},
+ attend_cycle_type=#{attendCycleType},
+ attend_cycle_from_day=#{attendCycleFromDay},
+ social_security_cycle_type=#{socialSecurityCycleType},
+ disable=#{disable},
+ description=#{description},
+ creator=#{creator},
+ create_time=#{createTime},
+ update_time=#{updateTime},
+ delete_type=#{deleteType},
+ tenant_key=#{tenantKey},
+
+ WHERE id = #{id} AND delete_type = 0
+
+
+
+
+
+ UPDATE hrsa_salary_sob
+
+
+ name=#{name},
+
+
+ income_category=#{incomeCategory},
+
+
+ salary_cycle_type=#{salaryCycleType},
+
+
+ salary_cycle_from_day=#{salaryCycleFromDay},
+
+
+ tax_cycle_type=#{taxCycleType},
+
+
+ attend_cycle_type=#{attendCycleType},
+
+
+ attend_cycle_from_day=#{attendCycleFromDay},
+
+
+ social_security_cycle_type=#{socialSecurityCycleType},
+
+
+ disable=#{disable},
+
+
+ description=#{description},
+
+
+ creator=#{creator},
+
+
+ create_time=#{createTime},
+
+
+ update_time=#{updateTime},
+
+
+ delete_type=#{deleteType},
+
+
+ tenant_key=#{tenantKey},
+
+
+ WHERE id = #{id} AND delete_type = 0
+
+
+
+
+
+ UPDATE hrsa_salary_sob
+ SET delete_type=1
+ WHERE id = #{id}
+ AND delete_type = 0
+
+
+
+ UPDATE hrsa_salary_sob
+ SET delete_type = 1
+ WHERE delete_type = 0
+ AND id IN
+
+ #{id}
+
+
+
+
+
+
+
+
+
+ AND name like CONCAT('%',#{param.name},'%')
+
+
+
+
+ AND name like '%'||#{param.name}||'%'
+
+
+
+
+ AND name like '%'+#{param.name}+'%'
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.java
new file mode 100644
index 000000000..2f66f8e20
--- /dev/null
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.java
@@ -0,0 +1,88 @@
+package com.engine.salary.mapper.salarysob;
+
+import com.engine.salary.entity.salarysob.param.SalarySobRangeEmpQueryParam;
+import com.engine.salary.entity.salarysob.po.SalarySobRangePO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface SalarySobRangeMapper {
+
+ /**
+ * 查询所有记录
+ *
+ * @return 返回集合，没有返回空List
+ */
+ List listAll();
+
+ /**
+ * 条件查询
+ *
+ * @return 返回集合，没有返回空List
+ */
+ List listSome(SalarySobRangePO salarySobRange);
+
+
+ /**
+ * 根据主键查询
+ *
+ * @param id 主键
+ * @return 返回记录，没有返回null
+ */
+ SalarySobRangePO getById(Long id);
+
+ /**
+ * 新增，忽略null字段
+ *
+ * @param salarySobRange 新增的记录
+ * @return 返回影响行数
+ */
+ int insertIgnoreNull(SalarySobRangePO salarySobRange);
+
+ /**
+ * 修改，修改所有字段
+ *
+ * @param salarySobRange 修改的记录
+ * @return 返回影响行数
+ */
+ int update(SalarySobRangePO salarySobRange);
+
+ /**
+ * 修改，忽略null字段
+ *
+ * @param salarySobRange 修改的记录
+ * @return 返回影响行数
+ */
+ int updateIgnoreNull(SalarySobRangePO salarySobRange);
+
+ /**
+ * 删除记录
+ *
+ * @param salarySobRange 待删除的记录
+ * @return 返回影响行数
+ */
+ int delete(SalarySobRangePO salarySobRange);
+
+
+ /**
+ * 批量保存
+ */
+ void batchInsert(@Param("collection") Collection salarySobRanges);
+
+ /**
+ * 按薪资账套id删除
+ */
+ void deleteBySalarySobIds(@Param("salarySobIds") Collection salarySobIds);
+
+ /**
+ * 按照主键id删除
+ */
+ void deleteByIds(@Param("ids") Collection ids);
+
+ /**
+ * 获取薪资账套的适用人员
+ */
+ List listEmployeeIds(@Param("params") Collection params);
+
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
new file mode 100644
index 000000000..35a037dcd
--- /dev/null
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
@@ -0,0 +1,362 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ t
+ .
+ id
+ , t.salary_sob_id
+ , t.target_type
+ , t.target_id
+ , t.employee_status
+ , t.include_type
+ , t.creator
+ , t.create_time
+ , t.update_time
+ , t.delete_type
+ , t.tenant_key
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO hrsa_salary_sob_range
+
+
+
+ id,
+
+
+ salary_sob_id,
+
+
+ target_type,
+
+
+ target_id,
+
+
+ employee_status,
+
+
+ include_type,
+
+
+ creator,
+
+
+ create_time,
+
+
+ update_time,
+
+
+ delete_type,
+
+
+ tenant_key,
+
+
+
+
+ #{id},
+
+
+ #{salarySobId},
+
+
+ #{targetType},
+
+
+ #{targetId},
+
+
+ #{employeeStatus},
+
+
+ #{includeType},
+
+
+ #{creator},
+
+
+ #{createTime},
+
+
+ #{updateTime},
+
+
+ #{deleteType},
+
+
+ #{tenantKey},
+
+
+
+
+
+
+ UPDATE hrsa_salary_sob_range
+
+ salary_sob_id=#{salarySobId},
+ target_type=#{targetType},
+ target_id=#{targetId},
+ employee_status=#{employeeStatus},
+ include_type=#{includeType},
+ creator=#{creator},
+ create_time=#{createTime},
+ update_time=#{updateTime},
+ delete_type=#{deleteType},
+ tenant_key=#{tenantKey},
+
+ WHERE id = #{id} AND delete_type = 0
+
+
+
+
+
+ UPDATE hrsa_salary_sob_range
+
+
+ salary_sob_id=#{salarySobId},
+
+
+ target_type=#{targetType},
+
+
+ target_id=#{targetId},
+
+
+ employee_status=#{employeeStatus},
+
+
+ include_type=#{includeType},
+
+
+ creator=#{creator},
+
+
+ create_time=#{createTime},
+
+
+ update_time=#{updateTime},
+
+
+ delete_type=#{deleteType},
+
+
+ tenant_key=#{tenantKey},
+
+
+ WHERE id = #{id} AND delete_type = 0
+
+
+
+
+
+ UPDATE hrsa_salary_sob_range
+ SET delete_type=1
+ WHERE id = #{id}
+ AND delete_type = 0
+
+
+
+
+ INSERT INTO hrsa_salary_sob_range(salary_sob_id, target_type, target_id, employee_status, include_type,
+ creator, create_time, update_time, delete_type, tenant_key)
+ VALUES
+
+ (
+ #{item.salarySobId},
+ #{item.targetType.value},
+ #{item.targetId},
+ #{item.employeeStatus.value},
+ #{item.includeType},
+ #{item.creator},
+ #{item.createTime},
+ #{item.updateTime},
+ #{item.deleteType},
+ #{item.tenantKey}
+ )
+
+
+
+ INSERT INTO hrsa_salary_sob_range(salary_sob_id, target_type, target_id, employee_status, include_type,
+ creator, create_time, update_time, delete_type, tenant_key)
+
+
+ select
+ #{item.salarySobId},
+ #{item.targetType.value},
+ #{item.targetId},
+ #{item.employeeStatus.value},
+ #{item.includeType},
+ #{item.creator},
+ #{item.createTime},
+ #{item.updateTime},
+ #{item.deleteType},
+ #{item.tenantKey}
+ from dual
+
+
+
+ INSERT INTO hrsa_salary_sob_range( salary_sob_id, target_type, target_id, employee_status, include_type,
+ creator, create_time, update_time, delete_type, tenant_key)
+ VALUES
+
+ (
+ #{item.salarySobId},
+ #{item.targetType.value},
+ #{item.targetId},
+ #{item.employeeStatus.value},
+ #{item.includeType},
+ #{item.creator},
+ #{item.createTime},
+ #{item.updateTime},
+ #{item.deleteType},
+ #{item.tenantKey}
+ )
+
+
+
+ UPDATE hrsa_salary_sob_range
+ SET delete_type = 1
+ WHERE delete_type = 0
+ AND salary_sob_id IN
+
+ #{salarySobId}
+
+
+
+
+ UPDATE hrsa_salary_sob_range
+ SET delete_type = 1
+ WHERE delete_type = 0
+ AND id IN
+
+ #{id}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/engine/salary/service/SalarySobRangeService.java b/src/com/engine/salary/service/SalarySobRangeService.java
new file mode 100644
index 000000000..8965a23bf
--- /dev/null
+++ b/src/com/engine/salary/service/SalarySobRangeService.java
@@ -0,0 +1,67 @@
+package com.engine.salary.service;
+
+import com.engine.salary.entity.salarysob.dto.SalarySobRangeListDTO;
+import com.engine.salary.entity.salarysob.param.SalarySobRangeQueryParam;
+import com.engine.salary.entity.salarysob.param.SalarySobRangeSaveParam;
+import com.engine.salary.entity.salarysob.po.SalarySobRangePO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 薪资账套人员范围
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public interface SalarySobRangeService {
+
+ /**
+ * 根据主键id查询薪资账套的人员范围
+ *
+ * @param ids 薪资账套的人员范围的主键id
+ * @return
+ */
+ List listByIds(Collection ids);
+
+ /**
+ * 根据薪资账套ID和类型查询薪资账套的人员范围
+ *
+ * @param salarySobId 薪资账套id
+ * @param includeType 0-从范围中排除/1-关联人员范围
+ * @return
+ */
+ List listBySalarySobIdAndIncludeType(Long salarySobId, Integer includeType);
+
+ /**
+ * 根据查询条件查询薪资账套的人员范围
+ *
+ * @param queryParam 查询条件
+ * @param includeType 0-从范围中排除/1-关联人员范围
+ * @return
+ */
+ List listPageByParamAndIncludeType(SalarySobRangeQueryParam queryParam, Integer includeType);
+
+ /**
+ * 保存
+ *
+ * @param saveParam 保存参数
+ */
+ void save(SalarySobRangeSaveParam saveParam);
+
+ /**
+ * 根据主键id删除薪资账套的人员范围
+ *
+ * @param ids 主键id
+ */
+ void deleteByIds(Collection ids);
+
+ /**
+ * 根据薪资账套id删除薪资账套的人员范围
+ *
+ * @param salarySobIds 薪资账套id
+ */
+ void deleteBySalarySobIds(Collection salarySobIds);
+}
diff --git a/src/com/engine/salary/service/SalarySobService.java b/src/com/engine/salary/service/SalarySobService.java
index 5287ff76f..ac46b53fa 100644
--- a/src/com/engine/salary/service/SalarySobService.java
+++ b/src/com/engine/salary/service/SalarySobService.java
@@ -24,55 +24,49 @@ public interface SalarySobService {
* 根据主键id获取单个薪资账套
*
* @param id 主键id
- * @param tenantKey 租户key
* @return
*/
- SalarySobPO getById(Long id, String tenantKey);
+ SalarySobPO getById(Long id);
/**
* 根据主键id查询薪资账套
*
* @param ids 主键id
- * @param tenantKey 租户key
* @return
*/
- List listByIds(Collection ids, String tenantKey);
+ List listByIds(Collection ids);
/**
* 根据名称精确匹配查询薪资账套
*
* @param name 薪资账套名称
- * @param tenantKey 租户key
* @return
*/
- List listByName(String name, String tenantKey);
+ List listByName(String name);
/**
* 根据名称（模糊匹配）查询薪资账套
*
* @param nameLike 薪资账套名称
- * @param tenantKey 租户key
* @return
*/
- List listByNameLike(String nameLike, String tenantKey);
+ List listByNameLike(String nameLike);
/**
* 查询启用/禁用的薪资账套
*
* @param disable 启用/禁用
- * @param tenantKey 租户key
* @return
*/
- List listByDisable(Integer disable, String tenantKey);
+ List listByDisable(Integer disable);
/**
* 根据薪资类型查询薪资账套
*
* @param incomeCategory 薪资类型
- * @param tenantKey 租户key
* @return
*/
- List listByIncomeCategory(IncomeCategoryEnum incomeCategory, String tenantKey);
+ List listByIncomeCategory(IncomeCategoryEnum incomeCategory);
/**
* 根据列表查询参数查询薪资账套（分页）
@@ -81,52 +75,44 @@ public interface SalarySobService {
* @param tenantKey 租户key
* @return
*/
-// Page listPageByParam(SalarySobListQueryParam queryParam, String tenantKey);
+// Page listPageByParam(SalarySobListQueryParam queryParam);
/**
* 保存
*
* @param saveParam 保存参数
- * @param employeeId 人员id
- * @param tenantKey 租户key
* @return
*/
- Long save(SalarySobBasicSaveParam saveParam, Long employeeId, String tenantKey);
+ Long save(SalarySobBasicSaveParam saveParam);
/**
* 编辑
*
* @param saveParam 更新参数
- * @param employeeId 人员id
- * @param tenantKey 租户key
* @return
*/
- Long update(SalarySobBasicSaveParam saveParam, Long employeeId, String tenantKey);
+ Long update(SalarySobBasicSaveParam saveParam);
/**
* 更新薪资账套的是否启用
*
* @param disableParam 更新参数
- * @param tenantKey 租户key
*/
- void updateDisable(SalarySobDisableParam disableParam, String tenantKey);
+ void updateDisable(SalarySobDisableParam disableParam);
/**
* 根据主键id删除
*
* @param ids 薪资账套的主键id
- * @param tenantKey 租户key
*/
- void deleteByIds(Collection ids, String tenantKey);
+ void deleteByIds(Collection ids);
/**
* 复制
*
* @param duplicateParam 复制参数
- * @param employeeId 人员id
- * @param tenantKey 租户key
*/
- void duplicate(SalarySobDuplicateParam duplicateParam, Long employeeId, String tenantKey);
+ void duplicate(SalarySobDuplicateParam duplicateParam);
/**
* 根据薪资所属月计算出薪资账套的薪资周期、考勤周期的具体日期范围以及税款所属期、福利台账月份的具体月份
diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
index ade136b39..011b5c644 100644
--- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
@@ -154,17 +154,17 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService
BeanUtils.copyProperties(salaryItemPO, newSalaryItemPO);
// 系统薪资项目的"属性"和"类型"不允许编辑
if (Objects.equals(newSalaryItemPO.getSystemType(), SalarySystemTypeEnum.CUSTOM.getValue())) {
- newSalaryItemPO.setCategory(saveParam.getCategory().getValue());
- newSalaryItemPO.setItemType(saveParam.getItemType().getValue());
+ newSalaryItemPO.setCategory(saveParam.getCategory());
+ newSalaryItemPO.setItemType(saveParam.getItemType());
}
newSalaryItemPO.setName(saveParam.getName());
newSalaryItemPO.setUseDefault(saveParam.getUseDefault());
newSalaryItemPO.setUseInEmployeeSalary(saveParam.getUseInEmployeeSalary());
- newSalaryItemPO.setRoundingMode(saveParam.getRoundingMode().getValue());
+ newSalaryItemPO.setRoundingMode(saveParam.getRoundingMode());
newSalaryItemPO.setPattern(saveParam.getPattern());
- newSalaryItemPO.setValueType(saveParam.getValueType().getValue());
- newSalaryItemPO.setFormulaId(saveParam.getValueType() == SalaryValueTypeEnum.INPUT ? 0L : saveParam.getFormulaId());
- newSalaryItemPO.setDatasource(saveParam.getValueType() == SalaryValueTypeEnum.INPUT ? SalaryDataSourceEnum.INPUT_IMPORT.getValue()
+ newSalaryItemPO.setValueType(saveParam.getValueType());
+ newSalaryItemPO.setFormulaId(Objects.equals(saveParam.getValueType(), SalaryValueTypeEnum.INPUT.getValue()) ? 0L : saveParam.getFormulaId());
+ newSalaryItemPO.setDatasource(Objects.equals(saveParam.getValueType(), SalaryValueTypeEnum.INPUT.getValue()) ? SalaryDataSourceEnum.INPUT_IMPORT.getValue()
: SalaryDataSourceEnum.CUSTOM_FORMULA.getValue());
newSalaryItemPO.setDescription(saveParam.getDescription());
newSalaryItemPO.setUpdateTime(new Date());
diff --git a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
new file mode 100644
index 000000000..100e344d3
--- /dev/null
+++ b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
@@ -0,0 +1,160 @@
+package com.engine.salary.service.impl;
+
+import com.engine.common.util.ServiceUtil;
+import com.engine.core.impl.Service;
+import com.engine.salary.biz.SalarySobRangeBiz;
+import com.engine.salary.entity.salarysob.bo.SalarySobRangeSaveBO;
+import com.engine.salary.entity.salarysob.dto.SalarySobRangeListDTO;
+import com.engine.salary.entity.salarysob.param.SalarySobRangeQueryParam;
+import com.engine.salary.entity.salarysob.param.SalarySobRangeSaveParam;
+import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import com.engine.salary.entity.salarysob.po.SalarySobRangePO;
+import com.engine.salary.enums.salarysob.TargetTypeEnum;
+import com.engine.salary.exception.SalaryRunTimeException;
+import com.engine.salary.service.SalarySobRangeService;
+import com.engine.salary.service.SalarySobService;
+import com.engine.salary.util.SalaryEntityUtil;
+import com.engine.salary.util.SalaryI18nUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import weaver.hrm.User;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 薪资账套人员范围
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public class SalarySobRangeServiceImpl extends Service implements SalarySobRangeService {
+
+ private SalarySobRangeBiz salarySobRangeMapper = new SalarySobRangeBiz();
+
+ private SalarySobService getSalarySobService(User user) {
+ return (SalarySobService) ServiceUtil.getService(SalarySobServiceImpl.class, user);
+ }
+
+
+// private ComInfoCache comInfoCache;
+// private LoggerTemplate salarySobLoggerTemplate;
+
+ @Override
+ public List listByIds(Collection ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return Collections.emptyList();
+ }
+ return salarySobRangeMapper.listSome(SalarySobRangePO.builder().ids(ids).build());
+ }
+
+ @Override
+ public List listBySalarySobIdAndIncludeType(Long salarySobId, Integer includeType) {
+ return salarySobRangeMapper.listSome(SalarySobRangePO.builder().salarySobId(salarySobId).includeType(includeType).build());
+ }
+
+ @Override
+ public List listPageByParamAndIncludeType(SalarySobRangeQueryParam queryParam, Integer includeType) {
+ // 查询人员范围
+ List salarySobRangePOS = listBySalarySobIdAndIncludeType(queryParam.getSalarySobId(), includeType);
+ // 查询人员信息
+ List