From dc24b03efd8a79905b36aafcc863ac641cde7475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 17 Feb 2023 15:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salarysob/po/SalarySobBackItemPO.java     |  8 ++++
 .../salarysob/SalarySobBackItemMapper.xml     |  7 +++-
 .../service/SalarySobBackItemService.java     |  1 +
 .../service/impl/SalaryItemServiceImpl.java   | 39 +++++++++++++++++++
 .../impl/SalarySobBackItemServiceImpl.java    |  5 +++
 5 files changed, 59 insertions(+), 1 deletion(-)

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<Long> 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 @@
         <if test="updateTime != null">
             AND update_time = #{updateTime}
         </if>
-
+        <if test="salaryItemIds != null and salaryItemIds.size()>0">
+            AND salary_item_id IN
+            <foreach collection="salaryItemIds" open="(" item="salaryItemId" separator="," close=")">
+                #{salaryItemId}
+            </foreach>
+        </if>
         ORDER BY id DESC
     </select>
 
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<Long> salarySobIds);
 
+    List<SalarySobBackItemPO> listBySalaryItemIds(Collection<Long> 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<SalaryItemPO> loggerContext = new LoggerContext<>();
 //        loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId()));
@@ -325,4 +334,34 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService
         private List<String> usingCodes;
 
     }
+
+
+
+    public UsingItem getUsingItem(Long id) {
+
+        //薪资项目
+        SalaryItemPO items = getById(id);
+
+        //账套项目
+        List<SalarySobItemPO> sobItems = getSalarySobItemService(user).listBySalaryItemIds(Collections.singleton(id));
+
+        //回算项目
+        List<SalarySobBackItemPO> backItems = getSalarySobBackItemService(user).listBySalaryItemIds(Collections.singleton(id));
+
+
+
+//        //账套里的项目，项目里的项目
+//        List<Long> sobItemIds = SalaryEntityUtil.properties(sobItems, SalarySobItemPO::getSalaryItemId, Collectors.toList());
+//        List<Long> backItemIds = SalaryEntityUtil.properties(backItems, SalarySobBackItemPO::getSalaryItemId, Collectors.toList());
+//        List<Long> usingItemIds = new ArrayList<>();
+//        usingItemIds.addAll(sobItemIds);
+//        usingItemIds.addAll(backItemIds);
+//
+//        //使用中的code
+//        List<FormulaVar> formulaVars = getSalaryFormulaService(user).listVarByFormulaIds(usingFormulaIds);
+//        List<String> 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<SalarySobBackItemPO> listBySalaryItemIds(Collection<Long> salaryItemIds) {
+        return getSalarySobBackItemMapper().listSome(SalarySobBackItemPO.builder().salaryItemIds(salaryItemIds).build());
+    }
+
 }