From c45378cde58ef8e0792a5c3fb5cc505afc4b2012 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 24 Jan 2025 18:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E=E5=8F=8A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../back/service/impl/BackApplyInfoServiceImpl.java  | 12 ++++++++++--
 .../basic/service/impl/ComplexQueryServiceImpl.java  |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
index d24f8559..375d0162 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
@@ -253,6 +253,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         return (item.getTypeName() != null && item.getTypeName().contains(keyWord)) ||
                 (item.getCode() != null && item.getCode().contains(keyWord)) ||
                 (item.getBackPerson() != null && item.getBackPerson().contains(keyWord)) ||
+                (item.getUnitName() != null && item.getUnitName().contains(keyWord)) ||
+                (item.getProName() != null && item.getProName().contains(keyWord)) ||
                 (item.getPhone() != null && item.getPhone().contains(keyWord));
     }
 
@@ -1201,8 +1203,14 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
             bmFileInfo.setTaskType(3);
             result += bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfo);
             if (result > 0) {
-                // 更新back_apply_details的数据
-                result += backApplyInfoMapper.update(backApplyDetails);
+                // 先根据id查询back_apply_details的数据
+                if (info.getPreNum().compareTo(backApplyDetails.getPreNum()) == 0) {
+                    // 删除back_apply_details的数据
+                    result += backApplyInfoMapper.deleteBackApplyDetailsById(backApplyDetails);
+                } else {
+                    // 更新back_apply_details的数据
+                    result += backApplyInfoMapper.update(backApplyDetails);
+                }
                 // 删除back_check_details的数据
                 BackApplyInfo backApplyInfo = new BackApplyInfo();
                 backApplyInfo.setParentId(backApplyDetails.getParentId());
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
index 44848598..4554e0e5 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
@@ -210,6 +210,7 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
                             .multiply(new BigDecimal(100))
                             .setScale(2, BigDecimal.ROUND_HALF_UP) + "%";
                 }
+                retainedEquipmentInfo.setTotalPrice(equipmentPrice);
                 retainedEquipmentInfo.setFiveReplacementRate(fiveReplacementRate);
                 retainedEquipmentInfo.setTenReplacementRate(tenReplacementRate);
                 retainedEquipmentInfo.setTenPlusReplacementRate(tenPlusReplacementRate);