From 0f43fd147d7e0545e4cdc39ef6aef2143b914511 Mon Sep 17 00:00:00 2001 From: aikai Date: Sat, 14 Sep 2024 21:50:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E5=AE=9E=E7=8E=B0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA=E5=92=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在供应商管理功能中，新增了供应商商品展示的功能，可以通过SupplierProductService获取列表。同时，在SupplierDO中添加了状态字段以支持新的业务需求。此外，相关的VO类（SupplierPageReqVO、SupplierRespVO、SupplierSaveReqVO）也进行了调整，以适配状态字段的显示和处理。 --- .../admin/oa/BpmOaSupplierController.java | 1 + .../admin/supplier/SupplierController.java | 57 +++++++++++-------- .../admin/supplier/vo/SupplierPageReqVO.java | 10 +++- .../admin/supplier/vo/SupplierRespVO.java | 16 +++++- .../admin/supplier/vo/SupplierSaveReqVO.java | 10 +++- .../dal/dataobject/supplier/SupplierDO.java | 4 ++ .../supplier/SupplierProductService.java | 6 ++ .../supplier/SupplierProductServiceImpl.java | 8 +++ 8 files changed, 80 insertions(+), 32 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierController.java index 5cf197dc..a9e8dcd5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierController.java @@ -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; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/SupplierController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/SupplierController.java index 269bf57b..ec7f02af 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/SupplierController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/SupplierController.java @@ -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 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 items = supplierProductService.getBySupplierId(id); + List itemVos = BeanUtils.toBean(items, SupplierProductRespVO.class); + vo.setItems(itemVos); + return success(vo); } @GetMapping("/page") @@ -84,12 +91,12 @@ public class SupplierController { @PreAuthorize("@ss.hasPermission('system:supplier:export')") @OperateLog(type = EXPORT) public void exportSupplierExcel(@Valid SupplierPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = supplierService.getSupplierPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "供应商列表(OA已审核通过后插入).xls", "数据", SupplierRespVO.class, - BeanUtils.toBean(list, SupplierRespVO.class)); + BeanUtils.toBean(list, SupplierRespVO.class)); } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierPageReqVO.java index a51888ac..51c3f924 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierPageReqVO.java @@ -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 fileItems; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) private String remark; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierRespVO.java index be2e582a..4d1e048d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierRespVO.java @@ -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 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 items; + + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java index 98ce1e54..90a4ebcc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java @@ -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 fileItems; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED) private String remark; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierDO.java index 49daa912..c53c2ffe 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierDO.java @@ -68,6 +68,10 @@ public class SupplierDO extends BaseDO { * 银行开户行 */ private String bankAccountOpeningBank; + /** + * 状态 0禁用 1启用 + */ + private Integer status; /** * 附件信息 */ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductService.java index c82d48c1..20cf0580 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductService.java @@ -52,4 +52,10 @@ public interface SupplierProductService { */ PageResult getSupplierProductPage(SupplierProductPageReqVO pageReqVO); + /** + * 获取列表 + * @param supplierId + * @return + */ + List getBySupplierId(Long supplierId); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductServiceImpl.java index ae78a6d3..ea59a0ff 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductServiceImpl.java @@ -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 getBySupplierId(Long supplierId) { + return supplierProductMapper.selectList(new LambdaQueryWrapper() + .eq(SupplierProductDO::getSupplierId, supplierId)); + } + }