相对更新
This commit is contained in:
parent
83e1cf2805
commit
a9d486bef6
|
|
@ -110,13 +110,13 @@ public class SalaryItemBO {
|
|||
return new SalaryItemFormDTO()
|
||||
.setId(salaryItemPO.getId())
|
||||
.setName(salaryItemPO.getName())
|
||||
.setSystemType(SalarySystemTypeEnum.parseByValue(salaryItemPO.getSystemType()))
|
||||
.setSystemType(salaryItemPO.getSystemType())
|
||||
.setUseDefault(salaryItemPO.getUseDefault())
|
||||
.setUseInEmployeeSalary(salaryItemPO.getUseInEmployeeSalary())
|
||||
.setRoundingMode(SalaryRoundingModeEnum.parseByValue(salaryItemPO.getRoundingMode()))
|
||||
.setRoundingMode(salaryItemPO.getRoundingMode())
|
||||
.setPattern(salaryItemPO.getPattern())
|
||||
.setValueType(SalaryValueTypeEnum.parseByValue(salaryItemPO.getValueType()))
|
||||
.setDataType(SalaryDataTypeEnum.parseByValue(salaryItemPO.getDataType()))
|
||||
.setValueType(salaryItemPO.getValueType())
|
||||
.setDataType(salaryItemPO.getDataType())
|
||||
.setFormulaId(salaryItemPO.getFormulaId())
|
||||
.setTaxDeclarationColumn(buildTaxDeclarationColumn(salaryItemPO.getCode()))
|
||||
.setDescription(salaryItemPO.getDescription())
|
||||
|
|
@ -158,7 +158,6 @@ public class SalaryItemBO {
|
|||
*
|
||||
* @param saveParam 保存参数/更新参数
|
||||
* @param employeeId 人员id
|
||||
* @param tenantKey 租户key
|
||||
* @return
|
||||
*/
|
||||
public static SalaryItemPO convert2SalaryItemPO(SalaryItemSaveParam saveParam, Long employeeId) {
|
||||
|
|
|
|||
|
|
@ -19,12 +19,13 @@ import java.util.*;
|
|||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @description: 系统薪资项目
|
||||
* @author: xiajun
|
||||
* @modified By: xiajun
|
||||
* @date: Created in 11/2/21 1:30 PM
|
||||
* @version:v1.0
|
||||
*/
|
||||
* 系统薪资项目
|
||||
* <p>Copyright: Copyright (c) 2022</p>
|
||||
* <p>Company: 泛微软件</p>
|
||||
*
|
||||
* @author qiantao
|
||||
* @version 1.0
|
||||
**/
|
||||
public class SysSalaryItemBO {
|
||||
/**
|
||||
* 查询参数构建queryWrapper
|
||||
|
|
@ -89,13 +90,13 @@ public class SysSalaryItemBO {
|
|||
.setId(sysSalaryItemPO.getId())
|
||||
.setName(sysSalaryItemPO.getName())
|
||||
.setCanEdit(sysSalaryItemPO.getCanEdit())
|
||||
.setSystemType(SalarySystemTypeEnum.parseByValue(sysSalaryItemPO.getSystemType()))
|
||||
.setSystemType(sysSalaryItemPO.getSystemType())
|
||||
.setUseDefault(sysSalaryItemPO.getUseDefault())
|
||||
.setUseInEmployeeSalary(sysSalaryItemPO.getUseInEmployeeSalary())
|
||||
.setRoundingMode(SalaryRoundingModeEnum.parseByValue(sysSalaryItemPO.getRoundingMode()))
|
||||
.setRoundingMode(sysSalaryItemPO.getRoundingMode())
|
||||
.setPattern(sysSalaryItemPO.getPattern())
|
||||
.setValueType(SalaryValueTypeEnum.parseByValue(sysSalaryItemPO.getValueType()))
|
||||
.setDataType(SalaryDataTypeEnum.parseByValue(sysSalaryItemPO.getDataType()))
|
||||
.setValueType(sysSalaryItemPO.getValueType())
|
||||
.setDataType(sysSalaryItemPO.getDataType())
|
||||
.setFormulaId(sysSalaryItemPO.getFormulaId())
|
||||
.setDescription(sysSalaryItemPO.getDescription());
|
||||
}
|
||||
|
|
@ -150,4 +151,5 @@ public class SysSalaryItemBO {
|
|||
.updateTime(new Date())
|
||||
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
|
||||
.build();
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package com.engine.salary.entity.salaryitem.dto;
|
||||
|
||||
import com.engine.salary.enums.*;
|
||||
import com.engine.salary.enums.SalaryRoundingModeEnum;
|
||||
import com.engine.salary.enums.SalarySystemTypeEnum;
|
||||
import com.engine.salary.enums.SalaryValueTypeEnum;
|
||||
import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
|
|
@ -32,7 +34,10 @@ public class SalaryItemFormDTO {
|
|||
private String name;
|
||||
|
||||
//是否是系统内置的薪资项目")
|
||||
private SalarySystemTypeEnum systemType;
|
||||
/**
|
||||
* @see SalarySystemTypeEnum
|
||||
*/
|
||||
private Integer systemType;
|
||||
|
||||
//默认使用")
|
||||
private Integer useDefault;
|
||||
|
|
@ -40,20 +45,26 @@ public class SalaryItemFormDTO {
|
|||
//薪资档案引用")
|
||||
private Integer useInEmployeeSalary;
|
||||
|
||||
//属性")
|
||||
private SalaryItemCategoryEnum category;
|
||||
|
||||
//类型")
|
||||
private SalaryItemTypeEnum itemType;
|
||||
//字段类型
|
||||
/**
|
||||
* @see SalaryDataTypeEnum
|
||||
*/
|
||||
private String dataType;
|
||||
|
||||
//舍入规则")
|
||||
private SalaryRoundingModeEnum roundingMode;
|
||||
/**
|
||||
* @see SalaryRoundingModeEnum
|
||||
*/
|
||||
private Integer roundingMode;
|
||||
|
||||
//保留小数位")
|
||||
private Integer pattern;
|
||||
|
||||
//取值方式")
|
||||
private SalaryValueTypeEnum valueType;
|
||||
/**
|
||||
* @see SalaryValueTypeEnum
|
||||
*/
|
||||
private Integer valueType;
|
||||
|
||||
//公式")
|
||||
private Long formulaId;
|
||||
|
|
@ -64,16 +75,10 @@ public class SalaryItemFormDTO {
|
|||
//备注")
|
||||
private String description;
|
||||
|
||||
@JsonIgnore
|
||||
//是否可以编辑")
|
||||
private Integer canEdit;
|
||||
|
||||
//字段类型
|
||||
private SalaryDataTypeEnum dataType;
|
||||
|
||||
//个税申报表对应字段")
|
||||
private String taxDeclarationColumn;
|
||||
|
||||
|
||||
|
||||
@JsonIgnore
|
||||
//是否可以编辑")
|
||||
private Integer canEdit;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.engine.salary.entity.salarysob.param;
|
||||
|
||||
import com.engine.salary.util.valid.DataCheck;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
|
@ -20,18 +21,12 @@ import java.util.List;
|
|||
@AllArgsConstructor
|
||||
public class SalarySobItemSaveParam {
|
||||
|
||||
/**
|
||||
* 薪资账套的ID不允许为空
|
||||
*/
|
||||
//@NotNull(message = "LABEL:86575")
|
||||
//薪资账套id")
|
||||
//薪资账套id
|
||||
@DataCheck(require = true, message = "薪资账套的ID不允许为空")
|
||||
private Long salarySobId;
|
||||
|
||||
/**
|
||||
* 员工信息字段不能为空
|
||||
*/
|
||||
//@NotEmpty(message = "LABEL:98610")
|
||||
//薪资账套薪资项目保存参数-员工信息字段")
|
||||
//薪资账套薪资项目保存参数-员工信息字段
|
||||
@DataCheck(require = true, message = "员工信息字段不能为空")
|
||||
private List<SalarySobEmpFieldParam> empFields;
|
||||
|
||||
//薪资账套薪资项目保存参数-薪资项目分组")
|
||||
|
|
|
|||
|
|
@ -133,8 +133,11 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
|
|||
SalarySobItemSaveBO.Result result = SalarySobItemSaveBO.handle(saveParam,(long)user.getUID());
|
||||
// 保存薪资账套的员工信息字段
|
||||
if (CollectionUtils.isNotEmpty(result.getNeedInsertSalarySobEmpFields())) {
|
||||
getSalarySobEmpFieldService(user).batchSave(result.getNeedInsertSalarySobEmpFields());
|
||||
// getSalarySobEmpFieldService(user).batchSave(result.getNeedInsertSalarySobEmpFields());
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 保存薪资账套的薪资项目副本
|
||||
if (CollectionUtils.isNotEmpty(result.getNeedInsertSalarySobItems())) {
|
||||
batchSave(result.getNeedInsertSalarySobItems());
|
||||
|
|
|
|||
Loading…
Reference in New Issue