From 7f6c6206cb21b12dc7746aa1f657af4fb03bc6ea Mon Sep 17 00:00:00 2001 From: aikai Date: Sat, 14 Sep 2024 10:00:08 +0800 Subject: [PATCH] =?UTF-8?q?OA=E4=BE=9B=E5=BA=94=E5=95=86=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=20/=20OA=E4=BE=9B=E5=BA=94=E5=95=86=E5=95=86=E5=93=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=20/=20=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20/=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=95=86=E5=93=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pojo}/UploadUserFile.java | 2 +- .../FinancialPaymentController.java | 3 +- .../vo/FinancialPaymentItemRespVO.java | 2 +- .../vo/FinancialPaymentItemSaveReqVO.java | 4 +- .../admin/oa/BpmOaSupplierController.java | 73 +++++++++ .../oa/BpmOaSupplierProductController.java | 73 +++++++++ .../oa/vo/cash/BpmOACashCreateReqVO.java | 2 +- .../admin/oa/vo/cash/BpmOACashRespVO.java | 2 +- .../vo/contract/BpmOAContractCreateReqVO.java | 2 +- .../oa/vo/contract/BpmOAContractRespVO.java | 2 +- .../oa/vo/entry/BpmOAEntryCreateReqVO.java | 2 +- .../admin/oa/vo/entry/BpmOAEntryRespVO.java | 2 +- .../vo/evection/BpmOAEvectionCreateReqVO.java | 2 +- .../oa/vo/evection/BpmOAEvectionRespVO.java | 2 +- .../oa/vo/goOut/BpmOAGoOutCreateReqVO.java | 2 +- .../admin/oa/vo/goOut/BpmOAGoOutRespVO.java | 2 +- .../vo/imprest/BpmOAImprestCreateReqVO.java | 2 +- .../oa/vo/imprest/BpmOAImprestRespVO.java | 2 +- .../incentive/BpmOAIncentiveCreateReqVO.java | 2 +- .../oa/vo/incentive/BpmOAIncentiveRespVO.java | 3 +- .../admin/oa/vo/leave/BpmOALeaveBaseVO.java | 2 +- .../vo/overtime/BpmOAOvertimeCreateReqVO.java | 2 +- .../oa/vo/overtime/BpmOAOvertimeRespVO.java | 2 +- .../oa/vo/procure/BpmOAProcureRespVO.java | 2 +- .../oa/vo/procure/BpmOAProcureSaveReqVO.java | 2 +- .../vo/procurepay/BpmOAProcurePayRespVO.java | 4 +- .../procurepay/BpmOAProcurePaySaveReqVO.java | 5 +- .../vo/regular/BpmOARegularCreateReqVO.java | 2 +- .../oa/vo/regular/BpmOARegularRespVO.java | 2 +- .../BpmOAReimbursementCreateReqVO.java | 2 +- .../BpmOAReimbursementRespVO.java | 2 +- .../oa/vo/seal/BpmOASealCreateReqVO.java | 2 +- .../admin/oa/vo/seal/BpmOASealRespVO.java | 2 +- .../oa/vo/second/BpmOASecondCreateReqVO.java | 2 +- .../admin/oa/vo/second/BpmOASecondRespVO.java | 2 +- .../shiftjobs/BpmOAShiftjobsCreateReqVO.java | 2 +- .../oa/vo/shiftjobs/BpmOAShiftjobsRespVO.java | 2 +- .../vo/supplier/BpmOASupplierPageReqVO.java | 64 ++++++++ .../BpmOASupplierProductPageReqVO.java | 52 ++++++ .../supplier/BpmOASupplierProductRespVO.java | 49 ++++++ .../BpmOASupplierProductSaveReqVO.java | 45 ++++++ .../oa/vo/supplier/BpmOASupplierRespVO.java | 60 +++++++ .../vo/supplier/BpmOASupplierSaveReqVO.java | 63 ++++++++ .../oa/vo/worktask/BpmOAWorkTaskReqVO.java | 2 +- .../bpm/convert/oa/BpmOASupplierConvert.java | 18 +++ .../oa/BpmOaSupplierProductConvert.java | 20 +++ .../FinancialPaymentItemDO.java | 2 +- .../bpm/dal/dataobject/oa/BpmOACashDO.java | 2 +- .../dal/dataobject/oa/BpmOAContractDO.java | 2 +- .../bpm/dal/dataobject/oa/BpmOAEntryDO.java | 4 +- .../dal/dataobject/oa/BpmOAEvectionDO.java | 2 +- .../bpm/dal/dataobject/oa/BpmOAGoOutDO.java | 2 +- .../bpm/dal/dataobject/oa/BpmOAImprestDO.java | 2 +- .../dal/dataobject/oa/BpmOAIncentiveDO.java | 2 +- .../bpm/dal/dataobject/oa/BpmOALeaveDO.java | 4 +- .../dal/dataobject/oa/BpmOAOvertimeDO.java | 2 +- .../bpm/dal/dataobject/oa/BpmOAProcureDO.java | 3 +- .../dal/dataobject/oa/BpmOAProcurePayDO.java | 4 +- .../bpm/dal/dataobject/oa/BpmOARegularDO.java | 2 +- .../dataobject/oa/BpmOAReimbursementDO.java | 3 +- .../bpm/dal/dataobject/oa/BpmOASealDO.java | 2 +- .../bpm/dal/dataobject/oa/BpmOASecondDO.java | 2 +- .../dal/dataobject/oa/BpmOAShiftjobsDO.java | 2 +- .../dal/dataobject/oa/BpmOASupplierDO.java | 84 ++++++++++ .../dataobject/oa/BpmOASupplierProductDO.java | 71 +++++++++ .../dal/dataobject/oa/BpmOAWorkTaskDO.java | 4 +- .../bpm/dal/mysql/oa/BpmOASupplierMapper.java | 38 +++++ .../mysql/oa/BpmOASupplierProductMapper.java | 33 ++++ .../rpc/config/RpcConfiguration.java | 3 +- .../bpm/service/oa/BpmOABaseService.java | 2 +- .../bpm/service/oa/BpmOACashServiceImpl.java | 2 +- .../service/oa/BpmOAContractServiceImpl.java | 2 +- .../bpm/service/oa/BpmOAEntryServiceImpl.java | 4 +- .../service/oa/BpmOAEvectionServiceImpl.java | 2 +- .../bpm/service/oa/BpmOAGoOutServiceImpl.java | 2 +- .../service/oa/BpmOAImprestServiceImpl.java | 2 +- .../service/oa/BpmOAIncentiveServiceImpl.java | 2 +- .../bpm/service/oa/BpmOALeaveServiceImpl.java | 2 +- .../service/oa/BpmOAOvertimeServiceImpl.java | 6 +- .../oa/BpmOAProcurePayServiceImpl.java | 2 +- .../service/oa/BpmOAProcureServiceImpl.java | 2 +- .../service/oa/BpmOARegularServiceImpl.java | 2 +- .../oa/BpmOAReimbursementServiceImpl.java | 2 +- .../bpm/service/oa/BpmOASealServiceImpl.java | 2 +- .../service/oa/BpmOASecondServiceImpl.java | 4 +- .../service/oa/BpmOAShiftjobsServiceImpl.java | 2 +- .../bpm/service/oa/BpmOASupplierService.java | 63 ++++++++ .../service/oa/BpmOAWorkTaskServiceImpl.java | 2 +- .../oa/BpmOaSupplierProductService.java | 55 +++++++ .../oa/BpmOaSupplierProductServiceImpl.java | 58 +++++++ .../service/oa/BpmOaSupplierServiceImpl.java | 150 ++++++++++++++++++ .../listener/BpmOASupplierResultListener.java | 31 ++++ .../mapper/oa/BpmOASupplierMapper.xml | 12 ++ .../mapper/oa/BpmOASupplierProductMapper.xml | 12 ++ .../system/api/supplier/SupplierApi.java | 23 +++ .../supplier/dto/SupplierProductRpcDTO.java | 36 +++++ .../api/supplier/dto/SupplierRpcDTO.java | 56 +++++++ .../system/api/supplier/SupplierApiImpl.java | 26 +++ .../admin/supplier/SupplierController.java | 95 +++++++++++ .../admin/supplier/vo/SupplierPageReqVO.java | 53 +++++++ .../supplier/vo/SupplierProductPageReqVO.java | 44 +++++ .../supplier/vo/SupplierProductRespVO.java | 53 +++++++ .../supplier/vo/SupplierProductSaveReqVO.java | 38 +++++ .../admin/supplier/vo/SupplierRespVO.java | 64 ++++++++ .../admin/supplier/vo/SupplierSaveReqVO.java | 46 ++++++ .../dal/dataobject/supplier/SupplierDO.java | 76 +++++++++ .../supplier/SupplierProductDO.java | 60 +++++++ .../dal/mysql/supplier/SupplierMapper.java | 36 +++++ .../mysql/supplier/SupplierProductMapper.java | 33 ++++ .../supplier/SupplierProductService.java | 55 +++++++ .../supplier/SupplierProductServiceImpl.java | 58 +++++++ .../service/supplier/SupplierService.java | 62 ++++++++ .../service/supplier/SupplierServiceImpl.java | 99 ++++++++++++ .../mapper/supplier/SupplierMapper.xml | 12 ++ .../mapper/supplier/SupplierProductMapper.xml | 12 ++ 115 files changed, 2245 insertions(+), 90 deletions(-) rename {yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/upload => yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo}/UploadUserFile.java (89%) create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierController.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierProductController.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierPageReqVO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductPageReqVO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductRespVO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductSaveReqVO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierRespVO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierSaveReqVO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOASupplierConvert.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOaSupplierProductConvert.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierDO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProductDO.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierMapper.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierProductMapper.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierService.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductService.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductServiceImpl.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierServiceImpl.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOASupplierResultListener.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierMapper.xml create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierProductMapper.xml create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierProductRpcDTO.java create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierRpcDTO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/SupplierController.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierPageReqVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductPageReqVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductRespVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductSaveReqVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierRespVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierDO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierProductDO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierMapper.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierProductMapper.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductService.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductServiceImpl.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierService.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierServiceImpl.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierMapper.xml create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierProductMapper.xml diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/upload/UploadUserFile.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/UploadUserFile.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/upload/UploadUserFile.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/UploadUserFile.java index 04851e7b..f6ba405f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/upload/UploadUserFile.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/UploadUserFile.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.upload; +package cn.iocoder.yudao.framework.common.pojo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java index 74cae05b..2398a8eb 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.financialpayment.vo.Financia import cn.iocoder.yudao.module.bpm.controller.admin.financialpayment.vo.FinancialPaymentSaveReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.financialpayment.vo.FinancialPaymentSaveVO; import cn.iocoder.yudao.module.bpm.controller.admin.financialpaymentitem.vo.FinancialPaymentItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpaymentitem.FinancialPaymentItemDO; import cn.iocoder.yudao.module.bpm.service.financialpayment.FinancialPaymentService; @@ -17,7 +17,6 @@ import cn.iocoder.yudao.module.bpm.service.financialpaymentitem.FinancialPayment 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.context.annotation.Lazy; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemRespVO.java index 17d40236..b8b380bc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemRespVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.financialpaymentitem.vo; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemSaveReqVO.java index 206b9d32..60840f61 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemSaveReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpaymentitem/vo/FinancialPaymentItemSaveReqVO.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.bpm.controller.admin.financialpaymentitem.vo; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +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.*; -import javax.validation.constraints.*; -import java.util.*; import java.math.BigDecimal; @Schema(description = "管理后台 - 财务支付子表新增/修改 Request VO") 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 new file mode 100644 index 00000000..2dce58dd --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierController.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierPageReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierRespVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierSaveReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierDO; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOASupplierService; +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.validation.Valid; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - OA供应商审核") +@RestController +@RequestMapping("/bpm/oa-supplier") +@Validated +public class BpmOaSupplierController { + + @Resource + private BpmOASupplierService oaSupplierService; + + @PostMapping("/create") + @Operation(summary = "创建OA供应商审核") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier:create')") + public CommonResult createOaSupplier(@Valid @RequestBody BpmOASupplierSaveReqVO createReqVO) { + return success(oaSupplierService.createOaSupplier(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新OA供应商审核") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier:update')") + public CommonResult updateOaSupplier(@Valid @RequestBody BpmOASupplierSaveReqVO updateReqVO) { + oaSupplierService.updateOaSupplier(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除OA供应商审核") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier:delete')") + public CommonResult deleteOaSupplier(@RequestParam("id") Long id) { + oaSupplierService.deleteOaSupplier(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得OA供应商审核") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier:query')") + public CommonResult getOaSupplier(@RequestParam("id") Long id) { + BpmOASupplierDO oaSupplier = oaSupplierService.getOaSupplier(id); + return success(BeanUtils.toBean(oaSupplier, BpmOASupplierRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得OA供应商审核分页") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier:query')") + public CommonResult> getOaSupplierPage(@Valid BpmOASupplierPageReqVO pageReqVO) { + PageResult pageResult = oaSupplierService.getOaSupplierPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BpmOASupplierRespVO.class)); + } + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierProductController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierProductController.java new file mode 100644 index 00000000..882ba542 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOaSupplierProductController.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductPageReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductRespVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductSaveReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierProductDO; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOaSupplierProductService; +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.validation.Valid; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - OA供应商商品") +@RestController +@RequestMapping("/bpm/oa-supplier-product") +@Validated +public class BpmOaSupplierProductController { + + @Resource + private BpmOaSupplierProductService oaSupplierProductService; + + @PostMapping("/create") + @Operation(summary = "创建OA供应商商品") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier-product:create')") + public CommonResult createOaSupplierProduct(@Valid @RequestBody BpmOASupplierProductSaveReqVO createReqVO) { + return success(oaSupplierProductService.createOaSupplierProduct(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新OA供应商商品") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier-product:update')") + public CommonResult updateOaSupplierProduct(@Valid @RequestBody BpmOASupplierProductSaveReqVO updateReqVO) { + oaSupplierProductService.updateOaSupplierProduct(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除OA供应商商品") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier-product:delete')") + public CommonResult deleteOaSupplierProduct(@RequestParam("id") Long id) { + oaSupplierProductService.deleteOaSupplierProduct(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得OA供应商商品") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier-product:query')") + public CommonResult getOaSupplierProduct(@RequestParam("id") Long id) { + BpmOASupplierProductDO oaSupplierProduct = oaSupplierProductService.getOaSupplierProduct(id); + return success(BeanUtils.toBean(oaSupplierProduct, BpmOASupplierProductRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得OA供应商商品分页") + @PreAuthorize("@ss.hasPermission('bpm:oa-supplier-product:query')") + public CommonResult> getOaSupplierProductPage(@Valid BpmOASupplierProductPageReqVO pageReqVO) { + PageResult pageResult = oaSupplierProductService.getOaSupplierProductPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BpmOASupplierProductRespVO.class)); + } + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java index 7ee50773..a95647ad 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java index d1aba2c2..9c14dee6 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractCreateReqVO.java index d3e52f25..c5853fb1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.contract; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractRespVO.java index 6a514826..e8ed1f3b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/contract/BpmOAContractRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.contract; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryCreateReqVO.java index 26caf804..9f483f5f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryCreateReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry; import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryRespVO.java index 111317ec..8c6b2abc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/entry/BpmOAEntryRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionCreateReqVO.java index 9072fd33..6f11302f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionRespVO.java index 0aa3f277..b62c17ea 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/evection/BpmOAEvectionRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java index 60ba9eff..9f05e218 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java index 17ee707d..02a86799 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestCreateReqVO.java index ad696dbd..67efe38a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.imprest; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java index 98491646..30b80618 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.imprest; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveCreateReqVO.java index 54e112a4..d7d21bee 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.incentive; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveRespVO.java index dce6c24f..11fddca1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/incentive/BpmOAIncentiveRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.incentive; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/leave/BpmOALeaveBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/leave/BpmOALeaveBaseVO.java index d2fe231f..01111bd5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/leave/BpmOALeaveBaseVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/leave/BpmOALeaveBaseVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeCreateReqVO.java index 4d09ce75..0ac7a398 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.overtime; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeRespVO.java index b24c21dc..d722cb26 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/overtime/BpmOAOvertimeRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.overtime; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java index 516a8a18..dc1d63c4 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java index 4c625998..80d5ad10 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePayRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePayRespVO.java index 1b4fbc3b..c12f7615 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePayRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePayRespVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procurepay; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -53,4 +53,4 @@ public class BpmOAProcurePayRespVO { private List items; -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePaySaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePaySaveReqVO.java index 99bac792..3e56b940 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePaySaveReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procurepay/BpmOAProcurePaySaveReqVO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procurepay; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import javax.validation.constraints.*; -import java.util.*; import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -49,4 +48,4 @@ public class BpmOAProcurePaySaveReqVO { @Schema(description = "采购支付子列表") List items; -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java index 5d2560ad..1ef6b506 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.regular; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java index c293e591..a2c20fd3 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.regular; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementCreateReqVO.java index 6e622c44..80110abc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementCreateReqVO.java @@ -1,5 +1,5 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementRespVO.java index c7135e35..e296c027 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/reimbursement/BpmOAReimbursementRespVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealCreateReqVO.java index 4cb05fb4..061fc680 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.seal; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealRespVO.java index 14bfb013..2d91e428 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/seal/BpmOASealRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.seal; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondCreateReqVO.java index b47753d9..a0f96e46 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondRespVO.java index a50bfd4f..18cb9400 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/second/BpmOASecondRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsCreateReqVO.java index 9091f729..59800c50 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsCreateReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.shiftjobs; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsRespVO.java index 63dbebe0..40d6e620 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/shiftjobs/BpmOAShiftjobsRespVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.shiftjobs; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierPageReqVO.java new file mode 100644 index 00000000..e2963d5c --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierPageReqVO.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - OA供应商审核分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BpmOASupplierPageReqVO extends PageParam { + + @Schema(description = "申请人的用户编号", example = "15417") + private Long userId; + + @Schema(description = "供应商id（如果编辑的话需要）", example = "28412") + private Long supplierId; + + @Schema(description = "供应商名称", example = "李四") + private String supplierName; + + @Schema(description = "联系方式(手机号)") + private String phone; + + @Schema(description = "联系人") + private String contactPerson; + + @Schema(description = "公司地址") + private String companyAddress; + + @Schema(description = "营业执照编号") + private String businessLicenseNo; + + @Schema(description = "结算日") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private String[] settlementDate; + + @Schema(description = "结算方式(字典值)") + private Integer settlementMethod; + + @Schema(description = "公司账号", example = "13787") + private String companyAccount; + + @Schema(description = "银行开户行") + private String bankAccountOpeningBank; + + @Schema(description = "附件信息") + private String fileItems; + + @Schema(description = "申请结果") + private Integer result; + + @Schema(description = "流程实例的编号", example = "13296") + private String processInstanceId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductPageReqVO.java new file mode 100644 index 00000000..0ad19771 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductPageReqVO.java @@ -0,0 +1,52 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - OA供应商商品分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BpmOASupplierProductPageReqVO extends PageParam { + + @Schema(description = "供应商OA流程id", example = "26994") + private Long oaSupplierId; + + @Schema(description = "供应商id", example = "18695") + private Long supplierId; + + @Schema(description = "供应商商品id（如果编辑的话需要）", example = "1033") + private Long supplierProductId; + + @Schema(description = "申请人的用户编号", example = "1033") + private Long userId; + + @Schema(description = "资产类型id", example = "8122") + private Long assetsTypeId; + + @Schema(description = "资产名称", example = "赵六") + private String assetsName; + + @Schema(description = "单位") + private String util; + + @Schema(description = "型号") + private String model; + + @Schema(description = "价格", example = "31309") + private BigDecimal price; + + @Schema(description = "备注") + private String remarks; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductRespVO.java new file mode 100644 index 00000000..c7490ccf --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductRespVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - OA供应商商品 Response VO") +@Data +public class BpmOASupplierProductRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "8546") + private Long id; + + @Schema(description = "供应商OA流程id", example = "26994") + private Long oaSupplierId; + + @Schema(description = "供应商id", example = "18695") + private Long supplierId; + + @Schema(description = "供应商商品id（如果编辑的话需要）", example = "1033") + private Long supplierProductId; + + @Schema(description = "申请人的用户编号", example = "1033") + private Long userId; + + @Schema(description = "资产类型id", example = "8122") + private Long assetsTypeId; + + @Schema(description = "资产名称", example = "赵六") + private String assetsName; + + @Schema(description = "单位") + private String util; + + @Schema(description = "型号") + private String model; + + @Schema(description = "价格", example = "31309") + private BigDecimal price; + + @Schema(description = "备注") + private String remarks; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductSaveReqVO.java new file mode 100644 index 00000000..a227f24a --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierProductSaveReqVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - OA供应商商品新增/修改 Request VO") +@Data +public class BpmOASupplierProductSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "8546") + private Long id; + + @Schema(description = "供应商OA流程id", example = "26994") + private Long oaSupplierId; + + @Schema(description = "供应商id", example = "18695") + private Long supplierId; + + @Schema(description = "供应商商品id（如果编辑的话需要）", example = "1033") + private Long supplierProductId; + + @Schema(description = "申请人的用户编号", example = "1033") + private Long userId; + + @Schema(description = "资产类型id", example = "8122") + private Long assetsTypeId; + + @Schema(description = "资产名称", example = "赵六") + private String assetsName; + + @Schema(description = "单位") + private String util; + + @Schema(description = "型号") + private String model; + + @Schema(description = "价格", example = "31309") + private BigDecimal price; + + @Schema(description = "备注") + private String remarks; + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierRespVO.java new file mode 100644 index 00000000..c4ef4601 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierRespVO.java @@ -0,0 +1,60 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - OA供应商审核 Response VO") +@Data +public class BpmOASupplierRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13431") + private Long id; + + @Schema(description = "申请人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15417") + private Long userId; + + @Schema(description = "供应商id（如果编辑的话需要）", example = "28412") + private Long supplierId; + + @Schema(description = "供应商名称", example = "李四") + private String supplierName; + + @Schema(description = "联系方式(手机号)") + private String phone; + + @Schema(description = "联系人") + private String contactPerson; + + @Schema(description = "公司地址") + private String companyAddress; + + @Schema(description = "营业执照编号") + private String businessLicenseNo; + + @Schema(description = "结算日") + private String settlementDate; + + @Schema(description = "结算方式(字典值)") + private Integer settlementMethod; + + @Schema(description = "公司账号", example = "13787") + private String companyAccount; + + @Schema(description = "银行开户行") + private String bankAccountOpeningBank; + + @Schema(description = "附件信息") + private String fileItems; + + @Schema(description = "申请结果", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer result; + + @Schema(description = "流程实例的编号", example = "13296") + private String processInstanceId; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierSaveReqVO.java new file mode 100644 index 00000000..fb04edd3 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/supplier/BpmOASupplierSaveReqVO.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier; + +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Schema(description = "管理后台 - OA供应商审核新增/修改 Request VO") +@Data +public class BpmOASupplierSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13431") + private Long id; + + @Schema(description = "申请人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15417") + @NotNull(message = "申请人的用户编号不能为空") + private Long userId; + + @Schema(description = "供应商id（如果编辑的话需要）", example = "28412") + private Long supplierId; + + @Schema(description = "供应商名称", example = "李四") + private String supplierName; + + @Schema(description = "联系方式(手机号)") + private String phone; + + @Schema(description = "联系人") + private String contactPerson; + + @Schema(description = "公司地址") + private String companyAddress; + + @Schema(description = "营业执照编号") + private String businessLicenseNo; + + @Schema(description = "结算日") + private String settlementDate; + + @Schema(description = "结算方式(字典值)") + private Integer settlementMethod; + + @Schema(description = "公司账号", example = "13787") + private String companyAccount; + + @Schema(description = "银行开户行") + private String bankAccountOpeningBank; + + @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED) + private List fileItems; + + @Schema(description = "申请结果", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "申请结果不能为空") + private Integer result; + + @Schema(description = "流程实例的编号", example = "13296") + private String processInstanceId; + + @Schema(description = "供应商商品表") + List items; +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/worktask/BpmOAWorkTaskReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/worktask/BpmOAWorkTaskReqVO.java index 06e6b059..a0fa5ab3 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/worktask/BpmOAWorkTaskReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/worktask/BpmOAWorkTaskReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.worktask; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOASupplierConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOASupplierConvert.java new file mode 100644 index 00000000..8d5520ec --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOASupplierConvert.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.bpm.convert.oa; + +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierSaveReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + * @author yj + */ +@Mapper +public interface BpmOASupplierConvert { + + BpmOASupplierConvert INSTANCE = Mappers.getMapper(BpmOASupplierConvert.class); + + BpmOASupplierDO convert(BpmOASupplierSaveReqVO createReqVO); +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOaSupplierProductConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOaSupplierProductConvert.java new file mode 100644 index 00000000..213e056a --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOaSupplierProductConvert.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.bpm.convert.oa; + +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductSaveReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierProductDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * + * @author yj + */ +@Mapper +public interface BpmOaSupplierProductConvert { + + BpmOaSupplierProductConvert INSTANCE = Mappers.getMapper(BpmOaSupplierProductConvert.class); + + List convert(List items); +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java index 727b247b..07c6bc4c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.financialpaymentitem; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java index 7aa48038..364024fc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAContractDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAContractDO.java index 73550777..3e191495 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAContractDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAContractDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEntryDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEntryDO.java index a66c70ff..01579769 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEntryDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEntryDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -99,4 +99,4 @@ public class BpmOAEntryDO extends BaseDO { */ private String processInstanceId; -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEvectionDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEvectionDO.java index 0858160b..10d2006d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEvectionDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAEvectionDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java index 1ca85355..b54342f1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAImprestDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAImprestDO.java index b15971bc..4a31cf4e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAImprestDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAImprestDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAIncentiveDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAIncentiveDO.java index fe26778d..98465800 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAIncentiveDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAIncentiveDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java index 55665777..585213bd 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -18,7 +18,7 @@ import java.util.List; * {@link #day} 请假天数，目前先简单做。一般是分成请假上午和下午，可以是 1 整天，可以是 0.5 半天 * * @author jason - + */ @TableName(value ="bpm_oa_leave", autoResultMap = true) @Data diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAOvertimeDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAOvertimeDO.java index 48d7f6bf..d8ebc506 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAOvertimeDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAOvertimeDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java index 7ea1120d..09c8ae58 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java @@ -2,14 +2,13 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.ProcureDetail; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.format.annotation.DateTimeFormat; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcurePayDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcurePayDO.java index f25e0e87..6bedaa32 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcurePayDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcurePayDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procurepay.BpmOAProcurePayItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -73,4 +73,4 @@ public class BpmOAProcurePayDO extends BaseDO { @Schema(description = "子列表", requiredMode = Schema.RequiredMode.REQUIRED) private List items; -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java index 7fc7d94c..12db2ee2 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAReimbursementDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAReimbursementDO.java index fe8741cc..77c31a75 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAReimbursementDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAReimbursementDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.Reimbursement; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.*; import java.math.BigDecimal; -import java.util.LinkedHashMap; import java.util.List; /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASealDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASealDO.java index 3ec5a34a..8e4680e7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASealDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASealDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASecondDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASecondDO.java index 9b0ab2d1..defce914 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASecondDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASecondDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second.Second; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAShiftjobsDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAShiftjobsDO.java index 50ec9d8c..dadabe96 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAShiftjobsDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAShiftjobsDO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierDO.java new file mode 100644 index 00000000..82582754 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierDO.java @@ -0,0 +1,84 @@ +package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; + +import lombok.*; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * OA供应商审核 DO + * + * @author 艾楷 + */ +@TableName("bpm_oa_supplier") +@KeySequence("bpm_oa_supplier_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BpmOASupplierDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 申请人的用户编号 + */ + private Long userId; + /** + * 供应商id（如果编辑的话需要） + */ + private Long supplierId; + /** + * 供应商名称 + */ + private String supplierName; + /** + * 联系方式(手机号) + */ + private String phone; + /** + * 联系人 + */ + private String contactPerson; + /** + * 公司地址 + */ + private String companyAddress; + /** + * 营业执照编号 + */ + private String businessLicenseNo; + /** + * 结算日 + */ + private String settlementDate; + /** + * 结算方式(字典值) + */ + private Integer settlementMethod; + /** + * 公司账号 + */ + private String companyAccount; + /** + * 银行开户行 + */ + private String bankAccountOpeningBank; + /** + * 附件信息 + */ + private String fileItems; + /** + * 申请结果 + */ + private Integer result; + /** + * 流程实例的编号 + */ + private String processInstanceId; + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProductDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProductDO.java new file mode 100644 index 00000000..b66f5292 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASupplierProductDO.java @@ -0,0 +1,71 @@ +package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; + +import lombok.*; + +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * OA供应商商品 DO + * + * @author 艾楷 + */ +@TableName("bpm_oa_supplier_product") +@KeySequence("bpm_oa_supplier_product_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BpmOASupplierProductDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 供应商OA流程id + */ + private Long oaSupplierId; + /** + * 供应商id + */ + private Long supplierId; + /** + * 供应商商品id（如果编辑的话需要） + */ + private Long supplierProductId; + /** + * 申请人的用户编号 + */ + private Long userId; + /** + * 资产类型id + */ + private Long assetsTypeId; + /** + * 资产名称 + */ + private String assetsName; + /** + * 单位 + */ + private String util; + /** + * 型号 + */ + private String model; + /** + * 价格 + */ + private BigDecimal price; + /** + * 备注 + */ + private String remarks; + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAWorkTaskDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAWorkTaskDO.java index c0f99ca6..d5841c59 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAWorkTaskDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAWorkTaskDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.worktask.BpmOAWorkTaskTrackInfo; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -17,7 +17,7 @@ import java.util.List; * OA 分配任务 DO * * @author 姚君 - + */ @TableName(value ="bpm_oa_work_task", autoResultMap = true) @Data diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierMapper.java new file mode 100644 index 00000000..c92951a2 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierMapper.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.module.bpm.dal.mysql.oa; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierPageReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * OA供应商审核 Mapper + * + * @author 艾楷 + */ +@Mapper +public interface BpmOASupplierMapper extends BaseMapperX { + + default PageResult selectPage(BpmOASupplierPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BpmOASupplierDO::getUserId, reqVO.getUserId()) + .eqIfPresent(BpmOASupplierDO::getSupplierId, reqVO.getSupplierId()) + .likeIfPresent(BpmOASupplierDO::getSupplierName, reqVO.getSupplierName()) + .eqIfPresent(BpmOASupplierDO::getPhone, reqVO.getPhone()) + .eqIfPresent(BpmOASupplierDO::getContactPerson, reqVO.getContactPerson()) + .eqIfPresent(BpmOASupplierDO::getCompanyAddress, reqVO.getCompanyAddress()) + .eqIfPresent(BpmOASupplierDO::getBusinessLicenseNo, reqVO.getBusinessLicenseNo()) + .betweenIfPresent(BpmOASupplierDO::getSettlementDate, reqVO.getSettlementDate()) + .eqIfPresent(BpmOASupplierDO::getSettlementMethod, reqVO.getSettlementMethod()) + .eqIfPresent(BpmOASupplierDO::getCompanyAccount, reqVO.getCompanyAccount()) + .eqIfPresent(BpmOASupplierDO::getBankAccountOpeningBank, reqVO.getBankAccountOpeningBank()) + .eqIfPresent(BpmOASupplierDO::getFileItems, reqVO.getFileItems()) + .eqIfPresent(BpmOASupplierDO::getResult, reqVO.getResult()) + .eqIfPresent(BpmOASupplierDO::getProcessInstanceId, reqVO.getProcessInstanceId()) + .betweenIfPresent(BpmOASupplierDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BpmOASupplierDO::getId)); + } + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierProductMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierProductMapper.java new file mode 100644 index 00000000..0d5a85e1 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOASupplierProductMapper.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.bpm.dal.mysql.oa; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductPageReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierProductDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * OA供应商商品 Mapper + * + * @author 艾楷 + */ +@Mapper +public interface BpmOASupplierProductMapper extends BaseMapperX { + + default PageResult selectPage(BpmOASupplierProductPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BpmOASupplierProductDO::getOaSupplierId, reqVO.getOaSupplierId()) + .eqIfPresent(BpmOASupplierProductDO::getSupplierId, reqVO.getSupplierId()) + .eqIfPresent(BpmOASupplierProductDO::getSupplierProductId, reqVO.getSupplierProductId()) + .eqIfPresent(BpmOASupplierProductDO::getAssetsTypeId, reqVO.getAssetsTypeId()) + .likeIfPresent(BpmOASupplierProductDO::getAssetsName, reqVO.getAssetsName()) + .eqIfPresent(BpmOASupplierProductDO::getUtil, reqVO.getUtil()) + .eqIfPresent(BpmOASupplierProductDO::getModel, reqVO.getModel()) + .eqIfPresent(BpmOASupplierProductDO::getPrice, reqVO.getPrice()) + .eqIfPresent(BpmOASupplierProductDO::getRemarks, reqVO.getRemarks()) + .betweenIfPresent(BpmOASupplierProductDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BpmOASupplierProductDO::getId)); + } + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java index b2bf9ca8..b55b4bba 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java @@ -14,13 +14,14 @@ import cn.iocoder.yudao.module.system.api.position.PositionApi; import cn.iocoder.yudao.module.system.api.sms.SmsSendApi; import cn.iocoder.yudao.module.system.api.social.SocialClientApi; import cn.iocoder.yudao.module.system.api.subscribe.SubscribeMessageSendApi; +import cn.iocoder.yudao.module.system.api.supplier.SupplierApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @EnableFeignClients(clients = {FileApi.class, RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class, NotifyMessageSendApi.class, - SubscribeMessageSendApi.class, SocialClientApi.class, UsersExtApi.class, AttendanceApi.class, BankApi.class, ConfigApi.class, PositionApi.class + SubscribeMessageSendApi.class, SocialClientApi.class, UsersExtApi.class, AttendanceApi.class, BankApi.class, ConfigApi.class, PositionApi.class, SupplierApi.class }) public class RpcConfiguration { } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOABaseService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOABaseService.java index c10f4eb8..ca5eb41c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOABaseService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOABaseService.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.bpm.service.oa; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.infra.api.file.FileApi; import cn.iocoder.yudao.module.infra.api.file.dto.FileCreateReqDTO; import org.springframework.stereotype.Service; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java index ae04497b..001f46f3 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash.BpmOACashCreateReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash.BpmOACashRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcureListEditReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOACashConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOACashDO; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractServiceImpl.java index 051c9706..7b47648d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.contract.BpmOAContractCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAContractConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAContractDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAContractMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java index 09a54b8e..0efc4b75 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.util.string.StrUtils; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry.BpmOAEntryCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAEntryConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEntryDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAEntryMapper; @@ -66,7 +66,7 @@ public class BpmOAEntryServiceImpl implements BpmOAEntryService{ @Resource private BpmHistoryProcessInstanceService historyProcessInstanceService; - + @Override @Transactional(rollbackFor = Exception.class) public Long createEntry(BpmOAEntryCreateReqVO createReqVO) { diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEvectionServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEvectionServiceImpl.java index 1e4d7d2e..61fe69a7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEvectionServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEvectionServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.bpm.service.oa; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection.BpmOAEvectionCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAEvectionConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEvectionDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAEvectionMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java index 01c9ba60..1f055dba 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.bpm.service.oa; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut.BpmOAGoOutCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAGoOutConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAGoOutDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAGoOutMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java index f7573818..3646140a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.imprest.BpmOAImprestCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAImprestConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAImprestDO; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAIncentiveServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAIncentiveServiceImpl.java index ecf27d1c..28bbe338 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAIncentiveServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAIncentiveServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.incentive.BpmOAIncentiveCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAIncentiveConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAIncentiveDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAIncentiveMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java index f406d027..0ff53636 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.BpmOALeaveCreateReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.BpmOALeavePageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOALeaveConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOALeaveMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAOvertimeServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAOvertimeServiceImpl.java index 3f663737..a930ba3e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAOvertimeServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAOvertimeServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.overtime.BpmOAOvertimeCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAOvertimeConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAOvertimeDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAOvertimeMapper; @@ -44,7 +44,7 @@ public class BpmOAOvertimeServiceImpl extends BpmOABaseService implements BpmOAO @Resource private BpmHistoryProcessInstanceService historyProcessInstanceService; - + @Override public Long createOvertime(Long userId, BpmOAOvertimeCreateReqVO createReqVO) { @@ -88,7 +88,7 @@ public class BpmOAOvertimeServiceImpl extends BpmOABaseService implements BpmOAO throw exception(OA_OVERTIME_NOT_EXISTS); } } - + @Override public BpmOAOvertimeDO getOvertime(Long id) { diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java index 90b67aef..a4b60282 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcurePayServiceImpl.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcureLi import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procurepay.BpmOAProcurePayItemRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procurepay.BpmOAProcurePayPageReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procurepay.BpmOAProcurePaySaveReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAProcurePayConvert; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAProcurePayItemConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcureServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcureServiceImpl.java index 6dceaf6d..e283bdff 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcureServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAProcureServiceImpl.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcureListEditReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcurePageReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcureSaveReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAProcureConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAProcureDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAProcureMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java index 5172b38b..9c25d532 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.bpm.service.oa; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.regular.BpmOARegularCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOARegularConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARegularDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOARegularMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java index 16e06852..d8cbacbb 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.BpmOARei import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.BpmOAReimbursementRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.Reimbursement; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.ReimbursementDTO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAReimbursementConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAImprestDO; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASealServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASealServiceImpl.java index 4967581d..e3252e17 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASealServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASealServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.bpm.service.oa; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.seal.BpmOASealCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOASealConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASealDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOASealMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASecondServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASecondServiceImpl.java index 91c672a9..0f639bf5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASecondServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASecondServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.bpm.service.oa; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second.BpmOASecondCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOASecondConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASecondDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOASecondMapper; @@ -87,7 +87,7 @@ public class BpmOASecondServiceImpl extends BpmOABaseService implements BpmOASec @Override public BpmOASecondDO getSecond(Long id) { - + return secondMapper.selectById(id); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAShiftjobsServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAShiftjobsServiceImpl.java index 96c9b7f1..88eaf3dc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAShiftjobsServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAShiftjobsServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.bpm.service.oa; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.shiftjobs.BpmOAShiftjobsCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAShiftjobsConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAShiftjobsDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAShiftjobsMapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierService.java new file mode 100644 index 00000000..fa4aec7c --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASupplierService.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.bpm.service.oa; + +import javax.validation.*; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierPageReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierSaveReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierDO; + +/** + * OA供应商审核 Service 接口 + * + * @author 艾楷 + */ +public interface BpmOASupplierService { + + /** + * 创建OA供应商审核 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createOaSupplier(@Valid BpmOASupplierSaveReqVO createReqVO); + + /** + * 更新OA供应商审核 + * + * @param updateReqVO 更新信息 + */ + void updateOaSupplier(@Valid BpmOASupplierSaveReqVO updateReqVO); + + /** + * 删除OA供应商审核 + * + * @param id 编号 + */ + void deleteOaSupplier(Long id); + + /** + * 获得OA供应商审核 + * + * @param id 编号 + * @return OA供应商审核 + */ + BpmOASupplierDO getOaSupplier(Long id); + + /** + * 获得OA供应商审核分页 + * + * @param pageReqVO 分页查询 + * @return OA供应商审核分页 + */ + PageResult getOaSupplierPage(BpmOASupplierPageReqVO pageReqVO); + + /** + * 更新工作任务的状态 + * + * @param processInstanceId 流程实例id + * @param id 编号 + * @param result 结果 + */ + void updateSupplierResult(String processInstanceId, Long id, Integer result); + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkTaskServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkTaskServiceImpl.java index d3f173a6..83cdcabc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkTaskServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkTaskServiceImpl.java @@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.worktask.BpmOAWorkTask import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.worktask.BpmOAWorkTaskReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.worktask.BpmOAWorkTaskRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.worktask.BpmOAWorkTaskTrackInfo; -import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAWorkTaskConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAWorkTaskDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductService.java new file mode 100644 index 00000000..83344e69 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.bpm.service.oa; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductPageReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductSaveReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierProductDO; + +import javax.validation.Valid; + +/** + * OA供应商商品 Service 接口 + * + * @author 艾楷 + */ +public interface BpmOaSupplierProductService { + + /** + * 创建OA供应商商品 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createOaSupplierProduct(@Valid BpmOASupplierProductSaveReqVO createReqVO); + + /** + * 更新OA供应商商品 + * + * @param updateReqVO 更新信息 + */ + void updateOaSupplierProduct(@Valid BpmOASupplierProductSaveReqVO updateReqVO); + + /** + * 删除OA供应商商品 + * + * @param id 编号 + */ + void deleteOaSupplierProduct(Long id); + + /** + * 获得OA供应商商品 + * + * @param id 编号 + * @return OA供应商商品 + */ + BpmOASupplierProductDO getOaSupplierProduct(Long id); + + /** + * 获得OA供应商商品分页 + * + * @param pageReqVO 分页查询 + * @return OA供应商商品分页 + */ + PageResult getOaSupplierProductPage(BpmOASupplierProductPageReqVO pageReqVO); + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductServiceImpl.java new file mode 100644 index 00000000..cf4b0fb5 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierProductServiceImpl.java @@ -0,0 +1,58 @@ +package cn.iocoder.yudao.module.bpm.service.oa; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductPageReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierProductSaveReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierProductDO; +import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOASupplierProductMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; + +/** + * OA供应商商品 Service 实现类 + * + * @author 艾楷 + */ +@Service +@Validated +public class BpmOaSupplierProductServiceImpl implements BpmOaSupplierProductService { + + @Resource + private BpmOASupplierProductMapper oaSupplierProductMapper; + + @Override + public Long createOaSupplierProduct(BpmOASupplierProductSaveReqVO createReqVO) { + // 插入 + BpmOASupplierProductDO oaSupplierProduct = BeanUtils.toBean(createReqVO, BpmOASupplierProductDO.class); + oaSupplierProductMapper.insert(oaSupplierProduct); + // 返回 + return oaSupplierProduct.getId(); + } + + @Override + public void updateOaSupplierProduct(BpmOASupplierProductSaveReqVO updateReqVO) { + // 更新 + BpmOASupplierProductDO updateObj = BeanUtils.toBean(updateReqVO, BpmOASupplierProductDO.class); + oaSupplierProductMapper.updateById(updateObj); + } + + @Override + public void deleteOaSupplierProduct(Long id) { + // 删除 + oaSupplierProductMapper.deleteById(id); + } + + @Override + public BpmOASupplierProductDO getOaSupplierProduct(Long id) { + return oaSupplierProductMapper.selectById(id); + } + + @Override + public PageResult getOaSupplierProductPage(BpmOASupplierProductPageReqVO pageReqVO) { + return oaSupplierProductMapper.selectPage(pageReqVO); + } + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierServiceImpl.java new file mode 100644 index 00000000..08a2a474 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOaSupplierServiceImpl.java @@ -0,0 +1,150 @@ +package cn.iocoder.yudao.module.bpm.service.oa; + +import cn.hutool.core.bean.BeanUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierPageReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.supplier.BpmOASupplierSaveReqVO; +import cn.iocoder.yudao.module.bpm.convert.oa.BpmOASupplierConvert; +import cn.iocoder.yudao.module.bpm.convert.oa.BpmOaSupplierProductConvert; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierDO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASupplierProductDO; +import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOASupplierMapper; +import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOASupplierProductMapper; +import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService; +import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.iocoder.yudao.module.system.api.supplier.SupplierApi; +import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierProductRpcDTO; +import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierRpcDTO; +import org.flowable.engine.runtime.ProcessInstance; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * OA供应商审核 Service 实现类 + * + * @author 艾楷 + */ +@Service +@Validated +public class BpmOaSupplierServiceImpl extends BpmOABaseService implements BpmOASupplierService { + + @Resource + private BpmOASupplierMapper oaSupplierMapper; + @Resource + private BpmOASupplierProductMapper oaSupplierProductMapper; + @Resource + private BpmProcessInstanceApi processInstanceApi; + @Resource + @Lazy // 解决循环依赖 + private BpmHistoryProcessInstanceService historyProcessInstanceService; + @Resource + private BpmProcessInstanceService processInstanceService; + @Resource + private SupplierApi supplierApi; + /** + * OA 现金支出对应的流程定义 KEY + */ + public static final String PROCESS_KEY = "oa_supplier"; + + @Override + public Long createOaSupplier(BpmOASupplierSaveReqVO createReqVO) { + Long userId = WebFrameworkUtils.getLoginUserId(); + createReqVO.setUserId(userId); + // 采购支付对象转换 + BpmOASupplierDO oaSupplier = BpmOASupplierConvert.INSTANCE.convert(createReqVO); + oaSupplierMapper.insert(oaSupplier); + + // 子列表转换 + List items = BpmOaSupplierProductConvert.INSTANCE.convert(createReqVO.getItems()); + for (BpmOASupplierProductDO item : items) { + item.setOaSupplierId(oaSupplier.getId()); + item.setUserId(userId); + } + oaSupplierProductMapper.insertBatch(items); + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + String processInstanceId = processInstanceApi.createProcessInstance(userId, + new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) + .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(oaSupplier.getId()))).getCheckedData(); + + // 将工作流的编号，更新到 OA 采购单中 + oaSupplierMapper.updateById(new BpmOASupplierDO().setId(oaSupplier.getId()).setProcessInstanceId(processInstanceId)); + + // 判断是否为重新发起的流程 + if (createReqVO.getProcessInstanceId() != null && createReqVO.getResult() == 3) { + historyProcessInstanceService.createHistoryProcessInstance(processInstanceId, createReqVO.getProcessInstanceId()); + } + + List fileItems = createReqVO.getFileItems(); + //这里的逻辑，如果fileItems不为空，且有数据，那么说明是上传了附件的，则需要更工作流文件表对应的实例Id + if (fileItems != null && !fileItems.isEmpty()) { + uploadBpmFileProcessInstanceId(processInstanceId, fileItems); + } + // 返回 + return oaSupplier.getId(); + } + + @Override + public void updateOaSupplier(BpmOASupplierSaveReqVO updateReqVO) { + // 更新 + BpmOASupplierDO updateObj = BeanUtils.toBean(updateReqVO, BpmOASupplierDO.class); + oaSupplierMapper.updateById(updateObj); + } + + @Override + public void deleteOaSupplier(Long id) { + // 删除 + oaSupplierMapper.deleteById(id); + } + + @Override + public BpmOASupplierDO getOaSupplier(Long id) { + return oaSupplierMapper.selectById(id); + } + + @Override + public PageResult getOaSupplierPage(BpmOASupplierPageReqVO pageReqVO) { + return oaSupplierMapper.selectPage(pageReqVO); + } + + @Override + public void updateSupplierResult(String processInstanceId, Long id, Integer result) { + //审核通过 （最后节点） + if (BpmProcessInstanceResultEnum.APPROVE.getResult().equals(result)) { + ProcessInstance instance = processInstanceService.getProcessInstance(processInstanceId); + if (instance.isEnded()) { + // -- 获取到供应商和商品的信息 - 插入到具体到业务表中 + BpmOASupplierDO bpmOASupplierDO = oaSupplierMapper.selectById(id); + List bpmOASupplierProductDOList = oaSupplierProductMapper.selectList(BpmOASupplierProductDO::getOaSupplierId, id); + SupplierRpcDTO supplierRpcDTO = BeanUtil.copyProperties(bpmOASupplierDO, SupplierRpcDTO.class); + supplierRpcDTO.setId(bpmOASupplierDO.getSupplierId()); + List item = new ArrayList<>(); + if (!bpmOASupplierProductDOList.isEmpty()) { + for (BpmOASupplierProductDO bpmOASupplierProductDO : bpmOASupplierProductDOList) { + SupplierProductRpcDTO supplierProductRpcDTO = BeanUtil.copyProperties(bpmOASupplierProductDO, SupplierProductRpcDTO.class); + supplierProductRpcDTO.setSupplierId(supplierRpcDTO.getId()); + supplierProductRpcDTO.setId(bpmOASupplierProductDO.getSupplierProductId()); + item.add(supplierProductRpcDTO); + } + } + supplierRpcDTO.setItems(item); + supplierApi.saveOrEdit(supplierRpcDTO); + } + } + oaSupplierMapper.updateById(new BpmOASupplierDO().setId(id).setResult(result).setProcessInstanceId(processInstanceId)); + } + +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOASupplierResultListener.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOASupplierResultListener.java new file mode 100644 index 00000000..98c3ef3e --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOASupplierResultListener.java @@ -0,0 +1,31 @@ +package cn.iocoder.yudao.module.bpm.service.oa.listener; + +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent; +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOASupplierService; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOaSupplierServiceImpl; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * OA 合同审批单的结果的监听器实现类 + * + * @author 符溶馨 + */ +@Component +public class BpmOASupplierResultListener extends BpmProcessInstanceResultEventListener { + + @Resource + private BpmOASupplierService supplierService; + + @Override + protected String getProcessDefinitionKey() { + return BpmOaSupplierServiceImpl.PROCESS_KEY; + } + + @Override + protected void onEvent(BpmProcessInstanceResultEvent event) { + supplierService.updateSupplierResult(event.getId(), Long.parseLong(event.getBusinessKey()), event.getResult()); + } +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierMapper.xml new file mode 100644 index 00000000..80ab857c --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierProductMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierProductMapper.xml new file mode 100644 index 00000000..38e49349 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOASupplierProductMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java new file mode 100644 index 00000000..11a54b57 --- /dev/null +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApi.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.system.api.supplier; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.system.api.subscribe.dto.SubscribeMessageReqDTO; +import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierRpcDTO; +import cn.iocoder.yudao.module.system.enums.ApiConstants; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = +@Tag(name = "RPC 服务 - 供应商新增编辑") +public interface SupplierApi { + + String PREFIX = ApiConstants.PREFIX + "/supplier"; + + @PostMapping(PREFIX + "/saveOrEdit") + @Operation(summary = "新增编辑供应商") + CommonResult saveOrEdit(@RequestBody SupplierRpcDTO supplier); + +} diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierProductRpcDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierProductRpcDTO.java new file mode 100644 index 00000000..c5d2992f --- /dev/null +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierProductRpcDTO.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.system.api.supplier.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - OA供应商商品新增/修改 Request VO") +@Data +public class SupplierProductRpcDTO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6113") + private Long id; + + @Schema(description = "供应商id", example = "19964") + private Long supplierId; + + @Schema(description = "资产类型id", example = "1358") + private Long assetsTypeId; + + @Schema(description = "资产名称", example = "赵六") + private String assetsName; + + @Schema(description = "单位") + private String util; + + @Schema(description = "型号") + private String model; + + @Schema(description = "价格", example = "23614") + private BigDecimal price; + + @Schema(description = "备注") + private String remarks; + +} diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierRpcDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierRpcDTO.java new file mode 100644 index 00000000..98b4f37a --- /dev/null +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/supplier/dto/SupplierRpcDTO.java @@ -0,0 +1,56 @@ +package cn.iocoder.yudao.module.system.api.supplier.dto; + +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Schema(description = "管理后台 - 供应商列表(OA已审核通过后插入)新增/修改 Request VO") +@Data +public class SupplierRpcDTO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17010") + private Long id; + + @Schema(description = "供应商名称", example = "赵六") + private String supplierName; + + @Schema(description = "联系方式(手机号)") + private String phone; + + @Schema(description = "联系人") + private String contactPerson; + + @Schema(description = "公司地址") + private String companyAddress; + + @Schema(description = "营业执照编号") + private String businessLicenseNo; + + @Schema(description = "结算日") + private String settlementDate; + + @Schema(description = "结算方式(字典值)") + private Integer settlementMethod; + + @Schema(description = "公司账号(银行卡号)", example = "7431") + private String companyAccount; + + @Schema(description = "银行开户行") + private String bankAccountOpeningBank; + + @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED) + private List fileItems; + + @Schema(description = "申请结果", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "申请结果不能为空") + private Integer result; + + @Schema(description = "流程实例的编号", example = "13296") + private String processInstanceId; + + @Schema(description = "供应商商品表") + List items; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java new file mode 100644 index 00000000..aaec46de --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/supplier/SupplierApiImpl.java @@ -0,0 +1,26 @@ +package cn.iocoder.yudao.module.system.api.supplier; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierRpcDTO; +import cn.iocoder.yudao.module.system.service.supplier.SupplierService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@RestController // 提供 RESTful API 接口，给 Feign 调用 +@Validated +public class SupplierApiImpl implements SupplierApi { + + @Resource + private SupplierService supplierService; + + + @Override + public CommonResult saveOrEdit(SupplierRpcDTO supplier) { + supplierService.saveOrEdit(supplier); + return success(true); + } +} 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 new file mode 100644 index 00000000..269bf57b --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/SupplierController.java @@ -0,0 +1,95 @@ +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.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.dal.dataobject.supplier.SupplierDO; +import cn.iocoder.yudao.module.system.service.supplier.SupplierService; + +@Tag(name = "管理后台 - 供应商列表(OA已审核通过后插入)") +@RestController +@RequestMapping("/system/supplier") +@Validated +public class SupplierController { + + @Resource + private SupplierService supplierService; + + @PostMapping("/create") + @Operation(summary = "创建供应商列表(OA已审核通过后插入)") + @PreAuthorize("@ss.hasPermission('system:supplier:create')") + public CommonResult createSupplier(@Valid @RequestBody SupplierSaveReqVO createReqVO) { + return success(supplierService.createSupplier(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新供应商列表(OA已审核通过后插入)") + @PreAuthorize("@ss.hasPermission('system:supplier:update')") + public CommonResult updateSupplier(@Valid @RequestBody SupplierSaveReqVO updateReqVO) { + supplierService.updateSupplier(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除供应商列表(OA已审核通过后插入)") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('system:supplier:delete')") + public CommonResult deleteSupplier(@RequestParam("id") Long id) { + supplierService.deleteSupplier(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得供应商列表(OA已审核通过后插入)") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @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)); + } + + @GetMapping("/page") + @Operation(summary = "获得供应商列表(OA已审核通过后插入)分页") + @PreAuthorize("@ss.hasPermission('system:supplier:query')") + public CommonResult> getSupplierPage(@Valid SupplierPageReqVO pageReqVO) { + PageResult pageResult = supplierService.getSupplierPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, SupplierRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出供应商列表(OA已审核通过后插入) Excel") + @PreAuthorize("@ss.hasPermission('system:supplier:export')") + @OperateLog(type = EXPORT) + public void exportSupplierExcel(@Valid SupplierPageReqVO pageReqVO, + 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)); + } + +} \ 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 new file mode 100644 index 00000000..3973b255 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierPageReqVO.java @@ -0,0 +1,53 @@ +package cn.iocoder.yudao.module.system.controller.admin.supplier.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 供应商列表(OA已审核通过后插入)分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class SupplierPageReqVO extends PageParam { + + @Schema(description = "供应商名称", example = "赵六") + private String supplierName; + + @Schema(description = "联系方式(手机号)") + private String phone; + + @Schema(description = "联系人") + private String contactPerson; + + @Schema(description = "公司地址") + private String companyAddress; + + @Schema(description = "营业执照编号") + private String businessLicenseNo; + + @Schema(description = "结算日") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private String[] settlementDate; + + @Schema(description = "结算方式(字典值)") + private Integer settlementMethod; + + @Schema(description = "公司账号(银行卡号)", example = "7431") + private String companyAccount; + + @Schema(description = "银行开户行") + private String bankAccountOpeningBank; + + @Schema(description = "附件信息") + private String fileItems; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ 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/SupplierProductPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductPageReqVO.java new file mode 100644 index 00000000..41457dbf --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductPageReqVO.java @@ -0,0 +1,44 @@ +package cn.iocoder.yudao.module.system.controller.admin.supplier.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 供应商商品分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class SupplierProductPageReqVO extends PageParam { + + @Schema(description = "供应商id", example = "19964") + private Long supplierId; + + @Schema(description = "资产类型id", example = "1358") + private Long assetsTypeId; + + @Schema(description = "资产名称", example = "赵六") + private String assetsName; + + @Schema(description = "单位") + private String util; + + @Schema(description = "型号") + private String model; + + @Schema(description = "价格", example = "23614") + private BigDecimal price; + + @Schema(description = "备注") + private String remarks; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductRespVO.java new file mode 100644 index 00000000..0d82ba5f --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductRespVO.java @@ -0,0 +1,53 @@ +package cn.iocoder.yudao.module.system.controller.admin.supplier.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 供应商商品 Response VO") +@Data +@ExcelIgnoreUnannotated +public class SupplierProductRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6113") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "供应商id", example = "19964") + @ExcelProperty("供应商id") + private Long supplierId; + + @Schema(description = "资产类型id", example = "1358") + @ExcelProperty("资产类型id") + private Long assetsTypeId; + + @Schema(description = "资产名称", example = "赵六") + @ExcelProperty("资产名称") + private String assetsName; + + @Schema(description = "单位") + @ExcelProperty("单位") + private String util; + + @Schema(description = "型号") + @ExcelProperty("型号") + private String model; + + @Schema(description = "价格", example = "23614") + @ExcelProperty("价格") + private BigDecimal price; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remarks; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductSaveReqVO.java new file mode 100644 index 00000000..e6ce8042 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierProductSaveReqVO.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.module.system.controller.admin.supplier.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 供应商商品新增/修改 Request VO") +@Data +public class SupplierProductSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6113") + private Long id; + + @Schema(description = "供应商id", example = "19964") + private Long supplierId; + + @Schema(description = "资产类型id", example = "1358") + private Long assetsTypeId; + + @Schema(description = "资产名称", example = "赵六") + private String assetsName; + + @Schema(description = "单位") + private String util; + + @Schema(description = "型号") + private String model; + + @Schema(description = "价格", example = "23614") + private BigDecimal price; + + @Schema(description = "备注") + private String remarks; + +} 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 new file mode 100644 index 00000000..92ce51e6 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierRespVO.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.system.controller.admin.supplier.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 供应商列表(OA已审核通过后插入) Response VO") +@Data +@ExcelIgnoreUnannotated +public class SupplierRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17010") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "供应商名称", example = "赵六") + @ExcelProperty("供应商名称") + private String supplierName; + + @Schema(description = "联系方式(手机号)") + @ExcelProperty("联系方式(手机号)") + private String phone; + + @Schema(description = "联系人") + @ExcelProperty("联系人") + private String contactPerson; + + @Schema(description = "公司地址") + @ExcelProperty("公司地址") + private String companyAddress; + + @Schema(description = "营业执照编号") + @ExcelProperty("营业执照编号") + private String businessLicenseNo; + + @Schema(description = "结算日") + @ExcelProperty("结算日") + private String settlementDate; + + @Schema(description = "结算方式(字典值)") + @ExcelProperty("结算方式(字典值)") + private Integer settlementMethod; + + @Schema(description = "公司账号(银行卡号)", example = "7431") + @ExcelProperty("公司账号(银行卡号)") + private String companyAccount; + + @Schema(description = "银行开户行") + @ExcelProperty("银行开户行") + private String bankAccountOpeningBank; + + @Schema(description = "附件信息") + @ExcelProperty("附件信息") + private String fileItems; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ 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/SupplierSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java new file mode 100644 index 00000000..1cad7e5f --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supplier/vo/SupplierSaveReqVO.java @@ -0,0 +1,46 @@ +package cn.iocoder.yudao.module.system.controller.admin.supplier.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; + +@Schema(description = "管理后台 - 供应商列表(OA已审核通过后插入)新增/修改 Request VO") +@Data +public class SupplierSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17010") + private Long id; + + @Schema(description = "供应商名称", example = "赵六") + private String supplierName; + + @Schema(description = "联系方式(手机号)") + private String phone; + + @Schema(description = "联系人") + private String contactPerson; + + @Schema(description = "公司地址") + private String companyAddress; + + @Schema(description = "营业执照编号") + private String businessLicenseNo; + + @Schema(description = "结算日") + private String settlementDate; + + @Schema(description = "结算方式(字典值)") + private Integer settlementMethod; + + @Schema(description = "公司账号(银行卡号)", example = "7431") + private String companyAccount; + + @Schema(description = "银行开户行") + private String bankAccountOpeningBank; + + @Schema(description = "附件信息") + private String fileItems; + +} \ No newline at end of file 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 new file mode 100644 index 00000000..b368687c --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierDO.java @@ -0,0 +1,76 @@ +package cn.iocoder.yudao.module.system.dal.dataobject.supplier; + +import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import lombok.*; + +import java.util.List; + +/** + * 供应商列表(OA已审核通过后插入) DO + * + * @author 艾楷 + */ +@TableName(value = "zc_supplier", autoResultMap = true) +@KeySequence("zc_supplier_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SupplierDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 供应商名称 + */ + private String supplierName; + /** + * 联系方式(手机号) + */ + private String phone; + /** + * 联系人 + */ + private String contactPerson; + /** + * 公司地址 + */ + private String companyAddress; + /** + * 营业执照编号 + */ + private String businessLicenseNo; + /** + * 结算日 + */ + private String settlementDate; + /** + * 结算方式(字典值) + */ + private Integer settlementMethod; + /** + * 公司账号(银行卡号) + */ + private String companyAccount; + /** + * 银行开户行 + */ + private String bankAccountOpeningBank; + /** + * 附件信息 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private List fileItems; + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierProductDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierProductDO.java new file mode 100644 index 00000000..1b2a47d2 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supplier/SupplierProductDO.java @@ -0,0 +1,60 @@ +package cn.iocoder.yudao.module.system.dal.dataobject.supplier; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 供应商商品 DO + * + * @author 艾楷 + */ +@TableName("zc_supplier_product") +@KeySequence("zc_supplier_product_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SupplierProductDO extends BaseDO { + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 供应商id + */ + private Long supplierId; + /** + * 资产类型id + */ + private Long assetsTypeId; + /** + * 资产名称 + */ + private String assetsName; + /** + * 单位 + */ + private String util; + /** + * 型号 + */ + private String model; + /** + * 价格 + */ + private BigDecimal price; + /** + * 备注 + */ + private String remarks; + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierMapper.java new file mode 100644 index 00000000..f7c9151b --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierMapper.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.system.dal.mysql.supplier; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.*; + +/** + * 供应商列表(OA已审核通过后插入) Mapper + * + * @author 艾楷 + */ +@Mapper +public interface SupplierMapper extends BaseMapperX { + + default PageResult selectPage(SupplierPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(SupplierDO::getSupplierName, reqVO.getSupplierName()) + .eqIfPresent(SupplierDO::getPhone, reqVO.getPhone()) + .eqIfPresent(SupplierDO::getContactPerson, reqVO.getContactPerson()) + .eqIfPresent(SupplierDO::getCompanyAddress, reqVO.getCompanyAddress()) + .eqIfPresent(SupplierDO::getBusinessLicenseNo, reqVO.getBusinessLicenseNo()) + .betweenIfPresent(SupplierDO::getSettlementDate, reqVO.getSettlementDate()) + .eqIfPresent(SupplierDO::getSettlementMethod, reqVO.getSettlementMethod()) + .eqIfPresent(SupplierDO::getCompanyAccount, reqVO.getCompanyAccount()) + .eqIfPresent(SupplierDO::getBankAccountOpeningBank, reqVO.getBankAccountOpeningBank()) + .eqIfPresent(SupplierDO::getFileItems, reqVO.getFileItems()) + .betweenIfPresent(SupplierDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(SupplierDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierProductMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierProductMapper.java new file mode 100644 index 00000000..aefa7a89 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supplier/SupplierProductMapper.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.system.dal.mysql.supplier; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierProductDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.*; + +/** + * 供应商商品 Mapper + * + * @author 艾楷 + */ +@Mapper +public interface SupplierProductMapper extends BaseMapperX { + + default PageResult selectPage(SupplierProductPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(SupplierProductDO::getSupplierId, reqVO.getSupplierId()) + .eqIfPresent(SupplierProductDO::getAssetsTypeId, reqVO.getAssetsTypeId()) + .likeIfPresent(SupplierProductDO::getAssetsName, reqVO.getAssetsName()) + .eqIfPresent(SupplierProductDO::getUtil, reqVO.getUtil()) + .eqIfPresent(SupplierProductDO::getModel, reqVO.getModel()) + .eqIfPresent(SupplierProductDO::getPrice, reqVO.getPrice()) + .eqIfPresent(SupplierProductDO::getRemarks, reqVO.getRemarks()) + .betweenIfPresent(SupplierProductDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(SupplierProductDO::getId)); + } + +} 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 new file mode 100644 index 00000000..c82d48c1 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.system.service.supplier; + +import java.util.*; +import javax.validation.*; +import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierProductDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 供应商商品 Service 接口 + * + * @author 艾楷 + */ +public interface SupplierProductService { + + /** + * 创建供应商商品 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createSupplierProduct(@Valid SupplierProductSaveReqVO createReqVO); + + /** + * 更新供应商商品 + * + * @param updateReqVO 更新信息 + */ + void updateSupplierProduct(@Valid SupplierProductSaveReqVO updateReqVO); + + /** + * 删除供应商商品 + * + * @param id 编号 + */ + void deleteSupplierProduct(Long id); + + /** + * 获得供应商商品 + * + * @param id 编号 + * @return 供应商商品 + */ + SupplierProductDO getSupplierProduct(Long id); + + /** + * 获得供应商商品分页 + * + * @param pageReqVO 分页查询 + * @return 供应商商品分页 + */ + PageResult getSupplierProductPage(SupplierProductPageReqVO pageReqVO); + +} 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 new file mode 100644 index 00000000..ae78a6d3 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierProductServiceImpl.java @@ -0,0 +1,58 @@ +package cn.iocoder.yudao.module.system.service.supplier; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierProductPageReqVO; +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 org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; + +/** + * 供应商商品 Service 实现类 + * + * @author 艾楷 + */ +@Service +@Validated +public class SupplierProductServiceImpl implements SupplierProductService { + + @Resource + private SupplierProductMapper supplierProductMapper; + + @Override + public Long createSupplierProduct(SupplierProductSaveReqVO createReqVO) { + // 插入 + SupplierProductDO supplierProduct = BeanUtils.toBean(createReqVO, SupplierProductDO.class); + supplierProductMapper.insert(supplierProduct); + // 返回 + return supplierProduct.getId(); + } + + @Override + public void updateSupplierProduct(SupplierProductSaveReqVO updateReqVO) { + // 更新 + SupplierProductDO updateObj = BeanUtils.toBean(updateReqVO, SupplierProductDO.class); + supplierProductMapper.updateById(updateObj); + } + + @Override + public void deleteSupplierProduct(Long id) { + // 删除 + supplierProductMapper.deleteById(id); + } + + @Override + public SupplierProductDO getSupplierProduct(Long id) { + return supplierProductMapper.selectById(id); + } + + @Override + public PageResult getSupplierProductPage(SupplierProductPageReqVO pageReqVO) { + return supplierProductMapper.selectPage(pageReqVO); + } + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierService.java new file mode 100644 index 00000000..069ebc3a --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierService.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.system.service.supplier; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierRpcDTO; +import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierSaveReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.supplier.SupplierDO; + +import javax.validation.Valid; + +/** + * 供应商列表(OA已审核通过后插入) Service 接口 + * + * @author 艾楷 + */ +public interface SupplierService { + + /** + * 创建供应商列表(OA已审核通过后插入) + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createSupplier(@Valid SupplierSaveReqVO createReqVO); + + /** + * 更新供应商列表(OA已审核通过后插入) + * + * @param updateReqVO 更新信息 + */ + void updateSupplier(@Valid SupplierSaveReqVO updateReqVO); + + /** + * 删除供应商列表(OA已审核通过后插入) + * + * @param id 编号 + */ + void deleteSupplier(Long id); + + /** + * 获得供应商列表(OA已审核通过后插入) + * + * @param id 编号 + * @return 供应商列表(OA已审核通过后插入) + */ + SupplierDO getSupplier(Long id); + + /** + * 获得供应商列表(OA已审核通过后插入)分页 + * + * @param pageReqVO 分页查询 + * @return 供应商列表(OA已审核通过后插入)分页 + */ + PageResult getSupplierPage(SupplierPageReqVO pageReqVO); + + /** + * 新增编辑供应商信息 + * + * @param supplier + */ + void saveOrEdit(SupplierRpcDTO supplier); +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierServiceImpl.java new file mode 100644 index 00000000..dbb416b6 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supplier/SupplierServiceImpl.java @@ -0,0 +1,99 @@ +package cn.iocoder.yudao.module.system.service.supplier; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.system.api.supplier.dto.SupplierRpcDTO; +import cn.iocoder.yudao.module.system.controller.admin.supplier.vo.SupplierPageReqVO; +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.dal.mysql.supplier.SupplierMapper; +import cn.iocoder.yudao.module.system.dal.mysql.supplier.SupplierProductMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 供应商列表(OA已审核通过后插入) Service 实现类 + * + * @author 艾楷 + */ +@Service +@Validated +public class SupplierServiceImpl implements SupplierService { + + @Resource + private SupplierMapper supplierMapper; + @Resource + private SupplierProductMapper supplierProductMapper; + + @Override + public Long createSupplier(SupplierSaveReqVO createReqVO) { + // 插入 + SupplierDO supplier = BeanUtils.toBean(createReqVO, SupplierDO.class); + supplierMapper.insert(supplier); + // 返回 + return supplier.getId(); + } + + @Override + public void updateSupplier(SupplierSaveReqVO updateReqVO) { + // 更新 + SupplierDO updateObj = BeanUtils.toBean(updateReqVO, SupplierDO.class); + supplierMapper.updateById(updateObj); + } + + @Override + public void deleteSupplier(Long id) { + // 删除 + supplierMapper.deleteById(id); + } + + @Override + public SupplierDO getSupplier(Long id) { + return supplierMapper.selectById(id); + } + + @Override + public PageResult getSupplierPage(SupplierPageReqVO pageReqVO) { + return supplierMapper.selectPage(pageReqVO); + } + + @Override + public void saveOrEdit(SupplierRpcDTO supplier) { + // 新增操作 + SupplierDO supplierDO = BeanUtil.copyProperties(supplier, SupplierDO.class); + List products = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(supplier.getItems())) { + products = BeanUtil.copyToList(supplier.getItems(), SupplierProductDO.class); + } + if (supplier.getId() == null) { + supplierMapper.insert(supplierDO); + if (CollectionUtil.isNotEmpty(products)) { + supplierProductMapper.insertBatch(products); + } + } else { + supplierMapper.updateById(supplierDO); + // -- 操作子表 + if (CollectionUtil.isNotEmpty(products)) { + List saveList = products.stream().filter(a -> a.getId() == null).collect(Collectors.toList()); + List editList = products.stream().filter(a -> a.getId() != null).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(saveList)) { + for (SupplierProductDO supplierProductDO : saveList) { + supplierProductDO.setSupplierId(supplierDO.getId()); + } + supplierProductMapper.insertBatch(saveList); + } + if (CollectionUtil.isNotEmpty(editList)) { + supplierProductMapper.updateBatch(editList); + } + } + } + } +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierMapper.xml new file mode 100644 index 00000000..b545a1c6 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierProductMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierProductMapper.xml new file mode 100644 index 00000000..d0fa54e6 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/supplier/SupplierProductMapper.xml @@ -0,0 +1,12 @@ + + + + + + +