From 55e0897633ae98ecd0b40c0c17d106df31811905 Mon Sep 17 00:00:00 2001 From: Agoni <1909624613@qq.com> Date: Thu, 31 Aug 2023 17:00:41 +0800 Subject: [PATCH] =?UTF-8?q?-=E6=8A=A5=E4=BB=B7=E4=B8=AD=E6=A0=87=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=91=E8=B5=B7=EF=BC=8C=E4=B8=AD=E6=A0=87=E5=9B=9E?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuotationSheetController.java | 2 +- .../vo/QuotationSheetBaseVO.java | 4 +- .../vo/QuotationSheetExcelVO.java | 2 + .../vo/QuotationSheetExportReqVO.java | 2 +- .../vo/QuotationSheetPageReqVO.java | 2 + .../vo/QuotationSheetRespVO.java | 2 + .../vo/QuotationSheetUpdateReqVO.java | 9 +++ .../QuotationSheetBiddingController.java | 10 ++-- .../vo/QuotationSheetBiddingBaseVO.java | 2 +- .../vo/QuotationSheetBiddingCreateReqVO.java | 4 +- .../vo/QuotationSheetBiddingExcelVO.java | 2 +- .../vo/QuotationSheetBiddingExportReqVO.java | 2 +- .../vo/QuotationSheetBiddingPageReqVO.java | 2 +- .../vo/QuotationSheetBiddingRespVO.java | 2 +- .../vo/QuotationSheetBiddingUpdateReqVO.java | 4 +- .../QuotationSheetBiddingConvert.java | 7 ++- .../QuotationSheetBiddingMapper.java | 3 +- .../QuotationSheetBiddingResultListener.java | 30 ++++++++++ .../quotationsheet/QuotationSheetService.java | 15 ++++- .../QuotationSheetServiceImpl.java | 58 ++++++++++++++++++- .../QuotationSheetBiddingService.java | 9 ++- .../QuotationSheetBiddingServiceImpl.java | 9 ++- .../bs/enums/QuotationSheetBiddingEnum.java | 31 ++++++++++ .../quotationsheet/QuotationSheetDO.java | 8 ++- 24 files changed, 185 insertions(+), 36 deletions(-) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/QuotationSheetBiddingController.java (92%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingBaseVO.java (96%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingCreateReqVO.java (69%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExcelVO.java (95%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExportReqVO.java (96%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingPageReqVO.java (96%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingRespVO.java (87%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingUpdateReqVO.java (83%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/convert/quotationsheetbidding/QuotationSheetBiddingConvert.java (66%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/dal/mysql/quotationsheetbidding/QuotationSheetBiddingMapper.java (96%) create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/QuotationSheetBiddingResultListener.java rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/service/quotationsheetbidding/QuotationSheetBiddingService.java (78%) rename {yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs => yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm}/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java (89%) create mode 100644 yudao-module-bs/yudao-module-bs-api/src/main/java/cn/iocoder/yudao/module/bs/enums/QuotationSheetBiddingEnum.java diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/QuotationSheetController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/QuotationSheetController.java index ee3cd3f0..f017d5b3 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/QuotationSheetController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/QuotationSheetController.java @@ -144,7 +144,7 @@ public class QuotationSheetController { @PostMapping("/approvalBidding") @Operation(summary = "中标审批发起接口") // @PreAuthorize("@ss.hasPermission('bs:quotation-sheet:approvalBidding')") - public CommonResult approvalBidding(QuotationSheetPageReqVO pageVO) { + public CommonResult approvalBidding(QuotationSheetUpdateReqVO pageVO) { return success(quotationSheetService.approvalBidding(pageVO)); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetBaseVO.java index 62130c0a..82ed39f9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetBaseVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetBaseVO.java @@ -98,8 +98,6 @@ public class QuotationSheetBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime applyTime; - - @Schema(description = "申请人") private Long applicant; @@ -109,4 +107,6 @@ public class QuotationSheetBaseVO { @Schema(description = "采购预算") private String money; + private String processId; + } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExcelVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExcelVO.java index 4b771b39..6db845ab 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExcelVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExcelVO.java @@ -108,4 +108,6 @@ public class QuotationSheetExcelVO { @Schema(description = "采购预算") private String money; + private String processId; + } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExportReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExportReqVO.java index b3dca342..5ab04c81 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExportReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetExportReqVO.java @@ -97,7 +97,7 @@ public class QuotationSheetExportReqVO { @Schema(description = "申请人") private Long applicant; - + private String processId; @Schema(description = "申请人部门id", example = "10907") private Long deptId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetPageReqVO.java index bd14a8ae..d46cacd1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetPageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetPageReqVO.java @@ -116,4 +116,6 @@ public class QuotationSheetPageReqVO extends PageParam { @Schema(description = "供应商中标id集合发起审批的时候添加此参数") private List approvalBiddingIdList; + private String processId; + } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetRespVO.java index b0dd9319..59f71032 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetRespVO.java @@ -65,4 +65,6 @@ public class QuotationSheetRespVO extends QuotationSheetBaseVO { */ private Long tenantId; private String tenantName; + + private String processId; } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetUpdateReqVO.java index 4ccd0d8c..a5cdae0c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetUpdateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheet/vo/QuotationSheetUpdateReqVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheet.vo; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingBaseVO; +import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO; import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetdetail.QuotationSheetDetailDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -22,7 +24,14 @@ public class QuotationSheetUpdateReqVO extends QuotationSheetBaseVO { @NotEmpty(message = "物料不能为空") private List quotationDetails; + /** + * 审批单 + */ + // @NotEmpty(message = "物料不能为空") + private List quotationSheetBiddingDOList; @Schema(description = "是否中标") private Integer isWin; + + private String processId; } diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/QuotationSheetBiddingController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/QuotationSheetBiddingController.java similarity index 92% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/QuotationSheetBiddingController.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/QuotationSheetBiddingController.java index b418e79f..e48459fc 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/QuotationSheetBiddingController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/QuotationSheetBiddingController.java @@ -1,5 +1,6 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -8,7 +9,6 @@ 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.*; @@ -23,10 +23,10 @@ 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.bs.controller.admin.quotationsheetbidding.vo.*; + import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO; -import cn.iocoder.yudao.module.bs.convert.quotationsheetbidding.QuotationSheetBiddingConvert; -import cn.iocoder.yudao.module.bs.service.quotationsheetbidding.QuotationSheetBiddingService; +import cn.iocoder.yudao.module.bpm.convert.quotationsheetbidding.QuotationSheetBiddingConvert; +import cn.iocoder.yudao.module.bpm.service.quotationsheetbidding.QuotationSheetBiddingService; @Tag(name = "管理后台 - 报价单物料中标") @RestController diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingBaseVO.java similarity index 96% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingBaseVO.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingBaseVO.java index 611527a0..863f06c1 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingBaseVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo; import cn.iocoder.yudao.framework.common.pojo.ImageVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingCreateReqVO.java similarity index 69% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingCreateReqVO.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingCreateReqVO.java index 71a24b4a..9e3496d0 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingCreateReqVO.java @@ -1,9 +1,7 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.*; @Schema(description = "管理后台 - 报价单物料中标创建 Request VO") @Data diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExcelVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExcelVO.java similarity index 95% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExcelVO.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExcelVO.java index 984e7b59..8d03fb50 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExcelVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExcelVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo; import cn.iocoder.yudao.framework.common.pojo.ImageVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExportReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExportReqVO.java similarity index 96% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExportReqVO.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExportReqVO.java index 7862774e..67cde272 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExportReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo; import cn.iocoder.yudao.framework.common.pojo.ImageVo; import lombok.*; diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingPageReqVO.java similarity index 96% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingPageReqVO.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingPageReqVO.java index 450fda15..60e7544d 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingPageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo; import cn.iocoder.yudao.framework.common.pojo.ImageVo; import lombok.*; diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingRespVO.java similarity index 87% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingRespVO.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingRespVO.java index 3c2f82b5..cb1dd4bd 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingUpdateReqVO.java similarity index 83% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingUpdateReqVO.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingUpdateReqVO.java index 92687106..f0624a81 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingUpdateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/quotationsheetbidding/vo/QuotationSheetBiddingUpdateReqVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo; +package cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import javax.validation.constraints.*; @Schema(description = "管理后台 - 报价单物料中标更新 Request VO") diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/convert/quotationsheetbidding/QuotationSheetBiddingConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/quotationsheetbidding/QuotationSheetBiddingConvert.java similarity index 66% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/convert/quotationsheetbidding/QuotationSheetBiddingConvert.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/quotationsheetbidding/QuotationSheetBiddingConvert.java index 66373495..82577b9f 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/convert/quotationsheetbidding/QuotationSheetBiddingConvert.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/quotationsheetbidding/QuotationSheetBiddingConvert.java @@ -1,12 +1,15 @@ -package cn.iocoder.yudao.module.bs.convert.quotationsheetbidding; +package cn.iocoder.yudao.module.bpm.convert.quotationsheetbidding; import java.util.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingCreateReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingExcelVO; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingRespVO; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingUpdateReqVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo.*; import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO; /** diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/mysql/quotationsheetbidding/QuotationSheetBiddingMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/quotationsheetbidding/QuotationSheetBiddingMapper.java similarity index 96% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/mysql/quotationsheetbidding/QuotationSheetBiddingMapper.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/quotationsheetbidding/QuotationSheetBiddingMapper.java index 835b4e60..65536aa7 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/mysql/quotationsheetbidding/QuotationSheetBiddingMapper.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/quotationsheetbidding/QuotationSheetBiddingMapper.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bs.dal.mysql.quotationsheetbidding; +package cn.iocoder.yudao.module.bpm.dal.mysql.quotationsheetbidding; import java.util.*; @@ -7,7 +7,6 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo.*; /** * 报价单物料中标 Mapper diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/QuotationSheetBiddingResultListener.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/QuotationSheetBiddingResultListener.java new file mode 100644 index 00000000..ac6db313 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/QuotationSheetBiddingResultListener.java @@ -0,0 +1,30 @@ +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.quotationsheet.QuotationSheetService; +import cn.iocoder.yudao.module.bpm.service.quotationsheet.QuotationSheetServiceImpl; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 监听 + * @author MrFang + * @date 2023年08月28日 10:42 + */ +@Component +public class QuotationSheetBiddingResultListener extends BpmProcessInstanceResultEventListener{ + @Resource + private QuotationSheetService quotationSheetService; + + @Override + protected String getProcessDefinitionKey() { + return QuotationSheetServiceImpl.BIDDING_KEY; + } + + @Override + protected void onEvent(BpmProcessInstanceResultEvent event) { + quotationSheetService.processInstanceCallBack2(Long.parseLong(event.getBusinessKey()), event.getResult()); + } +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetService.java index ccca9928..cbee85c8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetService.java @@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheet.vo.QuotationS import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheet.QuotationSheetDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import com.github.yulichang.base.MPJBaseService; +import liquibase.pro.packaged.S; /** * 报价单 Service 接口 @@ -22,6 +23,9 @@ public interface QuotationSheetService extends MPJBaseService //报价单流程ID public static final String PROCESS_KEY = "quotation_sheet_seq"; + + //报价单中标流程 + public static final String BIDDING_KEY = "quotation_sheet_bidding"; /** * 创建报价单 * @@ -89,7 +93,7 @@ public interface QuotationSheetService extends MPJBaseService * @param pageVO * @return */ - String approvalBidding(QuotationSheetPageReqVO pageVO); + String approvalBidding(QuotationSheetUpdateReqVO pageVO); /** * 供应商招标列表 @@ -99,12 +103,19 @@ public interface QuotationSheetService extends MPJBaseService PageResult tendereeQuery(QuotationSheetPageReqVO pageVO); /** - * 流程回调 + * 报价单审核流程回调 * @param id * @param result */ void processInstanceCallBack(long id, Integer result); + /** + * 报价单中标流程回调 + * @param id + * @param result + */ + void processInstanceCallBack2(long id, Integer result); + void setNickNameField(List list); diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetServiceImpl.java index 26bac72d..611233d9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheet/QuotationSheetServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.bpm.service.quotationsheet; + import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.security.core.LoginUser; @@ -10,13 +11,15 @@ import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheet.vo.QuotationS import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheet.vo.QuotationSheetPageReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheet.vo.QuotationSheetUpdateReqVO; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; import cn.iocoder.yudao.module.bs.dal.dataobject.materiel.MaterielDO; import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO; import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetdetail.QuotationSheetDetailDO; +import cn.iocoder.yudao.module.bs.enums.QuotationSheetBiddingEnum; import cn.iocoder.yudao.module.bs.enums.QuotationSheetEnum; import cn.iocoder.yudao.module.bs.dal.dataobject.suppliercompany.SupplierCompanyDO; import cn.iocoder.yudao.module.bs.service.materiel.MaterielService; -import cn.iocoder.yudao.module.bs.service.quotationsheetbidding.QuotationSheetBiddingService; +import cn.iocoder.yudao.module.bpm.service.quotationsheetbidding.QuotationSheetBiddingService; import cn.iocoder.yudao.module.bs.service.quotationsheetdetail.QuotationSheetDetailService; import cn.iocoder.yudao.module.bs.service.suppliercompany.SupplierCompanyService; import cn.iocoder.yudao.module.system.api.dept.DeptApi; @@ -26,9 +29,12 @@ import cn.iocoder.yudao.module.system.api.tenant.dto.TenantDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; +import liquibase.pro.packaged.S; +import org.flowable.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -86,6 +92,9 @@ public class QuotationSheetServiceImpl extends MPJBaseServiceImpl 0){ @@ -430,7 +440,21 @@ public class QuotationSheetServiceImpl extends MPJBaseServiceImpl variables = new HashMap<>(); + variables.put("bidding", JSON.toJSONString(pageVO.getQuotationSheetBiddingDOList())); + //variables.put("name", quotationSheet.getProductName()); + // variables.put("number",quotationSheet.getNumber()); + // variables.put("deptId", quotationSheet.getDeptId()); + String processInstanceId = processInstanceApi.createProcessInstance(questionDO.getApplicant(), + new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) + .setVariables(variables).setBusinessKey(String.valueOf(questionDO.getId()))); + updateById(new QuotationSheetDO().setId(questionDO.getId()).setProcessId(processInstanceId)); + return processInstanceId; + } return null; } @@ -468,6 +492,36 @@ public class QuotationSheetServiceImpl extends MPJBaseServiceImpl>>>>>>>"+proces.getProcessVariables().get("bidding")); + if (BpmProcessInstanceResultEnum.APPROVE.getResult().equals(result)) { + //通过 + quotationShe.setBiddingStatus(QuotationSheetBiddingEnum.CONFIRM.getValue()); + updateById(quotationShe); + } else if (BpmProcessInstanceResultEnum.REJECT.getResult().equals(result)) { + //驳回 + quotationShe.setBiddingStatus(QuotationSheetBiddingEnum.ABANDON.getValue()); + updateById(quotationShe); + }else if (BpmProcessInstanceResultEnum.CANCEL.getResult().equals(result)) { + //驳回 + quotationShe.setBiddingStatus(QuotationSheetBiddingEnum.NO_CONFIRM.getValue()); + updateById(quotationShe); + } + + + + + + + } @Override diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingService.java similarity index 78% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingService.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingService.java index ff1e879f..993aa747 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingService.java @@ -1,11 +1,14 @@ -package cn.iocoder.yudao.module.bs.service.quotationsheetbidding; +package cn.iocoder.yudao.module.bpm.service.quotationsheetbidding; import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo.*; + +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingCreateReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingExportReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingPageReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingUpdateReqVO; import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bs.dal.dataobject.suppliercompany.SupplierCompanyDO; import com.github.yulichang.base.MPJBaseService; /** diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java similarity index 89% rename from yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java rename to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java index 3772f6b4..d349f9ca 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java @@ -1,7 +1,6 @@ -package cn.iocoder.yudao.module.bs.service.quotationsheetbidding; +package cn.iocoder.yudao.module.bpm.service.quotationsheetbidding; import cn.iocoder.yudao.module.bs.dal.dataobject.suppliercompany.SupplierCompanyDO; -import cn.iocoder.yudao.module.bs.dal.mysql.suppliercompany.SupplierCompanyMapper; import cn.iocoder.yudao.module.bs.service.suppliercompany.SupplierCompanyService; import com.github.yulichang.base.MPJBaseServiceImpl; import org.springframework.stereotype.Service; @@ -9,12 +8,12 @@ import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import java.util.*; -import cn.iocoder.yudao.module.bs.controller.admin.quotationsheetbidding.vo.*; + import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bs.convert.quotationsheetbidding.QuotationSheetBiddingConvert; -import cn.iocoder.yudao.module.bs.dal.mysql.quotationsheetbidding.QuotationSheetBiddingMapper; +import cn.iocoder.yudao.module.bpm.convert.quotationsheetbidding.QuotationSheetBiddingConvert; +import cn.iocoder.yudao.module.bpm.dal.mysql.quotationsheetbidding.QuotationSheetBiddingMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.bs.enums.ErrorCodeConstants.*; diff --git a/yudao-module-bs/yudao-module-bs-api/src/main/java/cn/iocoder/yudao/module/bs/enums/QuotationSheetBiddingEnum.java b/yudao-module-bs/yudao-module-bs-api/src/main/java/cn/iocoder/yudao/module/bs/enums/QuotationSheetBiddingEnum.java new file mode 100644 index 00000000..5a619be9 --- /dev/null +++ b/yudao-module-bs/yudao-module-bs-api/src/main/java/cn/iocoder/yudao/module/bs/enums/QuotationSheetBiddingEnum.java @@ -0,0 +1,31 @@ +package cn.iocoder.yudao.module.bs.enums; + + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 报价单工作流枚举 + */ +@AllArgsConstructor +@Getter +public enum QuotationSheetBiddingEnum { + + CONFIRM("1", "中标"), + NO_CONFIRM("2", "未中标"), + + ABANDON("3", "流标"), + ; + + + + /** + * 类型 + */ + private final String value; + /** + * 类型名 + */ + private final String name; + +} diff --git a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java index 06eb3601..9c9382c2 100644 --- a/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java +++ b/yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/quotationsheet/QuotationSheetDO.java @@ -178,6 +178,12 @@ public class QuotationSheetDO extends TenantBaseDO { @TableField(exist = false) private String biddingSupplierName; + + /** + * 中标流程实例的ID + */ + private String processId; + /** * 物料信息集合 */ @@ -186,7 +192,7 @@ public class QuotationSheetDO extends TenantBaseDO { /** * 中标审批状态 */ - private Integer biddingStatus; + private String biddingStatus; private String money;