From a5ae8c8ea67880eb1e1df3da9ea214bbe40dbecd Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 18 Nov 2022 14:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E7=AE=97=E8=96=AA=E8=B5=84=E9=A1=B9?= =?UTF-8?q?=EF=BC=88=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E9=83=A8=E5=88=86?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=89=A9=E4=BD=99=E5=A4=84=E7=90=86=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salarysob/bo/SalarySobBackItemBO.java | 68 ++++++++++-------- .../salarysob/dto/SalarySobBackItemDTO.java | 64 +++++++++++++++++ .../param/SalarySobBackItemSaveParam.java | 71 ++++++++++--------- .../salarysob/SalarySobBackItemMapper.java | 12 ++++ .../salarysob/SalarySobBackItemMapper.xml | 44 ++++++++++-- .../service/SalarySobBackItemService.java | 29 ++++++++ .../impl/SalarySobBackItemServiceImpl.java | 71 +++++++++++++++++++ src/com/engine/salary/util/SalarySobUtil.java | 4 +- .../salary/web/SalarySobController.java | 4 +- .../wrapper/SalarySobBackItemWrapper.java | 6 ++ .../salary/wrapper/SalarySobWrapper.java | 21 +++++- 11 files changed, 319 insertions(+), 75 deletions(-) create mode 100644 src/com/engine/salary/entity/salarysob/dto/SalarySobBackItemDTO.java diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java index 5f5538fc6..e4348149e 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java @@ -1,10 +1,19 @@ package com.engine.salary.entity.salarysob.bo; +import com.engine.salary.entity.salaryformula.ExpressFormula; +import com.engine.salary.entity.salaryitem.bo.SalaryItemBO; +import com.engine.salary.entity.salaryitem.po.SalaryItemPO; +import com.engine.salary.entity.salarysob.dto.SalarySobBackItemDTO; +import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; import com.engine.salary.entity.salarysob.po.SalarySobDefaultBackItemPO; +import com.engine.salary.util.SalaryEntityUtil; import com.google.common.collect.Lists; import dm.jdbc.util.IdGenerator; +import org.apache.commons.collections.CollectionUtils; +import java.util.Collections; import java.util.List; +import java.util.Map; /** * @author Harryxzy @@ -27,34 +36,35 @@ public class SalarySobBackItemBO { .backCalcType(1).build()); } -// public static List convert2DTO(List salarySobBackItems, List salaryItems, List expressFormulas) { -// if (CollectionUtils.isEmpty(salarySobBackItems)) { -// return Collections.emptyList(); -// } -// List dtos = Lists.newArrayList(); -// Map salaryItemMap = SalaryEntityUtil.convert2Map(salaryItems, SalaryItemPO::getId); -// Map expressFormulaMap = SalaryEntityUtil.convert2Map(expressFormulas, ExpressFormula::getId, ExpressFormula::getFormula); -// for (SalarySobBackItemPO salarySobBackItem : salarySobBackItems) { -// SalaryItemPO salaryItem = salaryItemMap.get(salarySobBackItem.getSalaryItemId()); -// SalarySobBackItemDTO dto = new SalarySobBackItemDTO() -// .setId(salarySobBackItem.getId()) -// .setSalaryItemId(salaryItem.getId()) -// .setSysSalaryItemId(salaryItem.getSysSalaryItemId()) -// .setSalarySobItemGroupId(0L) -// .setName(salaryItem.getName()) -// .setFormulaId(salarySobBackItem.getFormulaId()) -// .setFormulaContent(expressFormulaMap.getOrDefault(salarySobBackItem.getFormulaId(), "输入")) -// .setDataType(salaryItem.getDataType()) -// .setPattern(salarySobBackItem.getPattern()) -// .setTaxDeclarationColumn(SalaryItemBO.buildTaxDeclarationColumn(salaryItem.getCode())) -// .setSortedIndex(0) -// .setCanEdit(true) -// .setCanDelete(false) -// .setIncomeCategory("0") -// .setBackCalcType(salarySobBackItem.getBackCalcType()); -// dtos.add(dto); -// } -// return dtos; -// } + + public static List convert2DTO(List salarySobBackItems, List salaryItems, List expressFormulas) { + if (CollectionUtils.isEmpty(salarySobBackItems)) { + return Collections.emptyList(); + } + List dtos = Lists.newArrayList(); + Map salaryItemMap = SalaryEntityUtil.convert2Map(salaryItems, SalaryItemPO::getId); + Map expressFormulaMap = SalaryEntityUtil.convert2Map(expressFormulas, ExpressFormula::getId, ExpressFormula::getFormula); + for (SalarySobBackItemPO salarySobBackItem : salarySobBackItems) { + SalaryItemPO salaryItem = salaryItemMap.get(salarySobBackItem.getSalaryItemId()); + SalarySobBackItemDTO dto = SalarySobBackItemDTO.builder() + .id(salarySobBackItem.getId()) + .salaryItemId(salaryItem.getId()) + .sysSalaryItemId(salaryItem.getSysSalaryItemId()) + .salarySobItemGroupId(0L) + .name(salaryItem.getName()) + .formulaId(salarySobBackItem.getFormulaId()) + .formulaContent(expressFormulaMap.getOrDefault(salarySobBackItem.getFormulaId(), "输入")) + .dataType(salaryItem.getDataType()) + .pattern(salarySobBackItem.getPattern()) + .taxDeclarationColumn(SalaryItemBO.buildTaxDeclarationColumn(salaryItem.getCode())) + .sortedIndex(0) + .canEdit(true) + .canDelete(false) + .incomeCategory("0") + .backCalcType(salarySobBackItem.getBackCalcType()).build(); + dtos.add(dto); + } + return dtos; + } } diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobBackItemDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobBackItemDTO.java new file mode 100644 index 000000000..ee984ed7f --- /dev/null +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobBackItemDTO.java @@ -0,0 +1,64 @@ +package com.engine.salary.entity.salarysob.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Harryxzy + * @date 2022/11/18 9:52 + * @description 薪资回算项目 + */ +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SalarySobBackItemDTO { + + // 主键id + private Long id; + + // 薪资项目的id + private Long salaryItemId; + + // 系统薪资项目的id + private Long sysSalaryItemId; + + // 薪资项目分组id + private Long salarySobItemGroupId; + + // 薪资类型 + private String incomeCategory; + + // 名称 + private String name; + + // 公式 + private Long formulaId; + + // 公式内容 + private String formulaContent; + + // 字段类型 + private String dataType; + + // 小数位数 + private Integer pattern; + + // 小数位数 + private String taxDeclarationColumn; + + // 排序字段 + private Integer sortedIndex; + + // 是否可以编辑 + private boolean canEdit; + + // 是否可以删除 + private boolean canDelete; + + // 回算类型 + private Integer backCalcType; + +} diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobBackItemSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobBackItemSaveParam.java index 8feb93ad6..bfe7f5057 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobBackItemSaveParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobBackItemSaveParam.java @@ -1,42 +1,47 @@ package com.engine.salary.entity.salarysob.param; +import com.engine.salary.enums.SalaryRoundingModeEnum; +import com.engine.salary.enums.SalaryValueTypeEnum; +import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author Harryxzy * @date 2022/11/16 15:14 * @description 薪资项目回算项目保存参数 */ +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor public class SalarySobBackItemSaveParam { -// @ApiModelProperty("主键id") -// @NotNull(message = "主键id不允许为空") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long id; -// -// @NotNull(message = "薪资账套id不允许为空") -// @ApiModelProperty("薪资账套id") -// private Long salarySobId; -// -// @NotNull(message = "薪资项目id不允许为空") -// @ApiModelProperty("薪资项目") -// private Long salaryItemId; -// -// @ApiModelProperty("字段类型") -// @NotNull(message = "LABEL:105096") -// private SalaryDataTypeEnum dataType; -// -// @ApiModelProperty("舍入规则") -// private SalaryRoundingModeEnum roundingMode; -// -// @ApiModelProperty("保留小数位") -// @Max(value = 5, message = "LABEL:85611") -// private Integer pattern; -// -// @ApiModelProperty("取值方式") -// @NotNull(message = "LABEL:85612") -// private SalaryValueTypeEnum valueType; -// -// @ApiModelProperty("公式") -// private Long formulaId; -// -// @ApiModelProperty("备注") -// private String description; + // 主键id + private Long id; + + // 薪资账套id + private Long salarySobId; + + // 薪资项目 + private Long salaryItemId; + + // 字段类型 + private SalaryDataTypeEnum dataType; + + // 舍入规则 + private SalaryRoundingModeEnum roundingMode; + + // 保留小数位 + private Integer pattern; + + // 取值方式 + private SalaryValueTypeEnum valueType; + + // 公式 + private Long formulaId; + + // 备注 + private String description; } diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.java index 64a348658..e8193caa3 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.java +++ b/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.java @@ -3,6 +3,7 @@ package com.engine.salary.mapper.salarysob; import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; /** @@ -68,4 +69,15 @@ public interface SalarySobBackItemMapper { int delete(SalarySobBackItemPO salarySobBackItem); void batchInsert(@Param("collection") List needInsertSalarySobBackItems); + + /** + * @description 根据薪资账套获取回算薪资项目数 + * @return Long + * @author Harryxzy + * @date 2022/11/18 13:57 + */ + Long countBySalarySobIdIn(@Param("salarySobIdCollection")Collection salarySobIdCollection); + + + } diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml index 1f86cb50d..1f85c09de 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml @@ -1,7 +1,23 @@ - + + id, + salary_sob_id, + salary_item_id, + salary_item_code, + data_type, + rounding_mode, + pattern, + value_type, + formula_id, + back_calc_type, + tenant_key, + creator, + delete_type, + create_time, + update_time + @@ -106,15 +122,18 @@ AND update_time = #{updateTime} - - AND id IN - - #{id} - - + ORDER BY id DESC + + + + + + @@ -343,5 +362,16 @@ WHERE id = #{id} AND delete_type = 0 + + + \ No newline at end of file diff --git a/src/com/engine/salary/service/SalarySobBackItemService.java b/src/com/engine/salary/service/SalarySobBackItemService.java index a681047b5..f525afada 100644 --- a/src/com/engine/salary/service/SalarySobBackItemService.java +++ b/src/com/engine/salary/service/SalarySobBackItemService.java @@ -1,7 +1,10 @@ package com.engine.salary.service; +import com.engine.salary.entity.salarysob.dto.SalarySobBackItemDTO; +import com.engine.salary.entity.salarysob.param.SalarySobBackItemSaveParam; import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; +import java.util.Collection; import java.util.List; /** @@ -19,6 +22,14 @@ public interface SalarySobBackItemService { */ List listBySalarySobId(Long salarySobId); + /** + * @description 查询所有回算项目 + * @return List + * @author Harryxzy + * @date 2022/11/18 11:31 + */ + List listAll(); + void batchInsert(List needInsertSalarySobBackItems); /** @@ -28,4 +39,22 @@ public interface SalarySobBackItemService { * @date 2022/11/16 14:36 */ SalarySobBackItemPO getById(Long salarySobBackItemId); + + /** + * @description 保存薪资账套的回算项目 + * @return List + * @author Harryxzy + * @date 2022/11/18 10:43 + */ + List save(SalarySobBackItemSaveParam saveParam); + + + /** + * @description 获取回算薪资项目数 + * @return Integer + * @author Harryxzy + * @date 2022/11/18 11:39 + */ + Long getCountBySalarySobIdIn(Collection salarySobIds); + } diff --git a/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java index b4a33b27a..310735ad6 100644 --- a/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java @@ -1,12 +1,32 @@ package com.engine.salary.service.impl; +import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.entity.salaryformula.ExpressFormula; +import com.engine.salary.entity.salaryitem.po.SalaryItemPO; +import com.engine.salary.entity.salarysob.bo.SalarySobBackItemBO; +import com.engine.salary.entity.salarysob.dto.SalarySobBackItemDTO; +import com.engine.salary.entity.salarysob.param.SalarySobBackItemSaveParam; import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; +import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.enums.SalaryValueTypeEnum; +import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salarysob.SalarySobBackItemMapper; +import com.engine.salary.service.SalaryFormulaService; +import com.engine.salary.service.SalaryItemService; import com.engine.salary.service.SalarySobBackItemService; +import com.engine.salary.service.SalarySobService; +import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; +import org.apache.commons.lang3.math.NumberUtils; +import weaver.hrm.User; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.Collections; import java.util.List; +import java.util.Objects; /** * @author Harryxzy @@ -19,11 +39,28 @@ public class SalarySobBackItemServiceImpl extends Service implements SalarySobBa return MapperProxyFactory.getProxy(SalarySobBackItemMapper.class); } + private SalarySobService getSalarySobService(User user) { + return ServiceUtil.getService(SalarySobServiceImpl.class, user); + } + + private SalaryItemService getSalaryItemService(User user) { + return ServiceUtil.getService(SalaryItemServiceImpl.class, user); + } + + private SalaryFormulaService getSalaryFormulaService(User user) { + return ServiceUtil.getService(SalaryFormulaServiceImpl.class, user); + } + @Override public List listBySalarySobId(Long salarySobId) { return getSalarySobBackItemMapper().listSome(SalarySobBackItemPO.builder().salarySobId(salarySobId).build()); } + @Override + public List listAll() { + return getSalarySobBackItemMapper().listAll(); + } + @Override public void batchInsert(List needInsertSalarySobBackItems) { getSalarySobBackItemMapper().batchInsert(needInsertSalarySobBackItems); @@ -34,4 +71,38 @@ public class SalarySobBackItemServiceImpl extends Service implements SalarySobBa return getSalarySobBackItemMapper().getById(salarySobBackItemId); } + @Override + public List save(SalarySobBackItemSaveParam saveParam) { + // 查询薪资账套是否存在 + SalarySobPO salarySobPO = getSalarySobService(user).getById(saveParam.getSalarySobId()); + if (Objects.isNull(salarySobPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "薪资账套不存在或已被删除")); + } + // 查询薪资账套下的回算薪资项目 + SalarySobBackItemPO salarySobBackItem = getById(saveParam.getId()); + if (Objects.isNull(salarySobBackItem)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "回算薪资项目不存在或已被删除")); + } + // 查询薪资项目 + SalaryItemPO salaryItem = getSalaryItemService(user).getById(saveParam.getSalaryItemId()); + if (salaryItem == null) { + throw new SalaryRunTimeException("参数错误，项目不存在或已被删除"); + } + salarySobBackItem.setRoundingMode(saveParam.getRoundingMode().getValue()); + salarySobBackItem.setPattern(saveParam.getPattern()); + salarySobBackItem.setValueType(saveParam.getValueType().getValue()); + salarySobBackItem.setFormulaId(saveParam.getValueType() == SalaryValueTypeEnum.INPUT ? NumberUtils.LONG_ZERO : saveParam.getFormulaId()); + salarySobBackItem.setUpdateTime(SalaryDateUtil.localDateTimeToDate(LocalDateTime.now())); + getSalarySobBackItemMapper().updateIgnoreNull(salarySobBackItem); + + // 查询公式 + List expressFormulas = getSalaryFormulaService(user).listExpressFormula(Collections.singleton(salarySobBackItem.getFormulaId())); + return SalarySobBackItemBO.convert2DTO(Collections.singletonList(salarySobBackItem), Collections.singletonList(salaryItem), expressFormulas); + } + + @Override + public Long getCountBySalarySobIdIn(Collection salarySobIds) { + return getSalarySobBackItemMapper().countBySalarySobIdIn(salarySobIds); + } + } diff --git a/src/com/engine/salary/util/SalarySobUtil.java b/src/com/engine/salary/util/SalarySobUtil.java index 31df16235..17ea5bde5 100644 --- a/src/com/engine/salary/util/SalarySobUtil.java +++ b/src/com/engine/salary/util/SalarySobUtil.java @@ -3,7 +3,6 @@ package com.engine.salary.util; import com.engine.salary.entity.salarysob.po.SalarySobRangePO; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.service.impl.SalarySobRangeServiceImpl; -import com.engine.workflow.util.CollectionUtil; import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; @@ -16,7 +15,6 @@ import java.util.List; */ public class SalarySobUtil { - // 处理历史数据将薪资账套中将关联人员状态转换为List public static void handleEmployeeStatusHistory(){ // 根据薪资账套查询人员 @@ -54,4 +52,6 @@ public class SalarySobUtil { } + + } diff --git a/src/com/engine/salary/web/SalarySobController.java b/src/com/engine/salary/web/SalarySobController.java index e9e7d8922..b4f051e24 100644 --- a/src/com/engine/salary/web/SalarySobController.java +++ b/src/com/engine/salary/web/SalarySobController.java @@ -304,7 +304,6 @@ public class SalarySobController { public String getSalarySobBackItemForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value ="id") Long id) { User user = HrmUserVarify.getUser(request, response); return new ResponseResult(user).run(getSalarySobBackItemWrapper(user)::getForm, id); - } /** @@ -318,8 +317,7 @@ public class SalarySobController { @Produces(MediaType.APPLICATION_JSON) public String saveSalarySobBackItem(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody SalarySobBackItemSaveParam saveParam) { User user = HrmUserVarify.getUser(request, response); -// return new ResponseResult>(user).run(getSalarySobBackItemWrapper(user)::save, saveParam); - return null; + return new ResponseResult>(user).run(getSalarySobBackItemWrapper(user)::save, saveParam); } /**********************************薪资账套的回算项目 end*********************************/ diff --git a/src/com/engine/salary/wrapper/SalarySobBackItemWrapper.java b/src/com/engine/salary/wrapper/SalarySobBackItemWrapper.java index a4b4dcbaf..5a9d7171f 100644 --- a/src/com/engine/salary/wrapper/SalarySobBackItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobBackItemWrapper.java @@ -6,7 +6,9 @@ import com.engine.salary.entity.salaryformula.ExpressFormula; import com.engine.salary.entity.salaryitem.bo.SalaryItemBO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.dto.SalarySobBackItemAggregateDTO; +import com.engine.salary.entity.salarysob.dto.SalarySobBackItemDTO; import com.engine.salary.entity.salarysob.dto.SalarySobBackItemFormDTO; +import com.engine.salary.entity.salarysob.param.SalarySobBackItemSaveParam; import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; import com.engine.salary.enums.SalaryRoundingModeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; @@ -125,4 +127,8 @@ public class SalarySobBackItemWrapper extends Service { .taxDeclarationColumn(SalaryItemBO.buildTaxDeclarationColumn(salaryItem.getCode())).build(); return salarySobBackItemFormDTO; } + + public List save(SalarySobBackItemSaveParam saveParam) { + return getSalarySobBackItemService(user).save(saveParam); + } } diff --git a/src/com/engine/salary/wrapper/SalarySobWrapper.java b/src/com/engine/salary/wrapper/SalarySobWrapper.java index 288c674a3..b7d17c658 100644 --- a/src/com/engine/salary/wrapper/SalarySobWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobWrapper.java @@ -13,8 +13,10 @@ import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.service.SalarySobBackItemService; import com.engine.salary.service.SalarySobService; import com.engine.salary.service.TaxAgentService; +import com.engine.salary.service.impl.SalarySobBackItemServiceImpl; import com.engine.salary.service.impl.SalarySobServiceImpl; import com.engine.salary.service.impl.TaxAgentServiceImpl; import com.engine.salary.util.SalaryEntityUtil; @@ -44,6 +46,12 @@ public class SalarySobWrapper extends Service { private TaxAgentService getTaxAgentService(User user) { return ServiceUtil.getService(TaxAgentServiceImpl.class, user); } + + private SalarySobBackItemService getSalarySobBackItemService(User user) { + return ServiceUtil.getService(SalarySobBackItemServiceImpl.class, user); + } + + /** * 薪资账套列表 * @@ -52,8 +60,10 @@ public class SalarySobWrapper extends Service { */ public PageInfo listPage(SalarySobListQueryParam queryParam) { - // 处理历史数据将薪资账套中将关联人员状态转换为List + // 处理历史数据，将薪资账套中将关联人员状态转换为List SalarySobUtil.handleEmployeeStatusHistory(); + // 处理历史数据，为薪资账套默认添加回算薪资项目 +// handleSalarySobBackItemHistory(); // 查询薪资账套 PageInfo page = getSalarySobService(user).listPageByParam(queryParam); @@ -71,6 +81,15 @@ public class SalarySobWrapper extends Service { return dtoPage; } +// private void handleSalarySobBackItemHistory() { +// // 获取个税扣缴义务人下所有的薪资账套 +// Long count = getSalarySobBackItemService(user).getCountBySalarySobIdIn(); +// if(count.equals(0)){ +// //没有回算薪资项目数据，给所有薪资账套初始化 +// +// } +// } + /** * 薪资账套详情 *