From 4fec612e359fa3741febebbacddc2591966e00bf Mon Sep 17 00:00:00 2001
From: tiezx <tiezx@zstu.edu.cn>
Date: Thu, 17 Jul 2025 12:38:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9list,=20=E5=85=B6=E4=B8=AD?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8iQsUserSupplierService=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=202.=E4=BF=AE=E6=94=B9add=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=8A=A0=E4=B8=8E=E5=88=A0=E9=99=A4=203.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9edit=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8E=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/QsSupplierController.java        | 58 +++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/quotation-admin/src/main/java/net/ferrum/web/controller/business/QsSupplierController.java b/quotation-admin/src/main/java/net/ferrum/web/controller/business/QsSupplierController.java
index 9bcd011..b832e30 100644
--- a/quotation-admin/src/main/java/net/ferrum/web/controller/business/QsSupplierController.java
+++ b/quotation-admin/src/main/java/net/ferrum/web/controller/business/QsSupplierController.java
@@ -3,8 +3,10 @@ package net.ferrum.web.controller.business;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import lombok.RequiredArgsConstructor;
 import net.ferrum.business.domain.bo.QsSupplierBo;
+import net.ferrum.business.domain.bo.QsUserSupplierBo;
 import net.ferrum.business.domain.vo.QsSupplierVo;
 import net.ferrum.business.service.IQsSupplierService;
+import net.ferrum.business.service.IQsUserSupplierService;
 import net.ferrum.common.annotation.Log;
 import net.ferrum.common.annotation.RepeatSubmit;
 import net.ferrum.common.core.controller.BaseController;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -39,13 +42,18 @@ public class QsSupplierController extends BaseController {
 
     private final IQsSupplierService iQsSupplierService;
 
+    private final IQsUserSupplierService iQsUserSupplierService;
+
     /**
      * 查询供应商信息列表
      */
     @SaCheckPermission("business:supplier:list")
     @GetMapping("/list")
     public TableDataInfo<QsSupplierVo> list(QsSupplierBo bo, PageQuery pageQuery) {
-        return iQsSupplierService.queryPageList(bo, pageQuery);
+
+        return iQsUserSupplierService.selectSuppliersByUsersPages(bo, pageQuery);
+
+        //return iQsSupplierService.queryPageList(bo, pageQuery);
     }
 
     /**
@@ -67,8 +75,8 @@ public class QsSupplierController extends BaseController {
     @SaCheckPermission("business:supplier:query")
     @GetMapping("/{supplierId}")
     public R<QsSupplierVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long supplierId) {
-        return R.ok(iQsSupplierService.queryById(supplierId));
+                                     @PathVariable String supplierId) {
+        return R.ok(iQsSupplierService.queryById(Long.parseLong(supplierId)));
     }
 
     /**
@@ -79,7 +87,26 @@ public class QsSupplierController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody QsSupplierBo bo) {
-        return toAjax(iQsSupplierService.insertByBo(bo));
+        boolean ret = iQsSupplierService.insertByBo(bo);
+        if (ret == true){
+            bo.getDockerUsers().forEach(dockerUser -> {
+                if(dockerUser.getDel()==null){ //=null是新增加的，=2是增加后，又删除了的
+                    QsUserSupplierBo qsUserSupplierBo = new QsUserSupplierBo();
+                    qsUserSupplierBo.setSupplierId(bo.getSupplierId());
+                    qsUserSupplierBo.setUserId(dockerUser.getUserId());
+                    if (dockerUser.getId() == null){
+                        iQsUserSupplierService.insertByBo(qsUserSupplierBo);
+                    }
+                    else{
+                        qsUserSupplierBo.setId(dockerUser.getId());
+                        iQsUserSupplierService.updateByBo(qsUserSupplierBo);
+                    }
+                }
+            });
+        }
+
+
+        return toAjax(ret);
     }
 
     /**
@@ -90,6 +117,29 @@ public class QsSupplierController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody QsSupplierBo bo) {
+        List<Long> ids = new ArrayList<>();
+        bo.getDockerUsers().forEach(dockerUser -> {
+
+            if(dockerUser.getDel()!=null){//=null是原来有的，!=null 是后增加的
+                ids.add(dockerUser.getId());
+            }
+            else{
+                QsUserSupplierBo qsUserSupplierBo = new QsUserSupplierBo();
+                qsUserSupplierBo.setSupplierId(bo.getSupplierId());
+                qsUserSupplierBo.setUserId(dockerUser.getUserId());
+                if (dockerUser.getId() == null){
+                    iQsUserSupplierService.insertByBo(qsUserSupplierBo);
+                }
+                else{
+                    qsUserSupplierBo.setId(dockerUser.getId());
+                    iQsUserSupplierService.updateByBo(qsUserSupplierBo);
+                }
+            }
+
+        });
+        if ( !(ids == null || ids.isEmpty()) ){
+            iQsUserSupplierService.deleteWithValidByIds(ids,true);
+        }
         return toAjax(iQsSupplierService.updateByBo(bo));
     }