uas投标列表过滤条件修改

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

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -103,23 +103,20 @@ public class TenderController {
             if (null != attaches) {
                 attaches = URLDecoder.decode(attaches, "UTF-8");
                 List<Attach> saleTenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
-                tenderService.publishOrSave(purchaseTender, contactInfos, saleTenderAttaches);
+                return tenderService.publishOrSave(purchaseTender, contactInfos, saleTenderAttaches);
             } else {
-                tenderService.publishOrSave(purchaseTender, contactInfos, null);
+                return tenderService.publishOrSave(purchaseTender, contactInfos, null);
             }
 
         } else {
             if (null != attaches) {
                 attaches = URLDecoder.decode(attaches, "UTF-8");
                 List<Attach> saleTenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
-                tenderService.publishOrSave(purchaseTender, null, saleTenderAttaches);
+                return tenderService.publishOrSave(purchaseTender, null, saleTenderAttaches);
             } else {
-                tenderService.publishOrSave(purchaseTender, null, null);
+                return tenderService.publishOrSave(purchaseTender, null, null);
             }
         }
-        ModelMap map = new ModelMap();
-        map.put("success", false);
-        return map;
     }
 
     /**
@@ -238,8 +235,8 @@ public class TenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_auditstatus", Constant.YES); // 非已提交状态
+        map.put("st_ispublish", Constant.NO); // 已发布
         pageParams.setNotEqualFilters(map);
-        pageParams.getFilters().put("st_ispublish", Constant.YES); // 已发布
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu()); // 投标单属于本企业
         return searchService.erpSearchSaleTenderIds(keyword, pageParams);
     }
@@ -266,8 +263,8 @@ public class TenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_auditstatus", Constant.YES); // 非已提交状态
+        map.put("st_ispublish", Constant.NO); // 已发布
         pageParams.setNotEqualFilters(map);
-        pageParams.getFilters().put("st_ispublish", Constant.YES); // 已发布
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu()); // 投标单属于本企业
         pageParams.getFilters().put("st_status", "已结标");
         return searchService.erpSearchSaleTenderIds(keyword, pageParams);
@@ -295,8 +292,8 @@ public class TenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_auditstatus", Constant.YES); // 非已提交状态
+        map.put("st_ispublish", Constant.NO); // 已发布
         pageParams.setNotEqualFilters(map);
-        pageParams.getFilters().put("st_ispublish", Constant.YES); // 已发布
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu()); // 投标单属于本企业
         pageParams.getFilters().put("st_status", "已投标");
         return searchService.erpSearchSaleTenderIds(keyword, pageParams);

src/main/java/com/uas/platform/b2b/erp/service/impl/TenderServiceImpl.java

@@ -69,14 +69,14 @@ public class TenderServiceImpl implements TenderService {
      */
     @Override
     public ModelMap publishOrSave(PurchaseTender purchaseTender, List<TenderContactInfo> contactInfos, List<Attach> tenderAttaches) {
-        if (purchaseTender.getIsPublish() == Constant.YES) {
-            if (purchaseTender.getIfOpen() == Constant.YES) {
+        if (Constant.YES == purchaseTender.getIsPublish()) {
+            if (Constant.YES == purchaseTender.getIfOpen()) {
                 return publishOpen(purchaseTender, tenderAttaches);
             } else {
                 return publish(purchaseTender, contactInfos, tenderAttaches);
             }
         } else {
-            if (purchaseTender.getIfOpen() == Constant.YES) {
+            if (Constant.YES == purchaseTender.getIfOpen()) {
                 return saveOpen(purchaseTender, tenderAttaches);
             } else {
                 return  save(purchaseTender, contactInfos, tenderAttaches);