From 43fe259c3eea4b5eb20115d8308e5c0845e14f0e Mon Sep 17 00:00:00 2001
From: rq <rq>
Date: Tue, 12 Aug 2025 21:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/srm/controller/SrmSupplierController.java    | 6 ++++++
 .../xujie/sys/modules/srm/mapper/SrmSupplierMapper.java  | 2 ++
 .../sys/modules/srm/service/SrmSupplierService.java      | 2 ++
 .../modules/srm/service/impl/SrmSupplierServiceImpl.java | 9 +++++++++
 src/main/resources/mapper/srm/SrmSupplierMapper.xml      | 9 ++++++++-
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/srm/controller/SrmSupplierController.java b/src/main/java/com/xujie/sys/modules/srm/controller/SrmSupplierController.java
index 882edd92..2b40bbda 100644
--- a/src/main/java/com/xujie/sys/modules/srm/controller/SrmSupplierController.java
+++ b/src/main/java/com/xujie/sys/modules/srm/controller/SrmSupplierController.java
@@ -71,4 +71,10 @@ public class SrmSupplierController {
        srmSupplierService.createNewSupplierRequest(data);
         return R.ok();
     }
+    @PostMapping(value="/confirmRequest")
+    @ResponseBody
+    public R confirmRequest(@RequestBody SrmSupplierGroupRequsetData data) {
+        srmSupplierService.confirmRequest(data);
+        return R.ok();
+    }
 }
diff --git a/src/main/java/com/xujie/sys/modules/srm/mapper/SrmSupplierMapper.java b/src/main/java/com/xujie/sys/modules/srm/mapper/SrmSupplierMapper.java
index 67597b93..62da887f 100644
--- a/src/main/java/com/xujie/sys/modules/srm/mapper/SrmSupplierMapper.java
+++ b/src/main/java/com/xujie/sys/modules/srm/mapper/SrmSupplierMapper.java
@@ -22,4 +22,6 @@ public interface SrmSupplierMapper {
     IPage<SrmSupplierGroupRequsetData> getSupplierGroupRequestList(Page<SrmSupplierGroupRequsetData> pageData, @Param("query") SrmSupplierGroupRequsetData data);
     void saveSrmSupplierGroupRequsetData(SrmSupplierGroupRequsetData data);
 
+    void confirmRequest(SrmSupplierGroupRequsetData data);
+    void updateSupplierGroup(SrmSupplierGroupRequsetData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/srm/service/SrmSupplierService.java b/src/main/java/com/xujie/sys/modules/srm/service/SrmSupplierService.java
index 3ff7ad46..909a553e 100644
--- a/src/main/java/com/xujie/sys/modules/srm/service/SrmSupplierService.java
+++ b/src/main/java/com/xujie/sys/modules/srm/service/SrmSupplierService.java
@@ -18,4 +18,6 @@ public interface SrmSupplierService {
 
     PageUtils getSupplierGroupRequestList(SrmSupplierGroupRequsetData data);
     void createNewSupplierRequest(SrmSupplierGroupRequsetData data);
+
+    void confirmRequest(SrmSupplierGroupRequsetData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/srm/service/impl/SrmSupplierServiceImpl.java b/src/main/java/com/xujie/sys/modules/srm/service/impl/SrmSupplierServiceImpl.java
index aceae22a..380814db 100644
--- a/src/main/java/com/xujie/sys/modules/srm/service/impl/SrmSupplierServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/srm/service/impl/SrmSupplierServiceImpl.java
@@ -65,4 +65,13 @@ public class SrmSupplierServiceImpl implements SrmSupplierService {
             sysOssService.saveOssData(data.getFileList().get(i));
         }
     }
+
+    @Override
+    @Transactional
+    public void confirmRequest(SrmSupplierGroupRequsetData data){
+        srmSupplierMapper.confirmRequest(data);
+        if (data.getStatus().equals("审核通过")) {
+            srmSupplierMapper.updateSupplierGroup(data);
+        }
+    }
 }
diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
index 51125f59..6996cbf1 100644
--- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml
+++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
@@ -48,7 +48,7 @@
     </select>
     <select id="searchSupplierGroupRequestList" resultType="SrmSupplierGroupRequsetData">
         select a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.old_supplier_group,a.new_supplier_group,a.reason,a.[status],
-               a.create_date,a.create_by,a.update_date,a.update_by
+               a.create_date,a.create_by,a.update_date,a.update_by,dbo.plm_get_user_display(a.site,a.create_by) requestBy
         from srm_supplierGroupRequset a
         <where>
             <if test="site !=null and site !=''">
@@ -103,4 +103,11 @@
         insert into srm_supplierGroupRequset(site,request_no,request_date,supplier_no,old_supplier_group,new_supplier_group,reason,[status],create_date,create_by)
          values(#{site},#{requestNo},#{requestDate},#{supplierNo},#{oldSupplierGroup},#{newSupplierGroup},#{reason},#{status},GetDate(),#{createBy})
     </insert>
+    <update id="confirmRequest">
+        update srm_supplierGroupRequset set update_by=#{updateBy},update_date=GetDate(),status=#{status}
+        where id=#{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateSupplierGroup">
+        update srm_supplier set supplier_group=#{newSupplierGroup} where site=#{site} and supplier_no=#{supplierNo}
+    </update>
 </mapper>
\ No newline at end of file