采购办--待办事项

purchase-admin/src/main/java/com/ozs/web/controller/home/SystemHomepageController.java

@@ -168,27 +168,43 @@ public class SystemHomepageController extends BaseController {
         return pmDemandService.procurementOfficeWillManipulateTotal();
     }
 
-    @ApiOperation(value = "采购办首页待办事项（待选取代理）")
-    @GetMapping("/procurementOffice/will/waitSelectAgent")
+    @ApiOperation(value = "采购办首页待办事项（采购需求对接）")
+    @GetMapping("/procurementOffice/will/purchaseDemandDocking")
     @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
-    public AjaxResult waitSelectAgent() {
-        List<PmDemandResVo> resVos = pmDemandService.waitSelectAgent();
+    public AjaxResult purchaseDemandDocking() {
+        List<PmDemandResVo> resVos = pmDemandService.purchaseDemandDocking();
         return AjaxResult.success(resVos);
     }
 
-    @ApiOperation(value = "采购办首页待办事项（待上传招标文件）")
-    @GetMapping("/procurementOffice/will/waitUpBidFile")
+    @ApiOperation(value = "采购办首页待办事项（专家意见反馈）")
+    @GetMapping("/procurementOffice/will/expertFeedback")
     @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
-    public AjaxResult waitUpBidFile() {
-        List<PmDemandResVo> resVos = pmDemandService.waitUpBidFile();
+    public AjaxResult expertFeedback() {
+        List<PmDemandResVo> resVos = pmDemandService.expertFeedback();
         return AjaxResult.success(resVos);
     }
 
-    @ApiOperation(value = "采购办首页待办事项（待发布公告）")
-    @GetMapping("/procurementOffice/will/waitAnnouncement")
+    @ApiOperation(value = "采购办首页待办事项（采购文件编制审核）")
+    @GetMapping("/procurementOffice/will/procurementDocumentsReview")
     @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
-    public AjaxResult waitAnnouncement() {
-        List<PmDemandResVo> resVos = pmDemandService.waitAnnouncement();
+    public AjaxResult procurementDocumentsReview() {
+        List<PmDemandResVo> resVos = pmDemandService.procurementDocumentsReview();
+        return AjaxResult.success(resVos);
+    }
+
+    @ApiOperation(value = "采购办首页待办事项（采购公告发布）")
+    @GetMapping("/procurementOffice/will/procurementAnnouncement")
+    @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
+    public AjaxResult procurementAnnouncement() {
+        List<PmDemandResVo> resVos = pmDemandService.procurementAnnouncement();
+        return AjaxResult.success(resVos);
+    }
+
+    @ApiOperation(value = "采购办首页待办事项（标前质疑投诉）")
+    @GetMapping("/procurementOffice/will/preBidQuery")
+    @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
+    public AjaxResult preBidQuery() {
+        List<PmDemandResVo> resVos = pmDemandService.preBidQuery();
         return AjaxResult.success(resVos);
     }
 
@@ -200,19 +216,27 @@ public class SystemHomepageController extends BaseController {
         return AjaxResult.success(resVos);
     }
 
-    @ApiOperation(value = "采购办首页待办事项（待发布中标公告）")
-    @GetMapping("/procurementOffice/will/waitBidAnnouncement")
+    @ApiOperation(value = "采购办首页待办事项（评标结果公告）")
+    @GetMapping("/procurementOffice/will/bidResultAnnouncement")
+    @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
+    public AjaxResult bidResultAnnouncement() {
+        List<PmDemandResVo> resVos = pmDemandService.bidResultAnnouncement();
+        return AjaxResult.success(resVos);
+    }
+
+    @ApiOperation(value = "采购办首页待办事项（流废标处置）")
+    @GetMapping("/procurementOffice/will/wasteBidHandle")
     @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
-    public AjaxResult waitBidAnnouncement() {
-        List<PmDemandResVo> resVos = pmDemandService.waitBidAnnouncement();
+    public AjaxResult wasteBidHandle() {
+        List<PmDemandResVo> resVos = pmDemandService.wasteBidHandle();
         return AjaxResult.success(resVos);
     }
 
-    @ApiOperation(value = "采购办首页待办事项（中标公示中）")
-    @GetMapping("/procurementOffice/will/biddingPublicity")
+    @ApiOperation(value = "采购办首页待办事项（标后质疑）")
+    @GetMapping("/procurementOffice/will/postBidQuery")
     @Log(title = ModularConstans.systemHome, businessType = BusinessType.QUERY)
-    public AjaxResult biddingPublicity() {
-        List<PmDemandResVo> resVos = pmDemandService.biddingPublicity();
+    public AjaxResult postBidQuery() {
+        List<PmDemandResVo> resVos = pmDemandService.postBidQuery();
         return AjaxResult.success(resVos);
     }
 

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -268,18 +268,19 @@ public class PlanQuarterController extends BaseController {
     //    return success(message);
     //}
 
-    @ApiOperation("模板下载")
-    @GetMapping("/downloaExcel")
-    public void downloadZip(HttpServletResponse response) {
-        try {
-            InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/planQuarter.xlsx");
-            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-            FileUtils.setAttachmentResponseHeader(response, "季度计划导入模板.xlsx");
-            FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
-        } catch (Exception e) {
-            log.error("下载文件失败", e);
-        }
-    }
+    //季度计划不能进行导入
+    //@ApiOperation("模板下载")
+    //@GetMapping("/downloaExcel")
+    //public void downloadZip(HttpServletResponse response) {
+    //    try {
+    //        InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/planQuarter.xlsx");
+    //        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+    //        FileUtils.setAttachmentResponseHeader(response, "季度计划导入模板.xlsx");
+    //        FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
+    //    } catch (Exception e) {
+    //        log.error("下载文件失败", e);
+    //    }
+    //}
 
     @ApiOperation(value = "导入年度计划数据")
     @PostMapping("/importPlanYearsData")

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

@@ -160,47 +160,24 @@ public interface IPmDemandService extends IService<PmDemand> {
      */
     List<PmDemandResVo> taskWaitRelease();
 
-    /**
-     * 采购管理部门首页待办事项（待选取代理）
-     *
-     * @return
-     */
-    List<PmDemandResVo> waitSelectAgent();
+    List<PmDemandResVo> purchaseDemandDocking();
 
-    /**
-     * 采购管理部门首页待办事项（待上传招标文件）
-     *
-     * @return
-     */
-    List<PmDemandResVo> waitUpBidFile();
+    List<PmDemandResVo> expertFeedback();
 
-    /**
-     * 采购管理部门首页待办事项（待发布公告）
-     *
-     * @return
-     */
-    List<PmDemandResVo> waitAnnouncement();
+    List<PmDemandResVo> procurementDocumentsReview();
+
+    List<PmDemandResVo> procurementAnnouncement();
+
+    List<PmDemandResVo> preBidQuery();
 
-    /**
-     * 采购管理部门首页待办事项（待开标）
-     *
-     * @return
-     */
     List<PmDemandResVo> waitOpenBid();
 
-    /**
-     * 采购管理部门首页待办事项（待发布中标公告）
-     *
-     * @return
-     */
-    List<PmDemandResVo> waitBidAnnouncement();
+    List<PmDemandResVo> bidResultAnnouncement();
+
+    List<PmDemandResVo> wasteBidHandle();
+
+    List<PmDemandResVo> postBidQuery();
 
-    /**
-     * 采购管理部门首页待办事项（中标公示中）
-     *
-     * @return
-     */
-    List<PmDemandResVo> biddingPublicity();
 
     /**
      * 采购管理部门首页待办事项（全部）

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

@@ -1651,24 +1651,28 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     }
 
     @Override
-    public List<PmDemandResVo> waitSelectAgent() {
-        // TODO
-        return null;
-       // return getListByStatus(PmProjectStatus.WAIT_SELECT_AGENT.getCode());
+    public List<PmDemandResVo> purchaseDemandDocking() {
+        return getListByStatus(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode());
     }
 
     @Override
-    public List<PmDemandResVo> waitUpBidFile() {
-        // TODO
-        return null;
-        //return getListByStatus(PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode());
+    public List<PmDemandResVo> expertFeedback() {
+        return getListByStatus(PmProjectStatus.EXPERT_FEEDBACK.getCode());
     }
 
     @Override
-    public List<PmDemandResVo> waitAnnouncement() {
-        // TODO
-        return null;
-       // return getListByStatus(PmProjectStatus.WAIT_ANNOUNCEMENT.getCode());
+    public List<PmDemandResVo> procurementDocumentsReview() {
+        return getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getInfo());
+    }
+
+    @Override
+    public List<PmDemandResVo> procurementAnnouncement() {
+        return getListByStatus(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode());
+    }
+
+    @Override
+    public List<PmDemandResVo> preBidQuery() {
+        return getListByStatus(PmProjectStatus.PRE_BID_QUERY.getCode());
     }
 
     @Override
@@ -1677,17 +1681,18 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     }
 
     @Override
-    public List<PmDemandResVo> waitBidAnnouncement() {
-        // TODO
-        return null;
-        //return getListByStatus(PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode());
+    public List<PmDemandResVo> bidResultAnnouncement() {
+        return getListByStatus(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode());
+    }
+
+    @Override
+    public List<PmDemandResVo> wasteBidHandle() {
+        return getListByStatus(PmProjectStatus.WASTE_BID_HANDLE.getCode());
     }
 
     @Override
-    public List<PmDemandResVo> biddingPublicity() {
-        // TODO
-        return null;
-       // return getListByStatus(PmProjectStatus.BIDDING_PUBLICITY.getCode());
+    public List<PmDemandResVo> postBidQuery() {
+        return getListByStatus(PmProjectStatus.POST_BID_QUERY.getCode());
     }
 
     @Override
@@ -1695,13 +1700,15 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<HomeToDoQueryResVo> homeRes = new ArrayList<>();
         // 待选取代理, 待上传招标文件, 待发布公告, 待开标, 待发布中标公告, 中标公示中
         List<PmDemandResVo> demandRes = new ArrayList<>();
-        // TODO
-//        demandRes.addAll(getListByStatus(PmProjectStatus.WAIT_SELECT_AGENT.getCode()));
-//        demandRes.addAll(getListByStatus(PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode()));
-//        demandRes.addAll(getListByStatus(PmProjectStatus.WAIT_ANNOUNCEMENT.getCode()));
-//        demandRes.addAll(getListByStatus(PmProjectStatus.WAIT_OPEN_BID.getCode()));
-//        demandRes.addAll(getListByStatus(PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode()));
-//        demandRes.addAll(getListByStatus(PmProjectStatus.BIDDING_PUBLICITY.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.EXPERT_FEEDBACK.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.PRE_BID_QUERY.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.WAIT_OPEN_BID.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.WASTE_BID_HANDLE.getCode()));
+        demandRes.addAll(getListByStatus(PmProjectStatus.POST_BID_QUERY.getCode()));
 
         //计划数据--发函催告
         List<PlanQuarterResponseVo> planRes = planYearsService.willSendLetter();