历史表

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

@@ -55,10 +55,17 @@ public class PmPurchaseExecutionController extends BaseController {
     private BaseAgencyService baseAgencyService;
     @Autowired
     private BaseExpertService baseExpertService;
+
     @Autowired
     private PmDemandExpertRefService pmDemandExpertRefService;
+    @Autowired
+    private PmDemandExpertRefHisService pmDemandExpertRefHisService;
+
     @Autowired
     private PmBidOpeningService pmBidOpeningService;
+    @Autowired
+    private PmBidOpeningHisService pmBidOpeningHisService;
+
     @Autowired
     private BaseProfessionalService baseProfessionalService;
     @Autowired
@@ -733,6 +740,42 @@ public class PmPurchaseExecutionController extends BaseController {
         return success(baseExpertVoList);
     }
 
+    /**
+     * 专家信息查看历史详情列表
+     */
+    @ApiOperation(value = "专家信息查看历史详情列表", notes = "必传需求ID、回退序号和选取时间(yyyy-MM-dd)")
+    @GetMapping("/getBaseExpertHisList")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:getBaseExpertHisList')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
+    public AjaxResult getBaseExpertHisList(@NotEmpty(message = "需求ID不能为空")
+                                        @RequestParam(value = "demandId", required = true) Long demandId,
+                                           @NotEmpty(message = "回退序号不能为空")
+                                           @RequestParam(value = "returnOrderNumber", required = true) Integer returnOrderNumber,
+                                        @NotEmpty(message = "选取时间不能为空")
+                                        @RequestParam(value = "accessTime", required = true) String accessTime) {
+        LambdaQueryWrapper<PmDemandExpertRefHis> pmDemandExpertRefLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRefHis::getDemandId,demandId);
+        pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRefHis::getReturnOrderNumber,returnOrderNumber);
+        pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRefHis::getAccessTime,accessTime);
+        List<PmDemandExpertRefHis> pmDemandExpertRefHisList = pmDemandExpertRefHisService.list(pmDemandExpertRefLambdaQueryWrapper);
+        List<BaseExpertVo> baseExpertVoList = new ArrayList<>();
+        if(!ObjectUtils.isEmpty(pmDemandExpertRefHisList)) {
+            for(PmDemandExpertRefHis pmDemandExpertRefHis : pmDemandExpertRefHisList) {
+                BaseExpert baseExpert = baseExpertService.getById(pmDemandExpertRefHis.getExpertId());
+                if(baseExpert != null){
+                    BaseExpertVo baseExpertVo = new BaseExpertVo();
+                    BeanUtils.copyProperties(baseExpert,baseExpertVo);
+                    baseExpertVo.setMajorTypeName(getMajorTypeName(baseExpertVo.getMajorType()));
+                    baseExpertVo.setExpertTypeName(ExpertType.getCodeToInfo(baseExpertVo.getExpertType()));
+                    baseExpertVo.setVarietyPurchaseName(PurchaseType.getCodeToInfo(baseExpertVo.getVarietyPurchase()));
+                    baseExpertVoList.add(baseExpertVo);
+                }
+            }
+        }
+
+        return success(baseExpertVoList);
+    }
+
     private String getMajorTypeName(String majorType){
         if(ObjectUtils.isEmpty(majorType)) {
             return null;
@@ -772,4 +815,23 @@ public class PmPurchaseExecutionController extends BaseController {
         return success(pmBidOpeningList);
     }
 
+    /**
+     * 开标信息查看历史详情列表
+     */
+    @ApiOperation(value = "开标信息查看历史详情列表", notes = "必传选需求ID、回退序号和开标时间(yyyy-MM-dd)")
+    @GetMapping("/getBidOpeningHisList")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:getBidOpeningHisList')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
+    public AjaxResult getBidOpeningHisList(@NotEmpty(message = "需求ID不能为空")
+                                        @RequestParam(value = "demandId", required = true) Long demandId,
+                                           @NotEmpty(message = "回退序号不能为空")
+                                           @RequestParam(value = "returnOrderNumber", required = true) Integer returnOrderNumber,
+                                        @NotEmpty(message = "开标时间不能为空")
+                                        @RequestParam(value = "openBidTime", required = true) String openBidTime) {
+        LambdaQueryWrapper<PmBidOpeningHis> pmBidOpeningLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmBidOpeningLambdaQueryWrapper.eq(PmBidOpeningHis::getDemandId,demandId).eq(PmBidOpeningHis::getReturnOrderNumber,returnOrderNumber)
+                .eq(PmBidOpeningHis::getOpenBidTime,openBidTime).orderByDesc(PmBidOpeningHis::getScore);
+        List<PmBidOpeningHis> pmBidOpeningList = pmBidOpeningHisService.list(pmBidOpeningLambdaQueryWrapper);
+        return success(pmBidOpeningList);
+    }
 }