ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

供应商模块更新：实现供应商商品展示和状态字段添加

Browse Source 
在供应商管理功能中，新增了供应商商品展示的功能，可以通过SupplierProductService获取列表。同时，在SupplierDO中添加了状态字段以支持新的业务需求。此外，相关的VO类（SupplierPageReqVO、SupplierRespVO、SupplierSaveReqVO）也进行了调整，以适配状态字段的显示和处理。
This commit is contained in:
aikai 2024-09-14 21:50:06 +08:00
parent d97b729fa2
commit 0f43fd147d
8 changed files with 80 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierController.java
View File

@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

51
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/SupplierController.java
View File

@ -1,33 +1,34 @@
package cn.iocoder.yudao.module.system.controller.admin.supplier;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.*;
import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierProductRespVO;
import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierRespVO;
import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierDO;
import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierProductDO;
import cn.iocoder.yudao.module.system.service.supplier.SupplierProductService;
import cn.iocoder.yudao.module.system.service.supplier.SupplierService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 供应商列表(OA已审核通过后插入)")
@RestController
@ -37,6 +38,8 @@ public class SupplierController {
@Resource
private SupplierService supplierService;
@Resource
private SupplierProductService supplierProductService;
@PostMapping("/create")
@Operation(summary = "创建供应商列表(OA已审核通过后插入)")
@ -68,7 +71,11 @@ public class SupplierController {
@PreAuthorize("@ss.hasPermission('system:supplier:query')")
public CommonResult<SupplierRespVO> getSupplier(@RequestParam("id") Long id) {
SupplierDO supplier = supplierService.getSupplier(id);
return success(BeanUtils.toBean(supplier, SupplierRespVO.class));
SupplierRespVO vo = BeanUtils.toBean(supplier, SupplierRespVO.class);
List<SupplierProductDO> items = supplierProductService.getBySupplierId(id);
List<SupplierProductRespVO> itemVos = BeanUtils.toBean(items, SupplierProductRespVO.class);
vo.setItems(itemVos);
return success(vo);
}
@GetMapping("/page")

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierPageReqVO.java
View File

@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.system.controller.admin.supplier.vo;
import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
@ -43,8 +46,11 @@ public class SupplierPageReqVO extends PageParam {
@Schema(description = "银行开户行")
private String bankAccountOpeningBank;
@Schema(description = "附件信息")
private String fileItems;
@Schema(description = "状态 0禁用 1启用")
private Integer status;
@TableField(typeHandler = JacksonTypeHandler.class)
private List<UploadUserFile> fileItems;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
private String remark;

16
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierRespVO.java
View File

@ -1,5 +1,9 @@
package cn.iocoder.yudao.module.system.controller.admin.supplier.vo;
import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierProductDO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@ -53,9 +57,11 @@ public class SupplierRespVO {
@ExcelProperty("银行开户行")
private String bankAccountOpeningBank;
@Schema(description = "附件信息")
@ExcelProperty("附件信息")
private String fileItems;
@Schema(description = "状态 0禁用 1启用")
private Integer status;
@TableField(typeHandler = JacksonTypeHandler.class)
private List<UploadUserFile> fileItems;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
private String remark;
@ -64,4 +70,8 @@ public class SupplierRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "列表", requiredMode = Schema.RequiredMode.REQUIRED)
private List<SupplierProductRespVO> items;
}

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java
View File

@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.system.controller.admin.supplier.vo;
import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@ -40,8 +43,11 @@ public class SupplierSaveReqVO {
@Schema(description = "银行开户行")
private String bankAccountOpeningBank;
@Schema(description = "附件信息")
private String fileItems;
@Schema(description = "银行开户行")
private Integer status;
@TableField(typeHandler = JacksonTypeHandler.class)
private List<UploadUserFile> fileItems;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
private String remark;

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierDO.java
View File

@ -68,6 +68,10 @@ public class SupplierDO extends BaseDO {
* 银行开户行
*/
private String bankAccountOpeningBank;
/**
* 状态 0禁用 1启用
*/
private Integer status;
/**
* 附件信息
*/

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductService.java
View File

@ -52,4 +52,10 @@ public interface SupplierProductService {
*/
PageResult<SupplierProductDO> getSupplierProductPage(SupplierProductPageReqVO pageReqVO);
/**
* 获取列表
* @param supplierId
* @return
*/
List<SupplierProductDO> getBySupplierId(Long supplierId);
}

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductServiceImpl.java
View File

@ -6,10 +6,12 @@ import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierProdu
import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierProductSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierProductDO;
import cn.iocoder.yudao.module.system.dal.mysql.supplier.SupplierProductMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.List;
/**
* 供应商商品 Service 实现类
@ -55,4 +57,10 @@ public class SupplierProductServiceImpl implements SupplierProductService {
return supplierProductMapper.selectPage(pageReqVO);
}
@Override
public List<SupplierProductDO> getBySupplierId(Long supplierId) {
return supplierProductMapper.selectList(new LambdaQueryWrapper<SupplierProductDO>()
.eq(SupplierProductDO::getSupplierId, supplierId));
}
}