diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobBackItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobBackItemPO.java index 35a289ea7..d6fe74adb 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobBackItemPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobBackItemPO.java @@ -9,6 +9,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Collection; import java.util.Date; /** @@ -108,4 +109,11 @@ public class SalarySobBackItemPO{ */ @JsonIgnore private Date updateTime; + + + + /** + * 薪资项目id + */ + private Collection salaryItemIds; } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml index e123bc204..430bb5734 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobBackItemMapper.xml @@ -122,7 +122,12 @@ AND update_time = #{updateTime} - + + AND salary_item_id IN + + #{salaryItemId} + + ORDER BY id DESC diff --git a/src/com/engine/salary/service/SalarySobBackItemService.java b/src/com/engine/salary/service/SalarySobBackItemService.java index 6ba114581..ae508b9d4 100644 --- a/src/com/engine/salary/service/SalarySobBackItemService.java +++ b/src/com/engine/salary/service/SalarySobBackItemService.java @@ -65,4 +65,5 @@ public interface SalarySobBackItemService { */ int deleteBySalarySobIds(Collection salarySobIds); + List listBySalaryItemIds(Collection salaryItemIds); } diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 5bc03d077..84dec4987 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -28,6 +28,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import weaver.hrm.User; @@ -218,6 +219,14 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService newSalaryItemPO.setSharedType(saveParam.getSharedType()); newSalaryItemPO.setTaxAgentIds(saveParam.getTaxAgentIds()); salaryItemBiz.updateById(newSalaryItemPO); + + String oldName = salaryItemPO.getName(); + String newName = saveParam.getName(); + if (!StringUtils.equals(oldName, newName)) { + + } + + // 记录日志 // LoggerContext loggerContext = new LoggerContext<>(); // loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); @@ -325,4 +334,34 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService private List usingCodes; } + + + + public UsingItem getUsingItem(Long id) { + + //薪资项目 + SalaryItemPO items = getById(id); + + //账套项目 + List sobItems = getSalarySobItemService(user).listBySalaryItemIds(Collections.singleton(id)); + + //回算项目 + List backItems = getSalarySobBackItemService(user).listBySalaryItemIds(Collections.singleton(id)); + + + +// //账套里的项目,项目里的项目 +// List sobItemIds = SalaryEntityUtil.properties(sobItems, SalarySobItemPO::getSalaryItemId, Collectors.toList()); +// List backItemIds = SalaryEntityUtil.properties(backItems, SalarySobBackItemPO::getSalaryItemId, Collectors.toList()); +// List usingItemIds = new ArrayList<>(); +// usingItemIds.addAll(sobItemIds); +// usingItemIds.addAll(backItemIds); +// +// //使用中的code +// List formulaVars = getSalaryFormulaService(user).listVarByFormulaIds(usingFormulaIds); +// List itemCode = formulaVars.stream().map(FormulaVar::getFieldId).map(v -> v.replaceAll("salaryItem_", "")).collect(Collectors.toList()); + + return UsingItem.builder().build(); + } + } diff --git a/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java index 6e991d6b4..928c3566e 100644 --- a/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java @@ -112,4 +112,9 @@ public class SalarySobBackItemServiceImpl extends Service implements SalarySobBa return getSalarySobBackItemMapper().deleteBySalarySobIds(salarySobIds); } + @Override + public List listBySalaryItemIds(Collection salaryItemIds) { + return getSalarySobBackItemMapper().listSome(SalarySobBackItemPO.builder().salaryItemIds(salaryItemIds).build()); + } + }