Merge remote-tracking branch 'origin/master'

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

@@ -111,7 +111,7 @@ public class PmPurchaseExecutionController extends BaseController {
         }
         LambdaQueryWrapper<BaseAgency> lw = new LambdaQueryWrapper<>();
         lw.eq(BaseAgency::getCompanyType,pmDemand.getProjectType());
-        lw.eq(BaseAgency::getStatus,0);//白名单
+        lw.eq(BaseAgency::getStatus,NameListType.WHITE.getCode());//白名单
         List<BaseAgency> agencyList = baseAgencyService.list(lw);
         return success(agencyList);
     }
@@ -165,7 +165,7 @@ public class PmPurchaseExecutionController extends BaseController {
         }
         LambdaQueryWrapper<BaseAgency> lw = new LambdaQueryWrapper<>();
         lw.eq(BaseAgency::getCompanyType,pmDemand.getProjectType());
-        lw.eq(BaseAgency::getStatus,0); //白名单
+        lw.eq(BaseAgency::getStatus,NameListType.WHITE.getCode()); //白名单
         List<BaseAgency> baseAgencyList = baseAgencyService.list(lw);
         if (ObjectUtils.isEmpty(baseAgencyList)){
             return error("没有符合的招标代理机构，抽取失败！");
@@ -624,7 +624,7 @@ public class PmPurchaseExecutionController extends BaseController {
             if(pmCallQuestionService.save(pmCallQuestion)) {
                 if("1".equals(pmCallQuestion.getCallQuestion())) { //有质疑
                     List<SysFileRef> sysFileRefs = pmCallQuestionReqVo.getSysFileRefs();
-                    pmDemandService.uploadFile(demandId, SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType(), sysFileRefs, getUserId().toString());
+                    pmDemandService.uploadFile(pmCallQuestion.getId(), SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType(), sysFileRefs, getUserId().toString());
                 }
             }
 

purchase-common/src/main/java/com/ozs/common/enums/NameListType.java

@@ -8,8 +8,8 @@ package com.ozs.common.enums;
 public enum NameListType {
 
     // 代理机构  专家库
-    BLACK("1", "黑名单"),
-    WHITE("0", "白名单");
+    WHITE("0", "白名单"),
+    BLACK("1", "黑名单");
 
     private final String code;
     private final String info;

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

@@ -1455,7 +1455,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 PmDemand pmDemand = this.getById(pmBidWinningReqVo.getDemandId());
                 BaseNotice baseNotice = new BaseNotice();
                 baseNotice.setName(pmDemand.getProjectName());
-                baseNotice.setTitle(pmDemand.getProjectName() + "中标公告");
+                baseNotice.setTitle(pmDemand.getProjectName() + "预中标公告");
                 LambdaQueryWrapper<BaseNoticeType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(BaseNoticeType::getName, "中标公告");
                 BaseNoticeType baseNoticeType = baseNoticeTypeService.getOne(lambdaQueryWrapper);
@@ -1597,7 +1597,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             PmDemand pmDemand = this.getById(pmBidFailureReqVo.getDemandId());
             BaseNotice baseNotice = new BaseNotice();
             baseNotice.setName(pmDemand.getProjectName());
-            baseNotice.setTitle(pmDemand.getProjectName() + "流标公告");
+            baseNotice.setTitle(pmDemand.getProjectName() + "流废标公告");
             LambdaQueryWrapper<BaseNoticeType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(BaseNoticeType::getName, "流标公告");
             BaseNoticeType baseNoticeType = baseNoticeTypeService.getOne(lambdaQueryWrapper);