历史

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -477,7 +477,7 @@ public class PmPurchaseExecutionController extends BaseController {
         return success(pmBidOpeningList);
     }
 
-    @ApiOperation(value = "中标基本情况填制-中标情况填制提交",notes = "采购需求ID必传")
+    @ApiOperation(value = "中标基本情况填制-中标情况填制提交(评标结果公告)",notes = "采购需求ID必传")
     @PostMapping("/insertPmBidWinning")
     @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:insertPmBidWinning')")
     @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.INSERT)

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -1390,8 +1390,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     @Transactional(rollbackFor = Exception.class)
     public boolean insertPmBidWinning(PmBidWinningReqVo pmBidWinningReqVo) throws Exception {
         List<Long> pmBidOpeningIdList = pmBidWinningReqVo.getPmBidOpeningIdList();
-        if (ObjectUtils.isEmpty(pmBidWinningReqVo.getBidWinningAmount())) {
-            throw new Exception("中标金额不能为空");
+        if (ObjectUtils.isEmpty(pmBidWinningReqVo.getBidWinningAmount()) && ObjectUtils.isEmpty(pmBidWinningReqVo.getRemarks()) ) {
+            throw new Exception("中标金额或备注必须填写一个");
         }
         if (ObjectUtils.isEmpty(pmBidOpeningIdList)) {
             throw new Exception("中标单位信息列表不能为空");