From b0ffec5d96e0949962f7afc115f7e3acda9c760c Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 17 Apr 2025 15:29:58 +0800
Subject: [PATCH] 20250417

---
 .../xujie/sys/modules/quote/entity/Quote.java |  3 ++
 .../service/impl/QuoteDetailServiceImpl.java  | 10 ++++
 .../quote/service/impl/QuoteServiceImpl.java  | 49 +++++++++++++------
 src/main/resources/mapper/sys/SysUserDao.xml  |  4 +-
 4 files changed, 48 insertions(+), 18 deletions(-)

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 dc333f97..3491de2f 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
@@ -177,4 +177,7 @@ public class Quote extends QueryPage {
 
     @TableField(exist = false)
     private String enStatus;
+
+    @TableField(exist = false)
+    private List<Long> groupIds;
 }
diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
index bcacd43a..37c22ad6 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
@@ -9,6 +9,7 @@ import com.xujie.sys.modules.quote.service.*;
 import com.xujie.sys.modules.quote.strategy.ComputeFactory;
 import com.xujie.sys.modules.quote.strategy.ComputeStrategy;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +36,8 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
     private QuoteDetailRoutingService quoteDetailRoutingService;
     @Autowired
     private QuoteDetailCalculationService quoteDetailCalculationService;
+    @Autowired
+    private QuoteGroupDetailService quoteGroupDetailService;
 
     @Override
     public IPage<QuoteDetail> queryQuoteDetailByPage(int no, int size, QuoteDetail quoteDetail) {
@@ -135,6 +138,13 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
     public void updateQuoteDetail(QuoteDetail quoteDetail) {
         quoteDetail.setUpdateDate(new Date());
         updateById(quoteDetail);
+        // 同步修改 Group表
+        if (Objects.nonNull(quoteDetail.getQuoteGroupDetailId())){
+            QuoteGroupDetail groupDetail = new QuoteGroupDetail();
+            BeanUtils.copyProperties(quoteDetail,groupDetail);
+            groupDetail.setId(quoteDetail.getQuoteGroupDetailId());
+            quoteGroupDetailService.updateById(groupDetail);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
index 8f9d7c8d..a46d4562 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
@@ -373,25 +373,42 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
                 .set(Quote::getStatus, quote.getEnStatus())
                 .eq(Quote::getId, quote.getId())
                 .update();
-        // 明细
-        quoteGroupDetailService.lambdaUpdate()
-                .set(QuoteGroupDetail::getStatus, quote.getEnStatus())
-                .eq(QuoteGroupDetail::getQuoteId, quote.getId())
-                .update();
-        // 明细
-        quoteDetailService.lambdaUpdate()
-                .set(QuoteDetail::getStatus,quote.getEnStatus())
-                .eq(QuoteDetail::getQuoteId, quote.getId())
-                .update();
-        if ("下达".equals(quote.getEnStatus())) {
+        if ("下达".equals(quote.getEnStatus())){
+            if ((Objects.isNull(quote.getGroupIds()) || quote.getGroupIds().isEmpty())){
+                throw new RuntimeException("请选择需要审批的条目明细");
+            }
+            // 明细
+            quoteGroupDetailService.lambdaUpdate()
+                    .set(QuoteGroupDetail::getStatus, quote.getEnStatus())
+                    .eq(QuoteGroupDetail::getQuoteId, quote.getId())
+                    .in(QuoteGroupDetail::getId, quote.getGroupIds())
+                    .update();
+            // 明细
+            quoteDetailService.lambdaUpdate()
+                    .set(QuoteDetail::getStatus,quote.getEnStatus())
+                    .eq(QuoteDetail::getQuoteId, quote.getId())
+                    .in(QuoteDetail::getQuoteGroupDetailId, quote.getGroupIds())
+                    .update();
             // 审批规则
             authRuleService.getFormAuthRule("1",quote.getSite(),quote.getBuNo(),quote.getQuoteVersionNo());
-        }else if ("驳回".equals(quote.getEnStatus())) {
-            inquiryApplicationService.lambdaUpdate()
-                    .set(InquiryApplicationData::getStatus, "D")
-                    .eq(InquiryApplicationData::getSite, quote.getSite())
-                    .eq(InquiryApplicationData::getRfqNo,quote.getInsideInquiryNo())
+        }else {
+            // 明细
+            quoteGroupDetailService.lambdaUpdate()
+                    .set(QuoteGroupDetail::getStatus, quote.getEnStatus())
+                    .eq(QuoteGroupDetail::getQuoteId, quote.getId())
                     .update();
+            // 明细
+            quoteDetailService.lambdaUpdate()
+                    .set(QuoteDetail::getStatus,quote.getEnStatus())
+                    .eq(QuoteDetail::getQuoteId, quote.getId())
+                    .update();
+            if ("驳回".equals(quote.getEnStatus())) {
+                inquiryApplicationService.lambdaUpdate()
+                        .set(InquiryApplicationData::getStatus, "D")
+                        .eq(InquiryApplicationData::getSite, quote.getSite())
+                        .eq(InquiryApplicationData::getRfqNo,quote.getInsideInquiryNo())
+                        .update();
+            }
         }
     }
 
diff --git a/src/main/resources/mapper/sys/SysUserDao.xml b/src/main/resources/mapper/sys/SysUserDao.xml
index 10d1a2f5..d92593fb 100644
--- a/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/src/main/resources/mapper/sys/SysUserDao.xml
@@ -23,7 +23,7 @@
 
 	<select id="queryUserPage" resultType="com.xujie.sys.modules.orderIssure.vo.SysUserEntityData">
 	    select a.user_id,a.username,a.password,a.salt,a.email,a.mobile,a.status,a.create_user_id,a.create_time,a.language_default,
-a.site,a.user_display,a.WorkShopId ,b.WorkShopName
+		a.site,a.user_display,a.WorkShopId ,b.WorkShopName
         from sys_user a left join eam_WorkShop b on a.WorkShopId=b.WorkShopId
         <where>
          <if test="username != null and username != ''">
@@ -36,7 +36,7 @@ a.site,a.user_display,a.WorkShopId ,b.WorkShopName
                 AND a.create_user_id = #{createUserId}
             </if>
         </where>
-        order by a.user_display
+        order by a.user_id desc
     </select>
 
 </mapper>
\ No newline at end of file