diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java index 607d967a5..f30052f62 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java @@ -6,7 +6,6 @@ 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; @@ -133,13 +132,13 @@ public class SalarySobBO { return new SalarySobBasicFormDTO() .setId(salarySobPO.getId()) .setName(salarySobPO.getName()) - .setTaxableItems(IncomeCategoryEnum.parseByValue(salarySobPO.getIncomeCategory())) - .setSalaryCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getSalaryCycleType())) + .setTaxableItems(salarySobPO.getIncomeCategory()) + .setSalaryCycleType(salarySobPO.getSalaryCycleType()) .setSalaryCycleFromDay(salarySobPO.getSalaryCycleFromDay()) - .setTaxCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getTaxCycleType())) - .setAttendCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getAttendCycleType())) + .setTaxCycleType(salarySobPO.getTaxCycleType()) + .setAttendCycleType(salarySobPO.getAttendCycleType()) .setAttendCycleFromDay(salarySobPO.getAttendCycleFromDay()) - .setSocialSecurityCycleType(SalaryCycleTypeEnum.parseByValue(salarySobPO.getSocialSecurityCycleType())) + .setSocialSecurityCycleType(salarySobPO.getSocialSecurityCycleType()) .setEmployeeRange("1") .setDescription(salarySobPO.getDescription()); diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java index 27b4bfc94..a6a2009ce 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java @@ -34,92 +34,56 @@ public class SalarySobBasicFormDTO { @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; + /** + * 薪资类型 + * @see IncomeCategoryEnum + */ + private Integer taxableItems; + + /** + * 薪资周期 + * @see SalaryCycleTypeEnum + */ + private Integer salaryCycleType; //薪资周期的起始日期") private Integer salaryCycleFromDay; -// @SalaryForm( -// label = "税款所属期", -// labelId = 86176, -// items = { -// @SalaryFormItem(itemType = WeaFormItemType.SELECT, required = true, optionsEnum = SalaryCycleTypeEnum.class) -// } -// ) - //税款所属期") - private SalaryCycleTypeEnum taxCycleType; + /** + * 税款所属期 + * @see SalaryCycleTypeEnum + */ + private Integer 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; + /** + * 考勤周期 + * @see SalaryCycleTypeEnum + */ + private Integer attendCycleType; //考勤周期起始日期") private Integer attendCycleFromDay; -// @SalaryForm( -// label = "福利台账月份", -// labelId = 91560, -// items = { -// @SalaryFormItem(itemType = WeaFormItemType.SELECT, required = true, optionsEnum = SalaryCycleTypeEnum.class) -// } -// ) - //福利台账月份") - private SalaryCycleTypeEnum socialSecurityCycleType; + /** + * 福利台账月份 + * @see SalaryCycleTypeEnum + */ + private Integer socialSecurityCycleType; -// @SalaryForm( -// label = "核算人员范围", -// labelId = 95789, -// items = { -// @SalaryFormItem(itemType = WeaFormItemType.CHECKBOX, required = true, options = "listEmployeeRangeOption()") -// } -// ) //核算人员范围") private String employeeRange; - //目前薪资账套所处的步骤") - private SalarySobStatusEnum status; + /** + * 目前薪资账套所处的步骤 + * @see SalarySobStatusEnum + */ + private Integer status; -// @SalaryForm( -// label = "备注", -// labelId = 84961, -// items = { -// @SalaryFormItem(itemType = WeaFormItemType.TEXTAREA) -// } -// ) //备注") private String description; diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java index b31674bfa..8c3a0e4fb 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java @@ -1,6 +1,5 @@ package com.engine.salary.entity.salarysob.dto; -import com.engine.salary.enums.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; @@ -42,29 +41,29 @@ public class SalarySobItemDTO { //名称 private String name; - //是否是系统内置的薪资项目 - private SalarySystemTypeEnum systemType; + //是否是系统内置的薪资项目 @see SalarySystemTypeEnum + private Integer systemType; //默认使用 private Integer useDefault; - //属性 - private SalaryItemCategoryEnum category; + //属性 @see SalaryItemCategoryEnum + private Integer category; //类型（展示名称） private String itemType; - //类型 - private SalaryItemTypeEnum itemTypeId; + //类型 @see SalaryItemTypeEnum + private Integer itemTypeId; - //取值方式 - private SalaryValueTypeEnum valueType; + //取值方式 @see SalaryValueTypeEnum + private Integer valueType; //数据来源（展示名称） private String dataSource; - //数据来源 - private SalaryDataSourceEnum dataSourceId; + //数据来源 @see SalaryDataSourceEnum + private Integer dataSourceId; //公式 @JsonSerialize(using = ToStringSerializer.class) diff --git a/src/com/engine/salary/init.sql b/src/com/engine/salary/init.sql index f2a1f2fe6..f219f1094 100644 --- a/src/com/engine/salary/init.sql +++ b/src/com/engine/salary/init.sql @@ -32,3 +32,14 @@ alter table hrsa_other_archives modify id bigint auto_increment; + + + + + +ALTER TABLE `ecology_hr`.`hrsa_salary_sob_default_item` +ADD COLUMN `sob_default_item_group_id` bigint(0) NOT NULL COMMENT '薪资账套默认薪资项目分类的id' AFTER `tenant_key`, +ADD COLUMN `sorted_index` int(0) NOT NULL COMMENT '显示顺序' AFTER `sob_default_item_group_id`; + + + diff --git a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml index 5a188125b..f154fda90 100644 --- a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml @@ -32,7 +32,6 @@ , t.code , t.system_type , t.sys_salary_item_id - , t.item_type , t.use_default , t.use_in_employee_salary , t.rounding_mode @@ -327,35 +326,35 @@ INSERT INTO hrsa_salary_item - ( name, code, system_type, sys_salary_item_id, item_type, use_default, use_in_employee_salary, + ( name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time, - update_time, creator, delete_type, tenant_key,data_type) + update_time, creator, delete_type, tenant_key, data_type) VALUES (#{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId}, #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode}, #{item.pattern}, #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit}, - #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey},#{item.dataType}) + #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType}) INSERT INTO hrsa_salary_item - (name, code, system_type, sys_salary_item_id, item_type, use_default, use_in_employee_salary, + (name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time, - update_time, creator, delete_type, tenant_key,data_type) + update_time, creator, delete_type, tenant_key, data_type) select #{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId}, #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode}, #{item.pattern}, #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit}, - #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey,#{item.dataType}} from dual + #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey, #{item.dataType}} from dual INSERT INTO hrsa_salary_item - (name, code, system_type, sys_salary_item_id, item_type, use_default, use_in_employee_salary, + (name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time, update_time, creator, delete_type, tenant_key, data_type) VALUES diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml index 31fdd3385..85c68e3f3 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml @@ -12,6 +12,8 @@ + + @@ -28,6 +30,8 @@ , t.update_time , t.delete_type , t.tenant_key + , t.sob_default_item_group_id + , t.sorted_index @@ -130,6 +134,12 @@ tenant_key, + + sob_default_item_group_id, + + + sorted_index, + @@ -162,6 +172,12 @@ #{tenantKey}, + + #{sobDefaultItemGroupId}, + + + #{sortedIndex}, + @@ -178,6 +194,8 @@ update_time=#{updateTime}, delete_type=#{deleteType}, tenant_key=#{tenantKey}, + sob_default_item_group_id=#{sobDefaultItemGroupId}, + sorted_index=#{sortedIndex}, WHERE id = #{id} AND delete_type = 0 @@ -214,6 +232,12 @@ tenant_key=#{tenantKey}, + + sob_default_item_group_id=#{sobDefaultItemGroupId}, + + + sorted_index=#{sortedIndex}, + WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/wrapper/SalarySobWrapper.java b/src/com/engine/salary/wrapper/SalarySobWrapper.java index 24ff98eff..b9d5c7e0f 100644 --- a/src/com/engine/salary/wrapper/SalarySobWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobWrapper.java @@ -105,7 +105,7 @@ public class SalarySobWrapper extends Service { // 薪资账套基础设置详情（目前核算人员范围的值固定为"1"） SalarySobBasicFormDTO basicForm = new SalarySobBasicFormDTO() .setEmployeeRange("1") - .setTaxableItems(IncomeCategoryEnum.WAGES_AND_SALARIES); + .setTaxableItems(IncomeCategoryEnum.WAGES_AND_SALARIES.getValue()); if (!Objects.isNull(id)) { // 查询薪资账套 SalarySobPO salarySobPO = getSalarySobService(user).getById(id);