diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java index f03a8468c..e23dc6f16 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java @@ -91,5 +91,6 @@ public class SalarySobItemDTO { private boolean canDelete; //该分类是否隐藏(0不隐藏,1隐藏) - private Integer itemHide; + @JsonSerialize(using = ToStringSerializer.class) + private Long itemHide; } diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java index 7571b18d3..ee06db0a6 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java @@ -39,7 +39,8 @@ public class SalarySobItemGroupDTO { private Integer sortedIndex; //该分类是否隐藏(0不隐藏,1隐藏) - private Integer itemHide; + @JsonSerialize(using = ToStringSerializer.class) + private Long itemHide; //薪资项目分组下的薪资项目") private List items; diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java index b496115e8..a1ebb158d 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java @@ -74,7 +74,7 @@ public class SalarySobItemSaveParam { private Long formulaId; //该分类是否隐藏(0不隐藏,1隐藏) - private Integer itemHide; + private Long itemHide; private Boolean canDelete; } @@ -99,6 +99,6 @@ public class SalarySobItemSaveParam { private List items; //该分类是否隐藏(0不隐藏,1隐藏) - private Integer itemHide; + private Long itemHide; } } diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java index 7d47935af..4a6b5502a 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java @@ -74,7 +74,7 @@ public class SalarySobItemGroupPO { private Date updateTime; //该分类是否隐藏(0不隐藏,1隐藏) - private Integer itemHide; + private Long itemHide; Collection ids; } diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemHidePO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemHidePO.java index 4dafcb92c..8ceb1db26 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemHidePO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemHidePO.java @@ -41,7 +41,7 @@ public class SalarySobItemHidePO { /** * 是否隐藏(0-不隐藏 1-隐藏) */ - private Integer itemHide; + private Long itemHide; /** * 创建人 diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java index bdfc35475..0464d63f8 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java @@ -89,7 +89,7 @@ public class SalarySobItemPO { private Date updateTime; //该分类是否隐藏(0不隐藏,1隐藏) - private Integer itemHide; + private Long itemHide; //in Collection ids; diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index 43b2ab9e8..85aea4b5b 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -326,7 +326,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) .build(); if(itemGroupParam.getItemHide()==null){ - salarySobGroupItemHidePO.setItemHide(0); + salarySobGroupItemHidePO.setItemHide(Long.valueOf(0)); } salarySobItemMapper.InsertItemShow(salarySobGroupItemHidePO);