项目管理

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

@@ -17,12 +17,16 @@ import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.utils.RandomUtil;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.pm.doman.PmBidOpening;
 import com.ozs.pm.doman.PmBidWinning;
 import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.doman.PmDemandExpertRef;
 import com.ozs.pm.doman.vo.requestVo.*;
 import com.ozs.pm.doman.vo.responseVo.PmDemandResVo;
 import com.ozs.pm.service.IPmDemandService;
+import com.ozs.pm.service.PmBidOpeningService;
 import com.ozs.pm.service.PmBidWinningService;
+import com.ozs.pm.service.PmDemandExpertRefService;
 import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -54,8 +58,10 @@ public class PmPurchaseExecutionController extends BaseController {
     private BaseAgencyService baseAgencyService;
     @Autowired
     private BaseExpertService baseExpertService;
-
-
+    @Autowired
+    private PmDemandExpertRefService pmDemandExpertRefService;
+    @Autowired
+    private PmBidOpeningService pmBidOpeningService;
     /**
      * 采购执行查询列表
      */
@@ -302,7 +308,22 @@ public class PmPurchaseExecutionController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "中标情况填制",notes = "采购需求ID必传")
+    /**
+     * 中标基本情况填制-开标信息下拉列表
+     */
+    @ApiOperation(value = "中标基本情况填制-开标信息下拉列表", notes = "必传选需求ID")
+    @PostMapping("/getPullDownBidOpeningList")
+    public AjaxResult getPullDownBidOpeningList(@NotEmpty(message = "需求ID不能为空")
+                                        @RequestParam(value = "demandId", required = true) Long demandId) {
+        LambdaQueryWrapper<PmBidOpening> pmBidOpeningLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmBidOpeningLambdaQueryWrapper.eq(PmBidOpening::getDemandId,demandId)
+                .orderByDesc(PmBidOpening::getScore)
+        ;
+        List<PmBidOpening> pmBidOpeningList = pmBidOpeningService.list(pmBidOpeningLambdaQueryWrapper);
+        return success(pmBidOpeningList);
+    }
+
+    @ApiOperation(value = "中标基本情况填制-中标情况填制提交",notes = "采购需求ID必传")
     @PostMapping("/insertPmBidWinning")
     public AjaxResult insertPmBidWinning(@NotEmpty(message = "数据为空")
                                                   @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
@@ -321,7 +342,7 @@ public class PmPurchaseExecutionController extends BaseController {
       }
     }
 
-    @ApiOperation(value = "更换中标人",notes = "采购需求ID必传")
+    @ApiOperation(value = "中标基本情况填制-更换中标人提交",notes = "采购需求ID必传")
     @PostMapping("/updatePmBidWinning")
     public AjaxResult updatePmBidWinning(@NotEmpty(message = "数据为空")
                                          @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
@@ -431,4 +452,48 @@ public class PmPurchaseExecutionController extends BaseController {
         }
         return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType()));
     }
+
+    /**
+     * 专家信息查看详情列表
+     */
+    @ApiOperation(value = "专家信息查看详情列表", notes = "必传需求ID和选取时间(yyyy-MM-dd)")
+    @PostMapping("/getBaseExpertList")
+    public AjaxResult getBaseExpertList(@NotEmpty(message = "需求ID不能为空")
+                                            @RequestParam(value = "demandId", required = true) Long demandId,
+                                         @NotEmpty(message = "选取时间不能为空")
+                                            @RequestParam(value = "accessTime", required = true) String accessTime) {
+        LambdaQueryWrapper<PmDemandExpertRef> pmDemandExpertRefLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getDemandId,demandId);
+        pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getAccessTime,accessTime);
+        List<PmDemandExpertRef> pmDemandExpertRefList = pmDemandExpertRefService.list(pmDemandExpertRefLambdaQueryWrapper);
+        List<BaseExpert> list = new ArrayList<>();
+        if(!ObjectUtils.isEmpty(pmDemandExpertRefList)) {
+            for(PmDemandExpertRef pmDemandExpertRef : pmDemandExpertRefList) {
+                BaseExpert baseExpert = baseExpertService.getById(pmDemandExpertRef.getExpertId());
+                if(baseExpert != null){
+                    list.add(baseExpert);
+                }
+            }
+        }
+
+        return success(list);
+    }
+
+  /**
+     * 开标信息查看详情列表
+     */
+    @ApiOperation(value = "开标信息查看详情列表", notes = "必传选需求ID和开标时间(yyyy-MM-dd)")
+    @PostMapping("/getBidOpeningList")
+    public AjaxResult getBidOpeningList(@NotEmpty(message = "需求ID不能为空")
+                                        @RequestParam(value = "demandId", required = true) Long demandId,
+                                        @NotEmpty(message = "开标时间不能为空")
+                                        @RequestParam(value = "openBidTime", required = true) String openBidTime) {
+        LambdaQueryWrapper<PmBidOpening> pmBidOpeningLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmBidOpeningLambdaQueryWrapper.eq(PmBidOpening::getDemandId,demandId)
+        .eq(PmBidOpening::getOpenBidTime,openBidTime).orderByDesc(PmBidOpening::getScore)
+        ;
+        List<PmBidOpening> pmBidOpeningList = pmBidOpeningService.list(pmBidOpeningLambdaQueryWrapper);
+        return success(pmBidOpeningList);
+    }
+
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmBidWinningReqVo.java

@@ -59,9 +59,9 @@ public class PmBidWinningReqVo implements Serializable {
     private Date updateTime;
 
     /**
-     * 中标单位信息列表
+     * 中标单位信息ID列表
      */
-    @ApiModelProperty("中标单位信息列表")
+    @ApiModelProperty("中标单位信息ID列表")
     private List<Long> pmBidOpeningIdList;
 
     /**