From d006845f3e49339f1887bb61ff363a35c0fd032d Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:05:47 +0800
Subject: [PATCH] =?UTF-8?q?2024.11.25=20=E5=AE=A1=E6=89=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AuthHistServiceImpl.java     | 12 +++++++++-
 .../service/impl/AuthRuleServiceImpl.java     |  1 +
 .../service/impl/PartCostHistServiceImpl.java | 22 +++++++++----------
 .../xujie/sys/modules/quote/entity/Quote.java | 13 +++++++++++
 .../resources/mapper/quote/QuoteMapper.xml    |  4 +++-
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
index c1361520..c10ce3be 100644
--- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
@@ -94,10 +94,20 @@ public class AuthHistServiceImpl extends ServiceImpl<AuthHistMapper, AuthHistDat
     @Override
     public void authMailSend(List<AuthHistData> emailAddress) throws MessagingException, UnsupportedEncodingException {
         //List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList());
+        String Link = "";
         if (emailAddress != null) {
+            if (emailAddress.get(0).getRecordTypeDb().equals("1")){
+                // 使用 <a> 标签创建可点击链接，链接地址和文本均自定义
+                Link = "<a href='http://localhost:8002/#/auth-authQuote?quoteVersionNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
+                        emailAddress.get(0).getOrderRef1()
+                        + "</a>";
+            } else if (emailAddress.get(0).getRecordTypeDb().equals("2")) {
+                Link = "<a href='http://localhost:8002/#/auth-authQuote?rfqNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
+                emailAddress.get(0).getOrderRef1() + "</a>";
+            }
             StringBuilder s = new StringBuilder();
             s.append("<ol>");
-            s.append("<li>有新的申请单待审批，请及时处理！申请单号:").append(emailAddress.get(0).getOrderRef1()).append("</li>");
+            s.append("<li>有新的申请单待审批，请及时处理！申请单号:").append(Link).append("</li>");
             s.append("</ol>");
             //设置邮件内容
             String text = "<!DOCTYPE>" +
diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthRuleServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthRuleServiceImpl.java
index a2d81790..27184202 100644
--- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthRuleServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthRuleServiceImpl.java
@@ -146,6 +146,7 @@ public class AuthRuleServiceImpl extends ServiceImpl<AuthRuleMapper, AuthRuleDat
                     // 排除重复的userId
                     Set<Integer> set = new HashSet<>(userIds);
                     for (Integer userId : set) {
+                        authHistData.setRecordTypeDb(recordType);
                         authHistData.setUserId(userId);
                         authHistData.setEmail(authRuleMapper.searchAuthMailSend(authHistData));
                         authMailSends.add(authHistData);
diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java
index e4987cb4..6b1fd5b4 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/PartCostHistServiceImpl.java
@@ -61,32 +61,32 @@ public class PartCostHistServiceImpl extends ServiceImpl<PartCostHistMapper, Par
                 // 为对象赋值
                 task.setSite(data.getSite()); // site
                 if (row.getCell(0) == null) {
-                    throw new RuntimeException("BU不能为空!");
-                }
-                task.setBuNo(row.getCell(0).getStringCellValue()); // BU
-                if (row.getCell(1) == null) {
                     throw new RuntimeException("物料编码不能为空!");
                 }
-                task.setPartNo(row.getCell(1).getStringCellValue()); // 物料编码
-                if (row.getCell(2) == null || row.getCell(2).getStringCellValue().equals("")) {
+                task.setPartNo(row.getCell(0).getStringCellValue()); // 物料编码
+
+                if (row.getCell(1) == null || row.getCell(1).getStringCellValue().equals("")) {
                     task.setStandardCost(BigDecimal.valueOf(0));
                 } else {
-                    task.setStandardCost(BigDecimal.valueOf(Long.parseLong(row.getCell(2).getStringCellValue()))); //单位标准成本
+                    task.setStandardCost(BigDecimal.valueOf(Long.parseLong(row.getCell(1).getStringCellValue()))); //单位标准成本
                 }
-                if (row.getCell(3) == null) {
+
+                if (row.getCell(2) == null) {
                     task.setStandardCostCurrency("");
                 } else {
-                    task.setStandardCostCurrency(row.getCell(3).getStringCellValue()); // 标准成本货币
+                    task.setStandardCostCurrency(row.getCell(2).getStringCellValue()); // 标准成本货币
                 }
+
                 if (row.getCell(3) == null || row.getCell(3).getStringCellValue().equals("")) {
                     task.setActualCost(BigDecimal.valueOf(0));
                 } else {
-                    task.setActualCost(BigDecimal.valueOf(Long.parseLong(row.getCell(4).getStringCellValue()))); // 单位报价成本
+                    task.setActualCost(BigDecimal.valueOf(Long.parseLong(row.getCell(3).getStringCellValue()))); // 单位报价成本
                 }
+
                 if (row.getCell(4) == null) {
                     task.setActualCostCurrency("");
                 } else {
-                    task.setActualCostCurrency(row.getCell(5).getStringCellValue()); // 报价成本货币
+                    task.setActualCostCurrency(row.getCell(4).getStringCellValue()); // 报价成本货币
                 }
                 task.setUpdateBy(data.getUpdateBy());
                 task.setUpdateDate(new Date());
diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java b/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java
index 116a1c97..85b732fa 100644
--- a/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java
+++ b/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.sys.common.utils.QueryPage;
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -89,6 +90,15 @@ public class Quote extends QueryPage {
 
     private String remark;
 
+    private String application;
+
+    private String annualDemand; //年需求量
+
+    private String costModel;
+
+    private Double markup;
+
+    private String chipPrice;
 
     /**
      * ------------------(额外字段)----------------------
@@ -157,4 +167,7 @@ public class Quote extends QueryPage {
 
     @TableField(exist = false)
     private String recordTypeDb;
+
+    @TableField(exist = false)
+    private Integer quoteDetailId;
 }
diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index 7356e01d..212d4a56 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -294,7 +294,8 @@
         a.can_auth_flag,
         a.last_step_flag,
         a.record_type_db,
-        a.order_ref1
+        a.order_ref1,
+        d.id AS quote_detail_id
         FROM
         view_all_auth_info_with_email a
         LEFT JOIN plm_quote q ON a.site = q.site
@@ -303,6 +304,7 @@
         LEFT JOIN auth_group c ON c.site = a.site
         AND c.bu_no = a.order_ref2
         AND c.group_no = a.auth_group_id
+        LEFT JOIN plm_quote_detail d ON q.id = d.quote_id
         <where>
             a.user_id = #{params.userId}
             AND a.site = #{params.site}