招标单保存变更招标方式问题处理

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7996 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -37,8 +37,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
+ * 招标单
+ *
  * Created by dongbw on 17/03/07 14:19.
  */
 @Controller
@@ -67,50 +70,55 @@ public class PurchaseTenderController {
     /**
      * 作为采购方，发布招标单
      *
-     * @param tender
-     * @return
+     * @param tender 招标单
+     *
      */
     @RequestMapping(value = "/publish", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
     public ResponseEntity<String> publishTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        System.out.println(vendorUUs);
-        if (null != vendorUUs) {
-            vendorUUs = "[".concat(vendorUUs);
-            vendorUUs = vendorUUs.concat("]");
-            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
-            System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
-            System.out.println("tender" + JSON.toJSONString(purchaseTender));
-            purchaseTenderService.publish(purchaseTender, vendUUs);
-        } else {
+        if (purchaseTender.getIfOpen() == Constant.YES) {
             purchaseTenderService.publishOpen(purchaseTender);
+        } else {
+            if (null != vendorUUs) {
+                vendorUUs = "[".concat(vendorUUs);
+                vendorUUs = vendorUUs.concat("]");
+                List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+                System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
+                System.out.println("tender" + JSON.toJSONString(purchaseTender));
+                purchaseTenderService.publish(purchaseTender, vendUUs);
+            }
+        }
+        if (logger != null) {
+            logger.log("招标", "采购方招标单发布", "标题" + purchaseTender.getTitle()+ "企业uu" + SystemSession.getUser().getEnterprise().getUu());
         }
-        logger.log("招标", "采购方招标单发布", "标题" + purchaseTender.getTitle()+ "企业uu" + SystemSession.getUser().getEnterprise().getUu());
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
     /**
      * 作为采购方，保存招标单
      *
-     * @param tender
-     * @param vendUUs
-     * @return
+     * @param tender  招标单
+     * @param vendorUUs  所选供应商uu
+     *
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
     public ResponseEntity<String> saveTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        if (null != vendorUUs) {
-            vendorUUs = "[".concat(vendorUUs);
-            vendorUUs = vendorUUs.concat("]");
-            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
-            System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
-            System.out.println("tender" + JSON.toJSONString(purchaseTender));
-            purchaseTenderService.save(purchaseTender, vendUUs);
-        } else {
+        if (purchaseTender.getIfOpen() == Constant.YES) {
             purchaseTenderService.saveOpen(purchaseTender);
+        } else {
+            if (null != vendorUUs) {
+                vendorUUs = "[".concat(vendorUUs);
+                vendorUUs = vendorUUs.concat("]");
+                List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+                System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
+                System.out.println("tender" + JSON.toJSONString(purchaseTender));
+                purchaseTenderService.save(purchaseTender, vendUUs);
+            }
         }
         return new ResponseEntity<String>(HttpStatus.OK);
     }
@@ -118,9 +126,9 @@ public class PurchaseTenderController {
     /**
      * 供应商投标
      *
-     * @param enBaseInfo
-     * @param tenderItems
-     * @return
+     * @param enBaseInfo  投标企业信息
+     * @param tenderItems 投标明细
+     *
      */
     @RequestMapping(value = "/reply", method = RequestMethod.POST)
     @ResponseBody
@@ -130,7 +138,7 @@ public class PurchaseTenderController {
         List<SaleTenderItem> saleTenderItems = FlexJsonUtils.fromJsonArray(tenderItems, SaleTenderItem.class);
         EnterpriseBaseInfo vendor = FlexJsonUtils.fromJson(enBaseInfo, EnterpriseBaseInfo.class);
         List<Attach> saleTenderAttaches = new ArrayList<>();
-        if (attaches != null && attaches != "") {
+        if (attaches != null && !Objects.equals(attaches, "")) {
             attaches = "[".concat(attaches);
             attaches = attaches.concat("]");
             saleTenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
@@ -144,8 +152,8 @@ public class PurchaseTenderController {
     /**
      * 查看招标单
      *
-     * @param id
-     * @return
+     * @param id 招标单id
+     *
      */
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ResponseBody
@@ -157,14 +165,16 @@ public class PurchaseTenderController {
     /**
      * 公开招标转投标单
      *
-     * @param id
-     * @return
+     * @param id 招标单id
+     *
      */
     @RequestMapping(value = "/addItems/{id}", method = RequestMethod.POST)
     @ResponseBody
     public ResponseEntity<String> addTenderItemById(@PathVariable("id") Long id) {
         PurchaseTender purchaseTender = purchaseTenderService.addTenderItemById(id);
-        logger.log("我要投标", "供应商转投标单", "招标标题:" + purchaseTender.getTitle()+ "供应商企业" + SystemSession.getUser().getEnterprise().getEnName() + "供应商企业uu" + SystemSession.getUser().getEnterprise().getUu());
+        if (logger != null) {
+            logger.log("我要投标", "供应商转投标单", "招标标题:" + purchaseTender.getTitle()+ "供应商企业" + SystemSession.getUser().getEnterprise().getEnName() + "供应商企业uu" + SystemSession.getUser().getEnterprise().getUu());
+        }
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
@@ -211,8 +221,8 @@ public class PurchaseTenderController {
     /**
      * 招标方定标
      *
-     * @param json
-     * @return
+     * @param json 招标单json
+     *
      */
     @RequestMapping(value = "/decide", method = RequestMethod.POST)
     @ResponseBody
@@ -220,20 +230,24 @@ public class PurchaseTenderController {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(json, PurchaseTender.class);
         System.out.println("decide " + JSON.toJSONString(purchaseTender));
         purchaseTenderService.decide(purchaseTender);
-        logger.log("供应商投标", "供应商对招标单进行投标",  "标题" + purchaseTender.getTitle() + purchaseTender.getCode());
+        if (logger != null) {
+            logger.log("供应商投标", "供应商对招标单进行投标",  "标题" + purchaseTender.getTitle() + purchaseTender.getCode());
+        }
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
     /**
      * 作为供应商，查看收到的招标单（全部）
      *
-     * @param params
-     * @return
+     * @param params 分页参数
+     * @return Spage
      */
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getAllTenders(PageParams params, String searchFilter) {
-        logger.log("客户招标单", "查看客户发出的招标单（全部）");
+        if (logger != null) {
+            logger.log("客户招标单", "查看客户发出的招标单（全部）");
+        }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -243,7 +257,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        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);  // 现在公开的也在这个列表
@@ -254,13 +268,15 @@ public class PurchaseTenderController {
     /**
      * 作为供应商，查看收到的招标单（已结标）
      *
-     * @param params
-     * @return
+     * @param params 分页参数
+     * @return Sapge
      */
     @RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getDoneTenders(PageParams params, String searchFilter) {
-        logger.log("客户招标单", "查看客户发出的招标单（已结标）");
+        if (logger != null) {
+            logger.log("客户招标单", "查看客户发出的招标单（已结标）");
+        }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -270,7 +286,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -282,13 +298,15 @@ public class PurchaseTenderController {
     /**
      * 作为供应商，查看收到的招标单（待评标）
      *
-     * @param params
-     * @return
+     * @param params 分页参数
+     * @return 招标单Spage
      */
     @RequestMapping(params = RequestState.WAITING, method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getWaitingTenders(PageParams params, String searchFilter) {
-        logger.log("客户招标单", "查看客户发出的招标单（待评标）");
+        if (logger != null) {
+            logger.log("客户招标单", "查看客户发出的招标单（待评标）");
+        }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -298,7 +316,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -313,13 +331,15 @@ public class PurchaseTenderController {
     /**
      * 作为供应商，查看收到的招标单（待投标）
      *
-     * @param params
-     * @return
+     * @param params 分页参数
+     * @return 招标单Spage
      */
     @RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getTodoTenders(PageParams params, String searchFilter) {
-        logger.log("客户招标单", "查看客户发出的招标单（待投标）");
+        if (logger != null) {
+            logger.log("客户招标单", "查看客户发出的招标单（待投标）");
+        }
         System.out.println("params" + JSON.toJSONString(params));
         System.out.println("searchFilter" + JSON.toJSONString(searchFilter));
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
@@ -331,7 +351,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -344,13 +364,15 @@ public class PurchaseTenderController {
     /**
      * 作为供应商，查看收到的招标单（过期）
      *
-     * @param params
-     * @return
+     * @param params 分页参数
+     * @return 招标单Spage
      */
     @RequestMapping(params = RequestState.END, method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getEndTenders(PageParams params, String searchFilter) {
-        logger.log("客户招标单", "查看客户发出的招标单（已过期）");
+        if (logger != null) {
+            logger.log("客户招标单", "查看客户发出的招标单（已过期）");
+        }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -360,7 +382,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -374,18 +396,20 @@ public class PurchaseTenderController {
     /**
      * 作为供应商，查看平台开放招标单（全部）
      *
-     * @param params
-     * @return
+     * @param params 分页参数
+     * @return 招标单Spage
      */
     @RequestMapping(value = "/open", method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getAllOpenTenders(PageParams params, String searchFilter) {
-        logger.log("平台公开招标单", "查看平台公开招标单（全部）");
+        if (logger != null) {
+            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)));
+        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.YES);
@@ -475,7 +499,9 @@ public class PurchaseTenderController {
     @RequestMapping(value = "/purc", method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getMyAllTenders(PageParams params, String searchFilter) {
-        logger.log("招标单", "查看自己发出的招标单（全部）");
+        if (logger != null) {
+            logger.log("招标单", "查看自己发出的招标单（全部）");
+        }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -486,7 +512,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchPurcTenderIds(keyword, pageParams);
@@ -495,15 +521,13 @@ public class PurchaseTenderController {
     /**
      *  filter处理
      *
-     * @param filter
-     * @param pageParams
+     * @param filter 拦截器
+     * @param pageParams  分页参数
      */
     private void buildFilter(SearchFilter filter, com.uas.search.b2b.model.PageParams pageParams) {
         if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
             List<Object> list = new ArrayList<>();
-            for (Object object : filter.getDistribute()) {
-                list.add(object);
-            }
+            list.addAll(filter.getDistribute());
             pageParams.getFilters().put("pti_venduu", new MultiValue(list, true));
         }
     }
@@ -517,7 +541,9 @@ public class PurchaseTenderController {
     @RequestMapping(value = "/purc", params = RequestState.DONE, method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getMyDoneTenders(PageParams params, String searchFilter) {
-        logger.log("招标单", "查看自己发出的招标单（待评标）");
+        if (logger != null) {
+            logger.log("招标单", "查看自己发出的招标单（待评标）");
+        }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -528,7 +554,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -541,13 +567,15 @@ public class PurchaseTenderController {
     /**
      * 作为采购方，查看发出的招标单（待投标）
      *
-     * @param params
-     * @return
+     * @param params 参数
+     * @return 单据
      */
     @RequestMapping(value = "/purc", params = RequestState.TODO, method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getMyTodoTenders(PageParams params, String searchFilter) {
-        logger.log("招标单", "查看自己发出的招标单（待投标）");
+        if (logger != null) {
+            logger.log("招标单", "查看自己发出的招标单（待投标）");
+        }
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -558,7 +586,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -570,21 +598,23 @@ public class PurchaseTenderController {
     /**
      *  作为客户，查看发出的招标单（待发布）
      *
-     * @param params
-     * @param searchFilter
+     * @param params 参数
+     * @param searchFilter 搜索参数
      *
      */
     @RequestMapping(value = "/purc", params = RequestState.WAITING, method = RequestMethod.GET)
     @ResponseBody
     public SPage<PurchaseTender> getWaitingPTenders(PageParams params, String searchFilter) {
-        logger.log("招标单", "查看自己发出的招标单（待发布）");
+        if (logger != null) {
+            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)));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = userService.distribute();
@@ -600,7 +630,7 @@ public class PurchaseTenderController {
      /**
      * 招标附件上传
      *
-     * @return
+     * @return attach
      */
      @RequestMapping(value = "/addTenderAttach", method = RequestMethod.POST)
      @ResponseBody
@@ -611,7 +641,7 @@ public class PurchaseTenderController {
     /**
      * 投标附件上传
      *
-     * @return
+     * @return attach
      */
     @RequestMapping(value = "/addTenderItemAttach", method = RequestMethod.POST)
     @ResponseBody
@@ -622,8 +652,8 @@ public class PurchaseTenderController {
     /**
      * 查看最近指定招标
      *
-     * @param params
-     * @return
+     * @param params 参数
+     * @return List
      */
     @RequestMapping(value = "/latestTender", method = RequestMethod.GET)
     @ResponseBody
@@ -636,7 +666,7 @@ public class PurchaseTenderController {
     /**
      * 查看最近公开招标
      *
-     * @return
+     * @return 招标单List
      */
     @RequestMapping(value = "/latestOpenTender", method = RequestMethod.GET)
     @ResponseBody
@@ -649,7 +679,7 @@ public class PurchaseTenderController {
     /**
      *  删除在录入的单据
      *
-     * @param id
+     * @param id 招标单id
      */
     @RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -660,47 +690,49 @@ public class PurchaseTenderController {
     /**
      * 发布在录入单据
      *
-     * @param tender
-     * @return
+     * @param tender 招标单json
      */
     @RequestMapping(value = "/publishSaved", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
     public ResponseEntity<String> publishSavedTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        if (null != vendorUUs) {
-            vendorUUs = "[".concat(vendorUUs);
-            vendorUUs = vendorUUs.concat("]");
-            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
-            System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
-            System.out.println("tender" + JSON.toJSONString(purchaseTender));
-            purchaseTenderService.publishSaved(purchaseTender, vendUUs);
-        } else {
+        if (purchaseTender.getIfOpen() == Constant.YES) {
             purchaseTenderService.publishSavedOpen(purchaseTender);
+        } else {
+            if (null != vendorUUs) {
+                vendorUUs = "[".concat(vendorUUs);
+                vendorUUs = vendorUUs.concat("]");
+                List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+                purchaseTenderService.publishSaved(purchaseTender, vendUUs);
+            }
+        }
+        if (logger != null) {
+            logger.log("招标", "采购方招标单发布", "标题" + purchaseTender.getTitle()+ "企业uu" + SystemSession.getUser().getEnterprise().getUu());
         }
-        logger.log("招标", "采购方招标单发布", "标题" + purchaseTender.getTitle()+ "企业uu" + SystemSession.getUser().getEnterprise().getUu());
         return new ResponseEntity<String>(HttpStatus.OK);
     }
 
     /**
      * 更新在录入单据
      *
-     * @param tender
-     * @param vendorUUs
-     * @return
+     * @param tender 招标单
+     * @param vendorUUs 供应商uu
      */
     @RequestMapping(value = "/updateSaved", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
     public ResponseEntity<String> updateSavedTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        if (null != vendorUUs) {
-            vendorUUs = "[".concat(vendorUUs);
-            vendorUUs = vendorUUs.concat("]");
-            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
-            purchaseTenderService.updateSaved(purchaseTender, vendUUs);
-        } else {
+        if (purchaseTender.getIfOpen() == Constant.YES) { // 开放时进另外的方法
             purchaseTenderService.updateSavedOpen(purchaseTender);
+        } else {
+            if (null != vendorUUs) {
+                vendorUUs = "[".concat(vendorUUs);
+                vendorUUs = vendorUUs.concat("]");
+                List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+                purchaseTenderService.updateSaved(purchaseTender, vendUUs);
+            }
         }
         return new ResponseEntity<String>(HttpStatus.OK);
     }
@@ -708,8 +740,7 @@ public class PurchaseTenderController {
     /**
      * 删除对应产品明细
      *
-     * @param tenderProdId
-     * @return
+     * @param tenderProdId 招标产品明细id
      */
     @RequestMapping(value = "/deleteProd/{tenderProdId}", method = RequestMethod.POST)
     @ResponseBody
@@ -723,7 +754,6 @@ public class PurchaseTenderController {
      *
      * @param tender 招标单
      * @param vendUU 删除的投标单的供应商UU
-     * @return
      */
     @RequestMapping(value = "/removeSaleTender", method = RequestMethod.POST)
     @ResponseBody
@@ -736,7 +766,7 @@ public class PurchaseTenderController {
     /**
      * 删除单个附件
      *
-     * @param attachId
+     * @param attachId 附件id
      */
     @RequestMapping(value = "/removeAttach/{attachId}", method = RequestMethod.POST)
     public void deleteAttach(@PathVariable ("attachId") Long attachId) {
@@ -747,13 +777,15 @@ public class PurchaseTenderController {
     /**
      * 获取批量上传物料的模板
      *
-     * @return
+     * @return 返回上传结果
      */
     @RequestMapping(value = "/upload/template", method = RequestMethod.GET)
     public ModelAndView exportOrders() {
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/PurchaseTenderProd", "招标产品明细"));
-        logger.log("招标产品明细上传", "下载批量上传招标产品明细的模板");
+        if (logger != null) {
+            logger.log("招标产品明细上传", "下载批量上传招标产品明细的模板");
+        }
         return modelAndView;
     }
 
@@ -761,8 +793,8 @@ public class PurchaseTenderController {
     /**
      * 通过excel批量导入物料明细
      *
-     * @param uploadItem
-     * @return
+     * @param uploadItem 上传内容
+     * @return 结果
      */
     @RequestMapping(value = "/release/excel", method = RequestMethod.POST)
     @ResponseBody
@@ -786,7 +818,9 @@ public class PurchaseTenderController {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了招标产品明细，数量为" + map.size());
+        if (logger != null) {
+            logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了招标产品明细，数量为" + map.size());
+        }
         return map;
     }
 

src/main/java/com/uas/platform/b2b/event/PurchaseOrderReplyReleaseEvent.java

@@ -26,15 +26,15 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
      */
     @Override
     public PagingReleaseDetail release(PurchaseOrder orderAll) {
-        Long emUU = orderAll.getUserUU();
-        String emName = orderAll.getUser().getUserName();
-        Long enUU = orderAll.getEnUU();
+        Long emUU = orderAll.getVendUserUU();
+        String emName = orderAll.getVenduser();
+        Long enUU = orderAll.getVendUU();
         Date date = new Date();
         String codeValue = orderAll.getCode();
         String from = "B2B";
         String type = "回复采购订单";
         String title = "B2B商务提醒";
-        String context = orderAll.getEnterprise().getEnName() + "回复了采购单（" + codeValue + "）的交期，请及时确认！";
+        String context = orderAll.getReceiveName() + "的" + emName + "回复了采购单（" + codeValue + "）的交期，请及时确认！";
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
         Long vendUU = orderAll.getVendUU();
         Long vendUserUU = orderAll.getVendUserUU();

src/main/webapp/resources/js/index/app.js

@@ -11145,12 +11145,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         //     }
         // };
 
-        $scope.removeChecked = function() {
-            if ($scope.tenderProd.enterpriseBaseInfo.size > 0) {
-                $scope.tenderProd.enterpriseBaseInfo = [];
-            }
-        };
-
         // 查找供应商
         $scope.dbfindVendor = function(){
             var modalInstance = $modal.open({
@@ -11328,6 +11322,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             }
         };
 
+        // 切换为在平台公开招标时，清除掉已添加的供应商信息
+        $scope.removeChecked = function() {
+            if ($scope.tenderProd.enterpriseBaseInfo.size > 0) {
+                $scope.tenderProd.enterpriseBaseInfo = [];
+            }
+        };
+
         // 删除（在录入状态）
         $scope.deleteThis = function(id) {
             PurcTender.deleteOne({id:id}, {}, function(data) {
@@ -11536,7 +11537,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         $scope.filter = {};
         $scope.brandsTableParams = new ngTableParams({
             page : 1,
-            count : 5,
+            count : 6,
             sorting : {
                 nameCn: 'asc'
             }
@@ -12142,13 +12143,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         };
 
         $scope.validateProds = function(tenderProd) {
-            if (tenderProd.currentItem.cycle && tenderProd.currentItem.taxrate && tenderProd.currentItem.price) {
+            $scope.canSave = true;
+            if (tenderProd.currentItem.cycle || tenderProd.currentItem.taxrate || tenderProd.currentItem.price) {
                 var cycleRegex = /^\+?[1-9][0-9]*$/;
                 var taxrateRegex = /^\+?[0-9][0-9]{0,1}$/;
                 var priceRegex = /^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/; // 非零最多六位小数正实数
                 // /^(0|[0-9][0-9]{0,9})(\.[0-9]{1,6})?$/;
                 // 判断填写过的有为0或不符合正则式的，设置不能保存
-                if (!cycleRegex.test(tenderProd.currentItem.cycle) || !taxrateRegex.test(tenderProd.currentItem.taxrate) || !priceRegex.test(tenderProd.currentItem.price) && (Number(tenderProd.currentItem.cycle) !== 0 && Number(tenderProd.currentItem.taxrate) !== 0 && Number(tenderProd.currentItem.price) !== 0)) {
+                if (!cycleRegex.test(tenderProd.currentItem.cycle) || !taxrateRegex.test(tenderProd.currentItem.taxrate) || !priceRegex.test(tenderProd.currentItem.price)) {
                     $scope.canSave = false;
                 } else {
                     $scope.canSave = true;

src/main/webapp/resources/tpl/index/purc/modal/product_brandChoose_modal.html

@@ -1,8 +1,9 @@
 <style>
 .modal-dialog {
-    width: 435px;
+    width: 520px;
     margin: 30px auto;
 }
+
 table tr {
 	cursor: pointer;
 }