ferrum/quotation-system-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改list, 其中调用iQsUserSupplierService的方法

Browse Source 
2.修改add，增加供应商管理用户的增加与删除
3.修改edit，增加供应商管理用户的增加与删除
This commit is contained in:
tiezx 2025-07-17 12:38:44 +08:00
parent 510e6a0ce2
commit 4fec612e35
1 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
quotation-admin/src/main/java/net/ferrum/web/controller/business/QsSupplierController.java
View File

@ -3,8 +3,10 @@ package net.ferrum.web.controller.business;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.ferrum.business.domain.bo.QsSupplierBo; 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.domain.vo.QsSupplierVo;
import net.ferrum.business.service.IQsSupplierService; import net.ferrum.business.service.IQsSupplierService;
import net.ferrum.business.service.IQsUserSupplierService;
import net.ferrum.common.annotation.Log; import net.ferrum.common.annotation.Log;
import net.ferrum.common.annotation.RepeatSubmit; import net.ferrum.common.annotation.RepeatSubmit;
import net.ferrum.common.core.controller.BaseController; import net.ferrum.common.core.controller.BaseController;
@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -39,13 +42,18 @@ public class QsSupplierController extends BaseController {
private final IQsSupplierService iQsSupplierService; private final IQsSupplierService iQsSupplierService;
private final IQsUserSupplierService iQsUserSupplierService;
/** /**
* 查询供应商信息列表 * 查询供应商信息列表
*/ */
@SaCheckPermission("business:supplier:list") @SaCheckPermission("business:supplier:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<QsSupplierVo> list(QsSupplierBo bo, PageQuery pageQuery) { 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") @SaCheckPermission("business:supplier:query")
@GetMapping("/{supplierId}") @GetMapping("/{supplierId}")
public R<QsSupplierVo> getInfo(@NotNull(message = "主键不能为空") public R<QsSupplierVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long supplierId) { @PathVariable String supplierId) {
return R.ok(iQsSupplierService.queryById(supplierId)); return R.ok(iQsSupplierService.queryById(Long.parseLong(supplierId)));
} }
/** /**
@ -79,7 +87,26 @@ public class QsSupplierController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody QsSupplierBo bo) { 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() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody QsSupplierBo bo) { 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)); return toAjax(iQsSupplierService.updateByBo(bo));
} }