招标单默认数据查询方法更新

src/main/java/com/uas/platform/b2b/controller/PurchaseTenderController.java

@@ -1,11 +1,14 @@
 package com.uas.platform.b2b.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
+import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.PurchaseTender;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
-import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseTenderService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -38,7 +41,10 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 招标单
@@ -56,15 +62,11 @@ public class PurchaseTenderController {
     @Autowired
     private SearchService searchService;
 
-    @Autowired
-    private AttachService attachService;
-
     @Autowired
     private UserService userService;
 
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-
     /**
      * 作为采购方，发布招标单
      *
@@ -116,14 +118,12 @@ public class PurchaseTenderController {
     /**
      * 供应商投标
      *
-     *
      */
     @RequestMapping(value = "/reply", method = RequestMethod.POST)
     @ResponseBody
     public ResponseEntity<String> replyTender(@RequestBody String saleTender) {
         SaleTenderErp saleTender1 = FlexJsonUtils.fromJson(saleTender, SaleTenderErp.class);
         purchaseTenderService.reply(saleTender1);
-//        logger.log("供应商投标", "供应商对招标单进行投标",  "供应商名称" + saleTenderItems.get(0).getSaleTender().getEnterpriseBaseInfo().getEnName() + ",招标单号： "+ saleTenderItems.get(0).getTenderProd().getTender().getCode());
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
@@ -132,7 +132,6 @@ public class PurchaseTenderController {
      * 查看招标单
      *
      * @param id 招标单id
-     *
      */
     @RequestMapping(value = "/purc/{id}/info", method = RequestMethod.GET)
     @ResponseBody
@@ -144,7 +143,6 @@ public class PurchaseTenderController {
      * 查看投标单详情
      *
      * @param tenderId 招标单id
-     *
      */
     @RequestMapping(value = "/sale/{tenderId}/info", method = RequestMethod.GET)
     @ResponseBody
@@ -157,7 +155,6 @@ public class PurchaseTenderController {
      *
      * @param vendUU 供应商UU
      * @param tenderId 招标单id
-     *
      */
     @RequestMapping(value = "/getVendorSaleTenderDetail/{vendUU}/{tenderId}", method = RequestMethod.GET)
     @ResponseBody
@@ -165,12 +162,10 @@ public class PurchaseTenderController {
         return purchaseTenderService.findVendorSaleTenderDetailByTenderId(vendUU, tenderId);
     }
 
-
     /**
      * 公开招标转投标单
      *
      * @param id 招标单id
-     *
      */
     @RequestMapping(value = "/addItems/{id}", method = RequestMethod.POST)
     @ResponseBody
@@ -182,15 +177,10 @@ public class PurchaseTenderController {
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
-
-
-
-
     /**
      * 招标方定标
      *
      * @param json 招标单json
-     *
      */
     @RequestMapping(value = "/decide", method = RequestMethod.POST)
     @ResponseBody
@@ -217,6 +207,9 @@ public class PurchaseTenderController {
         }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
+        if (StringUtils.isEmpty(keyword)) {
+            return getAllOpenTenders(params, searchFilter);
+        }
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         // 判断当前用户是否被客户分配
         SearchFilter filter = userService.distribute();
@@ -227,7 +220,6 @@ public class PurchaseTenderController {
         sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.NO);  // 现在公开的也在这个列表
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
@@ -288,7 +280,6 @@ public class PurchaseTenderController {
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
         pageParams.getFilters().put("pt_overdue", Constant.YES);
         pageParams.getFilters().put("pt_result", Constant.NO);
-//        pageParams.getFilters().put("pt_status", "待评标");
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
@@ -337,6 +328,9 @@ public class PurchaseTenderController {
         }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
+        if (StringUtils.isEmpty(keyword)) {
+            return getTodoTendersInfo(params, searchFilter);
+        }
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         // 判断当前用户是否被客户分配
         SearchFilter filter = userService.distribute();
@@ -348,13 +342,11 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("st_overdue", Constant.NO);
         pageParams.getFilters().put("st_status", "待投标");
         return searchService.searchSaleTenderIds(keyword, pageParams);
     }
 
-
     /**
      * 作为供应商，查看收到的招标单（过期）
      *
@@ -380,13 +372,11 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("pt_status", "待投标");
         pageParams.getFilters().put("pt_overdue", Constant.YES);
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
-
     /**
      * 作为供应商，查看平台开放招标单（全部）
      *
@@ -474,80 +464,6 @@ public class PurchaseTenderController {
         return purchaseTenderService.findAllBySaleTenderPageInfo(pageInfo, filter);
     }
 
-
-//    /**
-//     * 作为供应商，查看平台开放招标单（待评标）
-//     *
-//     * @param params
-//     * @return
-//     */
-//    @RequestMapping(value = "/open", params = RequestState.DONE, method = RequestMethod.GET)
-//    @ResponseBody
-//    public SPage<PurchaseTender> getDoneOpenTenders(PageParams params, String searchFilter) {
-//        logger.log("平台公开招标单", "查看平台公开招标单（待评标）");
-//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-//        String keyword = jsonObject.getString("keyword");
-//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-//        List<Sort> sortList = new ArrayList<>();
-//        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
-//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//        pageParams.getFilters().put("pt_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.YES);
-//        pageParams.getFilters().put("pt_overdue", Constant.YES);
-//        pageParams.getFilters().put("pt_result", Constant.NO);
-//        pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
-//        return searchService.searchPurcTenderIds(keyword, pageParams);
-//    }
-//
-//
-//    /**
-//     * 作为供应商，查看平台开放招标单（待投标）
-//     *
-//     * @param params
-//     * @return
-//     */
-//    @RequestMapping(value = "/open", params = RequestState.TODO, method = RequestMethod.GET)
-//    @ResponseBody
-//    public SPage<PurchaseTender> getTodoOpenTenders(PageParams params, String searchFilter) {
-//        logger.log("平台公开招标单", "查看平台公开招标单（待投标）");
-//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-//        String keyword = jsonObject.getString("keyword");
-//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-//        List<Sort> sortList = new ArrayList<>();
-//        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
-//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//        pageParams.getFilters().put("pt_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.YES);
-//        pageParams.getFilters().put("pt_overdue", Constant.NO);
-//        pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
-//        return searchService.searchPurcTenderIds(keyword, pageParams);
-//    }
-//
-//
-//    /**
-//     * 作为供应商，查看平台开放招标单（过期）
-//     *
-//     * @param params
-//     * @return
-//     */
-//    @RequestMapping(value = "/open", params = RequestState.END, method = RequestMethod.GET)
-//    @ResponseBody
-//    public SPage<PurchaseTender> getEndOpenTenders(PageParams params, String searchFilter) {
-//        logger.log("平台公开招标单", "查看平台公开招标单（已过期）");
-//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-//        String keyword = jsonObject.getString("keyword");
-//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-//        List<Sort> sortList = new ArrayList<>();
-//        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
-//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//        pageParams.getFilters().put("pt_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.YES);
-//        pageParams.getFilters().put("pt_overdue", Constant.YES);
-//        pageParams.getFilters().put("pt_result", Constant.YES);
-////        pageParams.getFilters().put("pt_status", "待投标");
-//        return searchService.searchPurcTenderIds(keyword, pageParams);
-//    }
-
     /**
      * 作为采购方，查看发出的招标单
      *
@@ -652,7 +568,6 @@ public class PurchaseTenderController {
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
-
     /**
      *  作为客户，查看发出的招标单（待发布）
      *
@@ -670,7 +585,6 @@ public class PurchaseTenderController {
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         // 当前登录企业作为客户
-
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -704,7 +618,6 @@ public class PurchaseTenderController {
         return purchaseTenderService.findAllByPageInfo(pageInfo, filter);
     }
 
-
     /**
      * 作为采购方，查看发出的招标单（待投标）-不搜索
      *
@@ -766,20 +679,6 @@ public class PurchaseTenderController {
         return purchaseTenderService.addTenderItemAttaches(uploadItem);
     }
 
-//    /**
-//     * 查看最近指定招标
-//     *
-//     * @param params 参数
-//     * @return List
-//     */
-//    @RequestMapping(value = "/latestTender", method = RequestMethod.GET)
-//    @ResponseBody
-//    public List<PurchaseTender> getLatestTender(PageParams params) {
-////        PageInfo info = new PageInfo(params);
-////        info.sorting("date", Direction.DESC); // 按发布日期倒序
-//        return purchaseTenderService.findAll();
-//    }
-
     /**
      * 查看最近公开招标
      *
@@ -889,7 +788,6 @@ public class PurchaseTenderController {
         purchaseTenderService.deleteAttach(attachId);
     }
 
-
     /**
      * 获取批量上传物料的模板
      *
@@ -905,7 +803,6 @@ public class PurchaseTenderController {
         return modelAndView;
     }
 
-
     /**
      * 通过excel批量导入物料明细
      *

src/main/java/com/uas/platform/b2b/controller/SaleApCheckController.java

@@ -392,7 +392,6 @@ public class SaleApCheckController {
 		return searchService.searchPurchaseApCheckIds(filter.getKeyword(), pageParams);
 	}
 
-
     /**
      * 设置客户分配条件等
      *