From f5f230723222088165ad4c924174cc948c25d74d Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Fri, 26 Apr 2024 17:58:14 +0800
Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/domain/PurchaseMacodeInfo.java   | 14 +++++++++++++
 .../impl/PurchaseMacodeInfoServiceImpl.java   | 21 ++++++++++++++++++-
 .../mapper/material/BackApplyMapper.xml       |  1 +
 .../material/PurchaseMacodeInfoMapper.xml     |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
index 80f435dc..e006732b 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * 新购验收编号管理对象 
@@ -366,4 +367,17 @@ public class PurchaseMacodeInfo extends BaseEntity
             .append("companyId", getCompanyId())
             .toString();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PurchaseMacodeInfo that = (PurchaseMacodeInfo) o;
+        return Objects.equals(fixCode, that.fixCode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(fixCode);
+    }
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
index bfef04db..725b8ac5 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
@@ -5,6 +5,8 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 import com.bonus.sgzb.base.api.domain.*;
@@ -19,6 +21,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.material.vo.EquipmentNumberVO;
 import com.bonus.sgzb.material.vo.GlobalContants;
 import com.bonus.sgzb.material.vo.MaInputVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +35,7 @@ import javax.annotation.Resource;
  * @date 2023-12-10
  */
 @Service
+@Slf4j
 public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService {
 
     @Resource
@@ -70,7 +74,22 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      */
     @Override
     public List<PurchaseMacodeInfo> selectPurchaseMacodeInfoList(PurchaseMacodeInfo purchaseMacodeInfo) {
-        return purchaseMacodeInfoMapper.selectPurchaseMacodeInfoList(purchaseMacodeInfo);
+
+        List<PurchaseMacodeInfo> purchaseMacodeInfoList = purchaseMacodeInfoMapper.selectPurchaseMacodeInfoList(purchaseMacodeInfo);
+       //判断有没有绑定固定资产
+        if (purchaseMacodeInfoList.size() > 0 && purchaseMacodeInfoList.get(0).getFixCode()!=null){
+           Map<Object,Long> groupCounts = purchaseMacodeInfoList.stream().map(PurchaseMacodeInfo::getFixCode).collect(Collectors.groupingBy(String::valueOf, Collectors.counting()));
+          //去重
+           purchaseMacodeInfoList = purchaseMacodeInfoList.stream().distinct().collect(Collectors.toList());
+           for (PurchaseMacodeInfo purchaseMacodeInfo1 : purchaseMacodeInfoList) {
+               groupCounts.forEach((fixCode, count) -> {
+                   if (purchaseMacodeInfo1.getFixCode().equals(fixCode)) {
+                       purchaseMacodeInfo1.setBindNum(count.intValue());
+                   }
+               });
+           }
+       }
+        return purchaseMacodeInfoList;
     }
 
     /**
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 521a7470..44dc8ba7 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -749,6 +749,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bai.`status` as `status`,
         bad.id as detailsId,
         bad.pre_num AS num,
+        bad.audit_num AS auditNum,
         IFNULL( aa.num, 0 ) AS useNum
         FROM
         back_apply_details bad
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index e9526d6e..737eb966 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPurchaseMacodeInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo" resultMap="PurchaseMacodeInfoResult">
-        select pcd.task_id, pcd.type_id, pmi.qr_code, pmi.fix_code, pmi.code_type, pmi.status,
+        select  pcd.task_id, pcd.type_id, pmi.qr_code, pmi.fix_code, pmi.code_type, pmi.status,
         pmi.remark, pmi.company_id, mt.type_name specificationType, pt.arrival_time arrivalTime,
         mt1.type_name typeName, pcd.check_num checkNum, pcd.purchase_num purchaseNum ,
         IFNULL(pcd.bind_num,0) bindNum, mt.code typeCode,mt.model_code specsCode,pt.purchase_time purchaseTime