From b10d9b8fcbe9eddeb881690bbeddafc7f786077f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 14 五月 2025 16:12:13 +0800
Subject: [PATCH] 来票登记优化

---
 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java |   84 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index c8ef0fc..1074d31 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.StringUtils;
@@ -34,10 +35,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -67,7 +65,11 @@
 
     @Override
     public List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger) {
-        return purchaseLedgerMapper.selectList(new LambdaQueryWrapper<>());
+        LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) {
+            queryWrapper.like(PurchaseLedger::getPurchaseContractNumber,purchaseLedger.getPurchaseContractNumber());
+        }
+        return purchaseLedgerMapper.selectList(queryWrapper);
     }
 
     @Override
@@ -75,9 +77,13 @@
 
         SalesLedger salesLedger = salesLedgerMapper.selectById(purchaseLedgerDto.getSalesLedgerId());
 
+        //涓氬姟鍛�
+        SysUser businessPerson = userMapper.selectUserById(purchaseLedgerDto.getBusinessPersonId());
+
         if (salesLedger == null) {
             throw new BaseException("閿�鍞彴璐︿笉瀛樺湪");
         }
+        //褰曞叆浜�
         SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
 
         // DTO杞珽ntity
@@ -87,6 +93,9 @@
         purchaseLedger.setSalesContractNo(salesLedger.getSalesContractNo());
         purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
         purchaseLedger.setRecorderName(sysUser.getNickName());
+        purchaseLedger.setBusinessPersonId(purchaseLedgerDto.getBusinessPersonId());
+        purchaseLedger.setBusinessPerson(businessPerson.getNickName());
+        purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
 
         // 3. 鏂板鎴栨洿鏂颁富琛�
         if (purchaseLedger.getId() == null) {
@@ -239,4 +248,69 @@
         }
         return resultDto;
     }
+
+    @Override
+    public List getProduct(PurchaseLedgerDto purchaseLedgerDto) {
+        LambdaQueryWrapper<PurchaseLedger> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(PurchaseLedger::getId, PurchaseLedger::getPurchaseContractNumber);
+
+        // 鑾峰彇鍘熷鏌ヨ缁撴灉
+        List<Map<String, Object>> result = purchaseLedgerMapper.selectMaps(queryWrapper);
+
+        //鏌ヨ閿�鍞悎鍚屽彿
+
+
+        // 灏嗕笅鍒掔嚎鍛藉悕杞崲涓洪┘宄板懡鍚�
+        return result.stream().map(map -> map.entrySet().stream()
+                .collect(Collectors.toMap(
+                        entry -> underlineToCamel(entry.getKey()),
+                        Map.Entry::getValue))
+        ).collect(Collectors.toList());
+    }
+
+    @Override
+    public PurchaseLedgerDto getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseLedgerDto.getId());
+        if (purchaseLedger == null) {
+            throw new BaseException("閲囪喘鍙拌处涓嶅瓨鍦�");
+        }
+        // 鍒涘缓骞跺～鍏匘TO
+        PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
+        resultDto.setSalesContractNoId(purchaseLedger.getSalesLedgerId());
+        resultDto.setSalesContractNo(purchaseLedger.getSalesContractNo());
+        resultDto.setSupplierName(purchaseLedger.getSupplierName());
+        resultDto.setProjectName(purchaseLedger.getProjectName());
+        resultDto.setBusinessPersonId(purchaseLedger.getBusinessPersonId());
+
+        // 鏌ヨ骞惰缃叧鑱斾骇鍝�
+        LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
+                .eq(SalesLedgerProduct::getType, 2);
+        List<SalesLedgerProduct> productList = salesLedgerProductMapper.selectList(queryWrapper);
+        resultDto.setProductData(productList);
+
+        return resultDto;
+    }
+
+    /**
+     * 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
+     */
+    private String underlineToCamel(String param) {
+        if (param == null || "".equals(param.trim())) {
+            return "";
+        }
+        int len = param.length();
+        StringBuilder sb = new StringBuilder(len);
+        for (int i = 0; i < len; i++) {
+            char c = param.charAt(i);
+            if (c == '_') {
+                if (++i < len) {
+                    sb.append(Character.toUpperCase(param.charAt(i)));
+                }
+            } else {
+                sb.append(Character.toLowerCase(c));
+            }
+        }
+        return sb.toString();
+    }
 }

--
Gitblit v1.9.3