From 9a8ca731327d4d14d5808d9e5183391515e5b6af Mon Sep 17 00:00:00 2001
From: Agoni <791536664@qq.com>
Date: Thu, 31 Aug 2023 20:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=A0=87=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/quotationsheet/QuotationSheetController.java   | 2 +-
 .../admin/quotationsheet/vo/QuotationSheetRespVO.java    | 2 ++
 .../quotationsheet/vo/QuotationSheetUpdateReqVO.java     | 2 ++
 .../QuotationSheetBiddingMapper.java                     | 4 ++++
 .../quotationsheet/QuotationSheetServiceImpl.java        | 9 ++++++++-
 .../QuotationSheetBiddingServiceImpl.java                | 4 ++++
 .../yudao/module/bs/enums/QuotationSheetBiddingEnum.java | 1 +
 .../dal/dataobject/quotationsheet/QuotationSheetDO.java  | 3 +++
 8 files changed, 25 insertions(+), 2 deletions(-)

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 f017d5b3..0ba4a9f2 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<String> approvalBidding(QuotationSheetUpdateReqVO pageVO) {
+    public CommonResult<String> approvalBidding(@RequestBody 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/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 59f71032..4e54fd8e 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
@@ -66,5 +66,7 @@ public class QuotationSheetRespVO extends QuotationSheetBaseVO {
     private Long tenantId;
     private String tenantName;
 
+    private String applicantName;
+
     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 a5cdae0c..24469daa 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
@@ -30,6 +30,8 @@ public class QuotationSheetUpdateReqVO extends QuotationSheetBaseVO {
    // @NotEmpty(message = "物料不能为空")
     private List<QuotationSheetBiddingDO> quotationSheetBiddingDOList;
 
+    private List<Long> approvalBiddingIdList;
+
     @Schema(description = "是否中标")
     private Integer isWin;
 
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/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
index 65536aa7..c8637a09 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/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
@@ -5,6 +5,8 @@ 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.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingExportReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.quotationsheetbidding.vo.QuotationSheetBiddingPageReqVO;
 import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheetbidding.QuotationSheetBiddingDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -33,6 +35,7 @@ public interface QuotationSheetBiddingMapper extends BaseMapperX<QuotationSheetB
                 .eqIfPresent(QuotationSheetBiddingDO::getIsWin, reqVO.getIsWin())
                 .eqIfPresent(QuotationSheetBiddingDO::getFiles, reqVO.getFiles())
                 .eqIfPresent(QuotationSheetBiddingDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(QuotationSheetBiddingDO::getQuotationId, reqVO.getQuotationId())
                 .orderByDesc(QuotationSheetBiddingDO::getId));
     }
 
@@ -52,6 +55,7 @@ public interface QuotationSheetBiddingMapper extends BaseMapperX<QuotationSheetB
                 .betweenIfPresent(QuotationSheetBiddingDO::getQuotationTime, reqVO.getQuotationTime())
                 .eqIfPresent(QuotationSheetBiddingDO::getIsWin, reqVO.getIsWin())
                 .eqIfPresent(QuotationSheetBiddingDO::getFiles, reqVO.getFiles())
+//                .eqIfPresent(QuotationSheetBiddingDO::getQuotationId, reqVO.getQuotationId())
                 .eqIfPresent(QuotationSheetBiddingDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .orderByDesc(QuotationSheetBiddingDO::getId));
     }
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 611233d9..67516cfc 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
@@ -181,6 +181,9 @@ public class QuotationSheetServiceImpl extends MPJBaseServiceImpl<QuotationSheet
     @Override
     public QuotationSheetDO getQuotationSheet(Long id) {
         QuotationSheetDO quotationSheetDO = quotationSheetMapper.selectById(id);
+        if (null==quotationSheetDO){
+            return quotationSheetDO;
+        }
         List<QuotationSheetDetailDO> quotationSheetDetailDOList = quotationSheetDetailService.list(new QueryWrapper<QuotationSheetDetailDO>().eq("company_id", id));
         if (null==quotationSheetDetailDOList){
             quotationSheetDetailDOList = new ArrayList<>();
@@ -211,6 +214,10 @@ public class QuotationSheetServiceImpl extends MPJBaseServiceImpl<QuotationSheet
                 quotationSheetDO.setIsWin(2);
             }
         }
+        AdminUserRespDTO user = adminUserApi.getUser(quotationSheetDO.getApplicant());
+        if (null!=user){
+            quotationSheetDO.setApplicantName(user.getNickname());
+        }
         quotationSheetDO.setSupplierList(supplierCompanyService.listByIds(JSON.parseArray(quotationSheetDO.getSupplierIdAll(),Long.class)));
         quotationSheetDO.setQuotationDetails(quotationSheetDetailDOList);
         return quotationSheetDO;
@@ -443,7 +450,7 @@ public class QuotationSheetServiceImpl extends MPJBaseServiceImpl<QuotationSheet
     public String approvalBidding(QuotationSheetUpdateReqVO pageVO) {
         QuotationSheetDO questionDO = this.getById(pageVO.getId());
         //发起实例
-        if (questionDO.getBiddingStatus().equals(QuotationSheetBiddingEnum.NO_CONFIRM.getValue())) {
+        if (questionDO.getBiddingStatus().equals(QuotationSheetBiddingEnum.PRIMED_FOR_ACTION.getValue())) {
             Map<String, Object> variables = new HashMap<>();
              variables.put("bidding", JSON.toJSONString(pageVO.getQuotationSheetBiddingDOList()));
             //variables.put("name", quotationSheet.getProductName());
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/quotationsheetbidding/QuotationSheetBiddingServiceImpl.java
index d349f9ca..0b433f04 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/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,5 +1,9 @@
 package cn.iocoder.yudao.module.bpm.service.quotationsheetbidding;
 
+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.suppliercompany.SupplierCompanyDO;
 import cn.iocoder.yudao.module.bs.service.suppliercompany.SupplierCompanyService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
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
index 5a619be9..6c8d5540 100644
--- 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
@@ -13,6 +13,7 @@ public enum QuotationSheetBiddingEnum {
 
     CONFIRM("1", "中标"),
     NO_CONFIRM("2", "未中标"),
+    PRIMED_FOR_ACTION("0", "待发起"),
 
     ABANDON("3", "流标"),
     ;
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 9c9382c2..db486663 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
@@ -209,4 +209,7 @@ public class QuotationSheetDO extends TenantBaseDO {
     private String nickname;
     @TableField(exist = false)
     private String deptName;
+
+    @TableField(exist = false)
+    private String applicantName;
 }