From 289e685e09b2d60fcb52a85847273348465f37b5 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 24 Aug 2022 10:31:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?xzy-=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=98=BE=E9=9A=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/biz/SalarySobItemBiz.java | 47 ++++++ .../salary/biz/SalarySobItemGroupBiz.java | 10 ++ .../salary/biz/SalarySobItemHideBiz.java | 22 +++ .../bo/SalarySobItemAggregateBO.java | 3 + .../salarysob/dto/SalarySobItemDTO.java | 4 + .../salarysob/dto/SalarySobItemGroupDTO.java | 3 + .../param/SalarySobItemSaveParam.java | 6 + .../salarysob/po/SalarySobItemGroupPO.java | 3 + .../salarysob/po/SalarySobItemHidePO.java | 71 ++++++++++ .../entity/salarysob/po/SalarySobItemPO.java | 3 + .../salarysob/SalarySobItemGroupMapper.java | 6 +- .../salarysob/SalarySobItemGroupMapper.xml | 30 ++++ .../salarysob/SalarySobItemHideMapper.java | 15 ++ .../salarysob/SalarySobItemHideMapper.xml | 21 +++ .../mapper/salarysob/SalarySobItemMapper.java | 27 +++- .../mapper/salarysob/SalarySobItemMapper.xml | 65 +++++++++ .../service/SalarySobItemGroupService.java | 8 ++ .../service/SalarySobItemHideService.java | 16 +++ .../salary/service/SalarySobItemService.java | 27 ++++ .../impl/SalaryAcctExcelServiceImpl.java | 2 +- .../impl/SalaryAcctResultServiceImpl.java | 38 ++++- .../impl/SalarySobItemGroupServiceImpl.java | 5 + .../impl/SalarySobItemHideServiceImpl.java | 18 +++ .../impl/SalarySobItemServiceImpl.java | 134 +++++++++++++++++- .../salary/web/SalarySobController.java | 2 + 25 files changed, 569 insertions(+), 17 deletions(-) create mode 100644 src/com/engine/salary/biz/SalarySobItemHideBiz.java create mode 100644 src/com/engine/salary/entity/salarysob/po/SalarySobItemHidePO.java create mode 100644 src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java create mode 100644 src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml create mode 100644 src/com/engine/salary/service/SalarySobItemHideService.java create mode 100644 src/com/engine/salary/service/impl/SalarySobItemHideServiceImpl.java diff --git a/src/com/engine/salary/biz/SalarySobItemBiz.java b/src/com/engine/salary/biz/SalarySobItemBiz.java index f741947a3..bd7cfde0e 100644 --- a/src/com/engine/salary/biz/SalarySobItemBiz.java +++ b/src/com/engine/salary/biz/SalarySobItemBiz.java @@ -1,5 +1,6 @@ package com.engine.salary.biz; +import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; import com.engine.salary.entity.salarysob.po.SalarySobItemPO; import com.engine.salary.mapper.salarysob.SalarySobItemMapper; import com.google.common.collect.Lists; @@ -32,6 +33,17 @@ public class SalarySobItemBiz { } } + public List listBySalarySobIdWithHideItem(SalarySobItemPO build) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalarySobItemMapper mapper = sqlSession.getMapper(SalarySobItemMapper.class); + return mapper.listBySalarySobIdWithHideItem(build); + } finally { + sqlSession.close(); + } + } + + public void batchInsert(Collection salarySobItemPOS) { if(CollectionUtils.isEmpty(salarySobItemPOS)){ return; @@ -58,4 +70,39 @@ public class SalarySobItemBiz { sqlSession.close(); } } + + public void deleteItemShowBySalarySobId(Collection salarySobIds) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalarySobItemMapper mapper = sqlSession.getMapper(SalarySobItemMapper.class); + mapper.deleteItemShowBySalarySobId(salarySobIds); + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } + + public void InsertItemShow(SalarySobItemHidePO salarySobItemHidePO) { + if(salarySobItemHidePO == null){ + return; + } + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalarySobItemMapper mapper = sqlSession.getMapper(SalarySobItemMapper.class); + mapper.insertItemShow(salarySobItemHidePO); + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } + + public List listBySalarySobIdAndGroupId(Long salarySobId, Collection salarySobItemGroupIds) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalarySobItemMapper mapper = sqlSession.getMapper(SalarySobItemMapper.class); + return mapper.listBySalarySobIdAndGroupId(salarySobId,salarySobItemGroupIds); + } finally { + sqlSession.close(); + } + } } diff --git a/src/com/engine/salary/biz/SalarySobItemGroupBiz.java b/src/com/engine/salary/biz/SalarySobItemGroupBiz.java index 67d2939c9..c54097ae2 100644 --- a/src/com/engine/salary/biz/SalarySobItemGroupBiz.java +++ b/src/com/engine/salary/biz/SalarySobItemGroupBiz.java @@ -62,4 +62,14 @@ public class SalarySobItemGroupBiz { sqlSession.close(); } } + + public List listSomeWithItemHide(SalarySobItemGroupPO build) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalarySobItemGroupMapper mapper = sqlSession.getMapper(SalarySobItemGroupMapper.class); + return mapper.listSomeWithItemHide(build); + } finally { + sqlSession.close(); + } + } } diff --git a/src/com/engine/salary/biz/SalarySobItemHideBiz.java b/src/com/engine/salary/biz/SalarySobItemHideBiz.java new file mode 100644 index 000000000..ceec5ab42 --- /dev/null +++ b/src/com/engine/salary/biz/SalarySobItemHideBiz.java @@ -0,0 +1,22 @@ +package com.engine.salary.biz; + +import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; +import com.engine.salary.mapper.salarysob.SalarySobItemHideMapper; +import org.apache.ibatis.session.SqlSession; +import weaver.conn.mybatis.MyBatisFactory; + +import java.util.List; + +public class SalarySobItemHideBiz { + + public List listSome(SalarySobItemHidePO salarySobPO) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalarySobItemHideMapper mapper = sqlSession.getMapper(SalarySobItemHideMapper.class); + return mapper.getById(salarySobPO); + } finally { + sqlSession.close(); + } + } + +} diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java index bd8203929..5dbadc876 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java @@ -85,12 +85,14 @@ public class SalarySobItemAggregateBO { .salarySobId(e.getSalarySobId()) .name(e.getName()) .sortedIndex(e.getSortedIndex()) + .itemHide(e.getItemHide()) .build()) .collect(Collectors.toList()); Map salarySobItemGroupDTOMap = SalaryEntityUtil.convert2Map(salarySobItemGroupDTOS, SalarySobItemGroupDTO::getId); Map salaryItemMap = SalaryEntityUtil.convert2Map(salaryItems, SalaryItemPO::getId); Map> salarySobItemMap = SalaryEntityUtil.group2Map(salarySobItems, SalarySobItemPO::getSalarySobItemGroupId); Map formulaMap = SalaryEntityUtil.convert2Map(expressFormulas, ExpressFormula::getId, ExpressFormula::getFormula); + // 薪资账套的薪资项目副本po转换成dto salarySobItemMap.forEach((k, v) -> { List items = Lists.newArrayList(); @@ -104,6 +106,7 @@ public class SalarySobItemAggregateBO { .salaryItemId(salaryItemPO.getId()) .dateType(salaryItemPO.getDataType()) .name(salaryItemPO.getName()) + .itemHide(salarySobItemPO.getItemHide()) .formulaId(salarySobItemPO.getFormulaId()) .formulaContent(formulaMap.getOrDefault(salarySobItemPO.getFormulaId(), "")) .taxDeclarationColumn(SalaryItemBO.buildTaxDeclarationColumn(salaryItemPO.getCode())) diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java index 16a7033d5..f03a8468c 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java @@ -41,6 +41,7 @@ public class SalarySobItemDTO { //名称 private String name; + //是否是薪资档案引用 private Integer useInEmployeeSalary; @@ -88,4 +89,7 @@ public class SalarySobItemDTO { //是否可以删除 private boolean canDelete; + + //该分类是否隐藏（0不隐藏，1隐藏） + private Integer itemHide; } diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java index 8c589c282..7571b18d3 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemGroupDTO.java @@ -38,6 +38,9 @@ public class SalarySobItemGroupDTO { //薪资项目分组排序字段") private Integer sortedIndex; + //该分类是否隐藏（0不隐藏，1隐藏） + private Integer 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 edb9725da..b496115e8 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobItemSaveParam.java @@ -73,6 +73,9 @@ public class SalarySobItemSaveParam { //公式") private Long formulaId; + //该分类是否隐藏（0不隐藏，1隐藏） + private Integer itemHide; + private Boolean canDelete; } @@ -94,5 +97,8 @@ public class SalarySobItemSaveParam { //分类下的薪资项目 private List items; + + //该分类是否隐藏（0不隐藏，1隐藏） + private Integer itemHide; } } diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java index b81df8fa6..7d47935af 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java @@ -73,5 +73,8 @@ public class SalarySobItemGroupPO { */ private Date updateTime; + //该分类是否隐藏（0不隐藏，1隐藏） + private Integer 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 new file mode 100644 index 000000000..4dafcb92c --- /dev/null +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemHidePO.java @@ -0,0 +1,71 @@ +package com.engine.salary.entity.salarysob.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @Description hrsa_salary_item_hide 薪资项目是否在薪资核算中展示 + * @author Harryxzy + * @date 2022/8/22 18:00 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SalarySobItemHidePO { + + /** + * ID + */ + private Long id; + + /** + * 账套ID + */ + private Long salarySobId; + + /** + * 薪资项目ID + */ + private Long salaryItemId; + + /** + * 类型（是否是项目组 0-不是 1-是） + */ + private Integer isGroup; + + /** + * 是否隐藏（0-不隐藏 1-隐藏） + */ + private Integer itemHide; + + /** + * 创建人 + */ + private Long creator; + + /** + * 是否删除 + */ + private Integer deleteType; + + /** + * 租户 + */ + private String tenantKey; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java index f9e287df2..bdfc35475 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java @@ -88,6 +88,9 @@ public class SalarySobItemPO { */ private Date updateTime; + //该分类是否隐藏（0不隐藏，1隐藏） + private Integer itemHide; + //in Collection ids; Collection salarySobIds; diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java index f5dfcc103..82324c399 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java @@ -21,7 +21,8 @@ public interface SalarySobItemGroupMapper { * @return 返回集合，没有返回空List */ List listSome(SalarySobItemGroupPO salarySobItemGroup); - + + List listSomeWithItemHide(SalarySobItemGroupPO build); /** * 根据主键查询 @@ -85,5 +86,6 @@ public interface SalarySobItemGroupMapper { * @param salarySobItemGroups */ void batchInsert(@Param("collection") Collection salarySobItemGroups); - + + } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml index d4540fcd8..bd29320f7 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml @@ -12,6 +12,7 @@ + @@ -93,6 +94,35 @@ + + + + INSERT INTO hrsa_salary_sob_item_group diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java new file mode 100644 index 000000000..bd2033fa5 --- /dev/null +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java @@ -0,0 +1,15 @@ +package com.engine.salary.mapper.salarysob; + +import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; + +import java.util.List; + +public interface SalarySobItemHideMapper { + + /** + * 根据账套id获取关闭显示开关的itemID + * @param salarySobPO + * @return + */ + List getById(SalarySobItemHidePO salarySobPO); +} diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml new file mode 100644 index 000000000..b20be3fa6 --- /dev/null +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java index f6d450cd2..9c96ac650 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java @@ -1,7 +1,7 @@ package com.engine.salary.mapper.salarysob; +import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; import com.engine.salary.entity.salarysob.po.SalarySobItemPO; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Collection; @@ -23,7 +23,9 @@ public interface SalarySobItemMapper { * @return 返回集合，没有返回空List */ List listSome(SalarySobItemPO salarySobItemPO); - + + List listBySalarySobIdWithHideItem(SalarySobItemPO salarySobItemPO); + /** * 根据主键查询 @@ -86,5 +88,24 @@ public interface SalarySobItemMapper { * @param salarySobItems */ void batchInsert(@Param("collection") Collection salarySobItems); - + + + /** + * 删除工资项目是否显示 + * + * @param salarySobIds + */ + void deleteItemShowBySalarySobId(@Param("salarySobIds")Collection salarySobIds); + + /** + * 插入薪资项目分组是否显示 + * @param salarySobItemHidePO + */ + void insertItemShow(SalarySobItemHidePO salarySobItemHidePO); + + /** + * 根据账套id以及薪资项目分组获取 + * @param + */ + List listBySalarySobIdAndGroupId(@Param("salarySobId") Long salarySobId,@Param("salarySobItemGroupIds") Collection salarySobItemGroupIds); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml index d57bc554e..146873136 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml @@ -121,6 +121,53 @@ ORDER BY id DESC + + + + + @@ -284,6 +331,16 @@ AND delete_type = 0 + + + DELETE FROM hrsa_salary_item_hide + WHERE delete_type = 0 + AND salary_sob_id IN + + #{salarySobId} + + + UPDATE hrsa_salary_sob_item @@ -369,5 +426,13 @@ + + insert into hrsa_salary_item_hide(id,salary_sob_id,salary_item_id,is_group,item_hide, + creator,tenant_key,CREATE_TIME,update_time) + VALUES(#{id},#{salarySobId},#{salaryItemId}, + #{isGroup},#{itemHide},#{creator}, + #{tenantKey},#{createTime},#{updateTime}); + + \ No newline at end of file diff --git a/src/com/engine/salary/service/SalarySobItemGroupService.java b/src/com/engine/salary/service/SalarySobItemGroupService.java index d42e63f8b..85ce3d51f 100644 --- a/src/com/engine/salary/service/SalarySobItemGroupService.java +++ b/src/com/engine/salary/service/SalarySobItemGroupService.java @@ -31,6 +31,14 @@ public interface SalarySobItemGroupService { */ List listBySalarySobId(Long salarySobId); + /** + * 根据薪资账套id查询薪资账套的薪资项目分类带上隐藏信息 + * + * @param salarySobId 薪资账套id + * @return + */ + List listBySalarySobIdWithItemHide(Long salarySobId); + /** * 批量保存 * diff --git a/src/com/engine/salary/service/SalarySobItemHideService.java b/src/com/engine/salary/service/SalarySobItemHideService.java new file mode 100644 index 000000000..7551c75c2 --- /dev/null +++ b/src/com/engine/salary/service/SalarySobItemHideService.java @@ -0,0 +1,16 @@ +package com.engine.salary.service; + +import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; + +import java.util.List; + +public interface SalarySobItemHideService { + + /** + * 根据薪资账套id查询哪些字段关闭显示 + * + * @param salarySobId + * @return + */ + List listHideGroupBysalarySobId(SalarySobItemHidePO salarySobId); +} diff --git a/src/com/engine/salary/service/SalarySobItemService.java b/src/com/engine/salary/service/SalarySobItemService.java index 318ddaf37..933c1ead7 100644 --- a/src/com/engine/salary/service/SalarySobItemService.java +++ b/src/com/engine/salary/service/SalarySobItemService.java @@ -32,6 +32,20 @@ public interface SalarySobItemService { */ List listBySalarySobId(Long salarySobId); + /** + * 根据薪资账套id查询薪资账套的薪资项目副本(不包括已隐藏的薪资项目列) + * + * @param salarySobId 薪资账套的id + * @return + */ + List listBySalarySobIdWithHideItem(Long salarySobId); + + /** + * 根据薪资账套id和薪资项目分类查询薪资账套的薪资项目副本 + * + */ + List listBySalarySobIdAndGroupId(Long salarySobId,Collection salarySobItemGroupIds); + /** * 根据薪资账套id查询薪资账套的薪资项目副本 * @@ -73,6 +87,13 @@ public interface SalarySobItemService { */ SalarySobItemAggregateDTO getAggregateBySalarySobId(Long salarySobId); + /** + * 根据薪资账套id获取薪资账套的薪资项目聚合（员工信息、薪资项目副本、薪资项目分类）(不包含已设置为隐藏的) + * @param salarySobId + * @return + */ + SalarySobItemAggregateDTO getAggregateWithItemHideBySalarySobId(Long salarySobId); + /** * 保存 * @@ -92,4 +113,10 @@ public interface SalarySobItemService { * */ void deleteBySalarySobIds(Collection salarySobIds); + + /** + * 根据薪资账套id删除薪资项目是否显示 + * + */ + void deleteItemShowBySalarySobIds(Collection salarySobIds); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 17216bddb..39583cf2f 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -258,7 +258,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc */ public List listWeaTableColumn(SalaryAcctRecordPO salaryAcctRecordPO) { // 查询薪资账套下的薪资项目+员工信息字段 - SalarySobItemAggregateDTO salarySobItemAggregateDTO = getSalarySobItemService(user).getAggregateBySalarySobId(salaryAcctRecordPO.getSalarySobId()); + SalarySobItemAggregateDTO salarySobItemAggregateDTO = getSalarySobItemService(user).getAggregateWithItemHideBySalarySobId(salaryAcctRecordPO.getSalarySobId()); // 构建薪资核算结果列表表头 return SalaryAcctResultBO.buildTableColumns(salarySobItemAggregateDTO); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 9850e786f..98fb02af7 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -27,10 +27,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTempPO; import com.engine.salary.entity.salaryformula.ExpressFormula; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.dto.*; -import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO; -import com.engine.salary.entity.salarysob.po.SalarySobEmpFieldPO; -import com.engine.salary.entity.salarysob.po.SalarySobItemPO; -import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.entity.salarysob.po.*; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; @@ -117,6 +114,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe return ServiceUtil.getService(SalarySobAdjustRuleServiceImpl.class, user); } + private SalarySobItemHideService getSalarySobItemHideService(User user) { + return (SalarySobItemHideService) ServiceUtil.getService(SalarySobItemHideServiceImpl.class, user); + } + private SalaryAcctCalculateService getSalaryAcctCalculateService(User user) { return ServiceUtil.getService(SalaryAcctCalculateServiceImpl.class, user); } @@ -144,6 +145,11 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe return ServiceUtil.getService(SalaryAcctReportServiceImpl.class, user); } + private SalarySobItemGroupService getSalarySobItemGroupService(User user) { + return (SalarySobItemGroupService) ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user); + } + + private SalaryCheckResultService salaryCheckResultService; @Override @@ -192,8 +198,29 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe if (Objects.isNull(salaryAcctEmployeePO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "薪资核算人员不存在或已被删除")); } + //---------------------------------------------- + + // 查询薪资账套的薪资项目分类 + List salarySobItemGroupPOS = getSalarySobItemGroupService(user).listBySalarySobIdWithItemHide(salaryAcctEmployeePO.getSalarySobId()); + // 获取关闭显示的分类 + List hideGroupIDs = getSalarySobItemHideService(user).listHideGroupBysalarySobId(SalarySobItemHidePO.builder().salarySobId(salaryAcctEmployeePO.getSalarySobId()).isGroup(1).build()); + // 过滤关闭显示的薪资项目分类 + salarySobItemGroupPOS = salarySobItemGroupPOS.stream().filter(group -> !(hideGroupIDs.contains(group.getId()))).collect(Collectors.toList()); + // 获取薪资项目分类ID + List salarySobItemGroupIds = salarySobItemGroupPOS.stream().map(SalarySobItemGroupPO::getId).collect(Collectors.toList()); + + // 查询薪资账套的薪资项目副本(已经过滤关闭分类显示按钮的薪资项目) + List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobIdAndGroupId(salaryAcctEmployeePO.getSalarySobId(),salarySobItemGroupIds); + //---------------------------------------------- + // 查询薪资核算所用薪资账套的薪资项目副本 - List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctEmployeePO.getSalarySobId()); +// List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctEmployeePO.getSalarySobId()); + // 获取关闭显示的薪资项目 + List hideItemIDs = getSalarySobItemHideService(user).listHideGroupBysalarySobId(SalarySobItemHidePO.builder().salarySobId(salaryAcctEmployeePO.getSalarySobId()).isGroup(0).build()); + // 过滤薪资项目 + salarySobItemPOS = salarySobItemPOS.stream().filter(item->!(hideItemIDs.contains(item.getSalaryItemId())) ).collect(Collectors.toList()); + + // 查询薪资项目 Set salaryItemIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getSalaryItemId); List salaryItemPOS = getSalaryItemService(user).listByIds(salaryItemIds); @@ -205,6 +232,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe List salaryAcctResultPOS = listBySalaryAcctEmployeeId(salaryAcctEmployeeId); // 查询个税扣缴义务人 TaxAgentPO taxAgent = getTaxAgentService(user).getById(salaryAcctEmployeePO.getTaxAgentId()); + // 转换成薪资核算结果详情dto return SalaryAcctResultBO.convert2DetailDTO(simpleEmployee, taxAgent, salaryAcctEmployeePO, salarySobEmpFieldPOS, salarySobItemPOS, salaryItemPOS, salaryAcctResultPOS); } diff --git a/src/com/engine/salary/service/impl/SalarySobItemGroupServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemGroupServiceImpl.java index a46462b91..366a23d7d 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemGroupServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemGroupServiceImpl.java @@ -30,6 +30,11 @@ public class SalarySobItemGroupServiceImpl extends Service implements SalarySobI return salarySobItemGroupMapper.listSome(SalarySobItemGroupPO.builder().salarySobId(salarySobId).build()); } + @Override + public List listBySalarySobIdWithItemHide(Long salarySobId) { + return salarySobItemGroupMapper.listSomeWithItemHide(SalarySobItemGroupPO.builder().salarySobId(salarySobId).build()); + } + @Override public void batchSave(Collection salarySobItemGroupPOS) { salarySobItemGroupMapper.batchInsert(salarySobItemGroupPOS); diff --git a/src/com/engine/salary/service/impl/SalarySobItemHideServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemHideServiceImpl.java new file mode 100644 index 000000000..8a30b7ba5 --- /dev/null +++ b/src/com/engine/salary/service/impl/SalarySobItemHideServiceImpl.java @@ -0,0 +1,18 @@ +package com.engine.salary.service.impl; + +import com.engine.core.impl.Service; +import com.engine.salary.biz.SalarySobItemHideBiz; +import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; +import com.engine.salary.service.SalarySobItemHideService; + +import java.util.List; + +public class SalarySobItemHideServiceImpl extends Service implements SalarySobItemHideService { + + private SalarySobItemHideBiz salarySobItemHideMapper = new SalarySobItemHideBiz(); + + @Override + public List listHideGroupBysalarySobId(SalarySobItemHidePO salarySobPO) { + return salarySobItemHideMapper.listSome(salarySobPO); + } +} diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index fb2b2611d..43b2ab9e8 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -11,10 +11,7 @@ import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.bo.SalarySobItemAggregateBO; import com.engine.salary.entity.salarysob.dto.SalarySobItemAggregateDTO; import com.engine.salary.entity.salarysob.param.SalarySobItemSaveParam; -import com.engine.salary.entity.salarysob.po.SalarySobEmpFieldPO; -import com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO; -import com.engine.salary.entity.salarysob.po.SalarySobItemPO; -import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.entity.salarysob.po.*; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.*; import com.engine.salary.util.SalaryEntityUtil; @@ -27,6 +24,7 @@ import org.apache.commons.lang3.math.NumberUtils; import weaver.hrm.User; import java.util.*; +import java.util.stream.Collectors; /** * 薪资账套的薪资项目副本 @@ -51,6 +49,10 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe return (SalarySobItemGroupService) ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user); } + private SalarySobItemHideService getSalarySobItemHideService(User user) { + return (SalarySobItemHideService) ServiceUtil.getService(SalarySobItemHideServiceImpl.class, user); + } + private SalaryFormulaService getSalaryFormulaService(User user) { return (SalaryFormulaService) ServiceUtil.getService(SalaryFormulaServiceImpl.class, user); } @@ -70,6 +72,16 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe return salarySobItemMapper.listSome(SalarySobItemPO.builder().salarySobId(salarySobId).build()); } + @Override + public List listBySalarySobIdWithHideItem(Long salarySobId) { + return salarySobItemMapper.listBySalarySobIdWithHideItem(SalarySobItemPO.builder().salarySobId(salarySobId).build()); + } + + @Override + public List listBySalarySobIdAndGroupId(Long salarySobId,Collection salarySobItemGroupIds) { + return salarySobItemMapper.listBySalarySobIdAndGroupId(salarySobId,salarySobItemGroupIds); + } + @Override public List listBySalarySobIds(Collection salarySobIds) { return salarySobItemMapper.listSome(SalarySobItemPO.builder().salarySobIds(salarySobIds).build()); @@ -110,9 +122,11 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe // 查询薪资账套的员工信息字段 List salarySobEmpFieldPOS = getSalarySobEmpFieldService(user).listBySalarySobId(salarySobId); // 查询薪资账套的薪资项目分类 - List salarySobItemGroupPOS = getSalarySobItemGroupService(user).listBySalarySobId(salarySobId); + List salarySobItemGroupPOS = getSalarySobItemGroupService(user).listBySalarySobIdWithItemHide(salarySobId); + // 查询薪资账套的薪资项目副本 - List salarySobItemPOS = listBySalarySobId(salarySobId); + List salarySobItemPOS =listBySalarySobIdWithHideItem (salarySobId); + // 薪资账套的薪资项目副本所用的公式id Set formulaIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getFormulaId); // 查询公式详情 @@ -120,6 +134,48 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe // 查询薪资账套的薪资项目副本所关联的薪资项目 Set salaryItemIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getSalaryItemId); List salaryItemPOS = getSalaryItemService(user).listByIds(salaryItemIds); + + // 转换成聚合dto + SalarySobItemAggregateBO salarySobItemAggregateBO = new SalarySobItemAggregateBO(salarySobPO, salarySobEmpFieldPOS, + salarySobItemGroupPOS, salarySobItemPOS, expressFormulas, salaryItemPOS); + return salarySobItemAggregateBO.convert2AggregateDTO(); + } + + @Override + public SalarySobItemAggregateDTO getAggregateWithItemHideBySalarySobId(Long salarySobId) { + // 查询薪资账套 + SalarySobPO salarySobPO = salarySobBiz.getById(salarySobId); + if (Objects.isNull(salarySobPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98379, "参数错误，薪资账套不存在或者已被删除")); + } + // 查询薪资账套的员工信息字段 + List salarySobEmpFieldPOS = getSalarySobEmpFieldService(user).listBySalarySobId(salarySobId); + // 查询薪资账套的薪资项目分类 + List salarySobItemGroupPOS = getSalarySobItemGroupService(user).listBySalarySobIdWithItemHide(salarySobId); + + // 获取关闭显示的分类 + List hideGroupIDs = getSalarySobItemHideService(user).listHideGroupBysalarySobId(SalarySobItemHidePO.builder().salarySobId(salarySobId).isGroup(1).build()); + // 过滤关闭显示的薪资项目分类 + salarySobItemGroupPOS = salarySobItemGroupPOS.stream().filter(group -> !(hideGroupIDs.contains(group.getId()))).collect(Collectors.toList()); + // 获取薪资项目分类ID + List salarySobItemGroupIds = salarySobItemGroupPOS.stream().map(SalarySobItemGroupPO::getId).collect(Collectors.toList()); + + // 查询薪资账套的薪资项目副本(已经过滤关闭分类显示按钮的薪资项目) + List salarySobItemPOS = listBySalarySobIdAndGroupId(salarySobId,salarySobItemGroupIds); + + // 获取关闭显示的薪资项目 + List hideItemIDs = getSalarySobItemHideService(user).listHideGroupBysalarySobId(SalarySobItemHidePO.builder().salarySobId(salarySobId).isGroup(0).build()); + salarySobItemPOS = salarySobItemPOS.stream().filter(group -> !(hideItemIDs.contains(group.getSalaryItemId()))).collect(Collectors.toList()); + + // 薪资账套的薪资项目副本所用的公式id + Set formulaIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getFormulaId); + // 查询公式详情 + List expressFormulas = getSalaryFormulaService(user).listExpressFormula(formulaIds); + // 查询薪资账套的薪资项目副本所关联的薪资项目 + Set salaryItemIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getSalaryItemId); + List salaryItemPOS = getSalaryItemService(user).listByIds(salaryItemIds); + + // 转换成聚合dto SalarySobItemAggregateBO salarySobItemAggregateBO = new SalarySobItemAggregateBO(salarySobPO, salarySobEmpFieldPOS, salarySobItemGroupPOS, salarySobItemPOS, expressFormulas, salaryItemPOS); @@ -186,6 +242,8 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe } } + + /** * 清楚原相关数据 * @@ -198,6 +256,9 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe deleteBySalarySobIds(Collections.singleton(salarySobId)); // 删除薪资账套的薪资项目分类 getSalarySobItemGroupService(user).deleteBySalarySobIds(Collections.singleton(salarySobId)); + // 删除薪资项目是否显示 + deleteItemShowBySalarySobIds(Collections.singleton(salarySobId)); + } /** @@ -248,6 +309,28 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe .build(); //保存分类 salarySobItemGroupBiz.insert(salarySobItemGroupPO); + + + // 保存薪资项目分类 字段显隐 + Long salarySobGroupItemShowId = IdGenerator.generate(); + SalarySobItemHidePO salarySobGroupItemHidePO = SalarySobItemHidePO.builder() + .id(salarySobGroupItemShowId) + .salarySobId(salarySobId) + .salaryItemId(salarySobItemGroupId) + .isGroup(1) + .itemHide(itemGroupParam.getItemHide()) + .creator(employeeId) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + if(itemGroupParam.getItemHide()==null){ + salarySobGroupItemHidePO.setItemHide(0); + } + salarySobItemMapper.InsertItemShow(salarySobGroupItemHidePO); + + // //获取分类id // List salarySobItemGroupPOS = salarySobItemGroupBiz.listSome(SalarySobItemGroupPO.builder().salarySobId(salarySobId).name(itemGroupParam.getName()).build()); // Long salarySobItemGroupId = salarySobItemGroupPOS.get(0).getId(); @@ -269,9 +352,27 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe .canDelete(itemParam.getCanDelete() == null ? NumberUtils.INTEGER_ONE : (itemParam.getCanDelete() ? NumberUtils.INTEGER_ONE : NumberUtils.INTEGER_ZERO)) .build(); salarySobItems.add(salarySobItemPO); + + // 保存薪资项目是否展示 + Long salarySobItemShowId = IdGenerator.generate(); + SalarySobItemHidePO salarySobItemHidePO = SalarySobItemHidePO.builder() + .id(salarySobItemShowId) + .salarySobId(salarySobId) + .salaryItemId(itemParam.getSalaryItemId()) + .isGroup(0) + .itemHide(itemParam.getItemHide()) + .creator(employeeId) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + salarySobItemMapper.InsertItemShow(salarySobItemHidePO); + } } + for (SalarySobItemSaveParam.SalarySobItemParam itemParam : saveParam.getItems()) { SalarySobItemPO salarySobItemPO = SalarySobItemPO.builder() .salarySobId(salarySobId) @@ -288,6 +389,22 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe .canDelete(itemParam.getCanDelete() == null ? NumberUtils.INTEGER_ONE : (itemParam.getCanDelete() ? NumberUtils.INTEGER_ONE : NumberUtils.INTEGER_ZERO)) .build(); salarySobItems.add(salarySobItemPO); + + // 保存未分类薪资项目是否展示 + Long salarySobItemShowId = IdGenerator.generate(); + SalarySobItemHidePO salarySobItemHidePO = SalarySobItemHidePO.builder() + .id(salarySobItemShowId) + .salarySobId(salarySobId) + .salaryItemId(itemParam.getSalaryItemId()) + .isGroup(0) + .itemHide(itemParam.getItemHide()) + .creator(employeeId) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + salarySobItemMapper.InsertItemShow(salarySobItemHidePO); } // 保存薪资账套的薪资项目副本 @@ -306,4 +423,9 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe public void deleteBySalarySobIds(Collection salarySobIds) { salarySobItemMapper.deleteBySalarySobIds(salarySobIds); } + + @Override + public void deleteItemShowBySalarySobIds(Collection salarySobIds) { + salarySobItemMapper.deleteItemShowBySalarySobId(salarySobIds); + } } diff --git a/src/com/engine/salary/web/SalarySobController.java b/src/com/engine/salary/web/SalarySobController.java index 6aa3e7ae2..29bb81de7 100644 --- a/src/com/engine/salary/web/SalarySobController.java +++ b/src/com/engine/salary/web/SalarySobController.java @@ -264,6 +264,8 @@ public class SalarySobController { + + /**********************************薪资账套的薪资项目 end*********************************/ /**********************************调薪计薪规则 start*********************************/ From 9244440a0dedc72aa7884d8a891ea08130e87985 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 25 Aug 2022 09:20:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?xzy-=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=98=BE=E9=9A=90=E6=8E=A7=E5=88=B6(=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=A0=E5=8F=82itemHide=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salarysob/dto/SalarySobItemDTO.java | 3 ++- .../salary/entity/salarysob/dto/SalarySobItemGroupDTO.java | 3 ++- .../salary/entity/salarysob/param/SalarySobItemSaveParam.java | 4 ++-- .../salary/entity/salarysob/po/SalarySobItemGroupPO.java | 2 +- .../salary/entity/salarysob/po/SalarySobItemHidePO.java | 2 +- .../engine/salary/entity/salarysob/po/SalarySobItemPO.java | 2 +- .../engine/salary/service/impl/SalarySobItemServiceImpl.java | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) 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);