招标问题修改;添加供应商之后添加合作伙伴修改。

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

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

@@ -36,7 +36,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.Objects;
 
 /**
  * 招标单
@@ -397,6 +400,67 @@ public class PurchaseTenderController {
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
+    /**
+     * 作为供应商，查看收到的招标单（已投标）--不搜索
+     *
+     * @param params 分页参数
+     * @return 招标单Spage
+     */
+    @RequestMapping(value = "/info", params = RequestState.DONE, method = RequestMethod.GET)
+    @ResponseBody
+    public SPage<PurchaseTender> getDoneTendersInfo(PageParams params, String searchFilter) {
+        if (logger != null) {
+            logger.log("客户招标单", "查看客户发出的招标单（已投标）");
+        }
+        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        SearchFilter disfilter = userService.distribute();
+        if (disfilter != null && disfilter.getDistribute() == null) {
+            return null;
+        }
+        if (disfilter != null && !org.springframework.util.CollectionUtils.isEmpty(disfilter.getDistribute())) {
+            List<Object> list = new ArrayList<>();
+            list.addAll(disfilter.getDistribute());
+            filter.setDistribute(list);
+        }
+        PageInfo pageInfo = new PageInfo(params);
+        pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+        pageInfo.filter("isPublish", Constant.YES);
+        pageInfo.filter("overdue", Constant.NO);
+        pageInfo.filter("status", "已投标");
+        return purchaseTenderService.findAllBySaleTenderPageInfo(pageInfo, filter);
+    }
+
+
+    /**
+     * 作为供应商，查看收到的招标单（待投标）--不搜索
+     *
+     * @param params 分页参数
+     * @return 招标单Spage
+     */
+    @RequestMapping(value = "/info", params = RequestState.TODO, method = RequestMethod.GET)
+    @ResponseBody
+    public SPage<PurchaseTender> getTodoTendersInfo(PageParams params, String searchFilter) {
+        if (logger != null) {
+            logger.log("客户招标单", "查看客户发出的招标单（待投标）");
+        }
+        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        SearchFilter disfilter = userService.distribute();
+        if (disfilter != null && disfilter.getDistribute() == null) {
+            return null;
+        }
+        if (disfilter != null && !org.springframework.util.CollectionUtils.isEmpty(disfilter.getDistribute())) {
+            List<Object> list = new ArrayList<>();
+            list.addAll(disfilter.getDistribute());
+            filter.setDistribute(list);
+        }
+        PageInfo pageInfo = new PageInfo(params);
+        pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+        pageInfo.filter("isPublish", Constant.YES);
+        pageInfo.filter("overdue", Constant.NO);
+        pageInfo.filter("status", "待投标");
+        return purchaseTenderService.findAllBySaleTenderPageInfo(pageInfo, filter);
+    }
+
 
 //    /**
 //     * 作为供应商，查看平台开放招标单（待评标）

src/main/java/com/uas/platform/b2b/dao/PagingReleaseDetailDao.java

@@ -68,4 +68,13 @@ public interface PagingReleaseDetailDao extends JpaRepository<PagingReleaseDetai
      */
     @Query("select count(*) from PagingReleaseDetail o where o.vendUU = :vendUU and o.vendUserUU = :userUU and o.readStatus = 0")
     Integer GetToReadCountByVendUserUUAndVendUU(Long userUU, Long vendUU);
+
+    /**
+     * 将消息设置成已推送
+     *
+     * @param ids
+     */
+    @Modifying@Transactional
+    @Query("update PagingReleaseDetail o set o.pushStatus = 1 where o.id in :ids")
+    void setPushedByIds(@Param("ids") Object[] ids);
 }

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

@@ -87,9 +87,11 @@ public class RelationshipController {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(enuu);
 		Enterprise enEnterprise = enterpriseDao.findOne(enuu);
+		vendor.setMyEnterprise(enEnterprise);
 		vendor.setMyUserUU(enEnterprise.getEnAdminuu());
 		Enterprise vendEnterprise = enterpriseDao.findOne(enuu);
 		vendor.setVendEnUU(venduu);
+		vendor.setVendorEnterprise(vendEnterprise);
 		vendor.setVendUserUU(vendEnterprise.getEnAdminuu());
 		vendor.setVendswitch(Constant.YES);
 		vendor.setCustswitch(Constant.YES);

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

@@ -162,6 +162,7 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 	private Vendor addVendor(PurchaseInquiryMould purchaseInquiryMould) {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
+		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 		if (purchaseInquiryMould.getUseruu() != null && purchaseInquiryMould.getUseruu() != 0) {
 			vendor.setMyUserUU(purchaseInquiryMould.getUseruu());
 		} else {

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

@@ -190,6 +190,7 @@ public class InquiryServiceImpl implements InquiryService {
 			vendor.setMyUserUU(SystemSession.getUser().getUserUU());
 		}
 		vendor.setMyUserUU(SystemSession.getUser().getUserUU());
+		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 		Enterprise vendEnterprise = enterpriseDao.findOne(inquiryItem.getVendUU());
 		if (vendEnterprise != null) {
 			vendor.setVendorEnterprise(vendEnterprise);

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

@@ -109,6 +109,7 @@ public class MakeServiceImpl implements MakeService {
 				throw new IllegalArgumentException("委外订单增加供应商错误，供应商UU号参数错误");
 			Vendor vendor = new Vendor();
 			vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
+			vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 			vendor.setVendEnUU(vend.getUu());
 			vendor.setMyUserUU(SystemSession.getUser().getUserUU());
 			vendor.setVendUserUU(vend.getEnAdminuu());

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

@@ -186,6 +186,7 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 		if (enterprise != null) {
 			Vendor vendor = new Vendor();
 			vendor.setMyEnUU(forecastItem.getOrder().getEnUU());
+			vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 			if (forecastItem.getOrder().getUserUU() != null
 					&& userDao.findOne(forecastItem.getOrder().getUserUU()) != null)
 				vendor.setMyUserUU(forecastItem.getOrder().getUserUU());

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

@@ -125,6 +125,7 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 			Vendor vendor = new Vendor();
 			vendor.setMyEnUU(proofingItem.getProofing().getEnUU());
 			vendor.setMyUserUU(SystemSession.getUser().getUserUU());
+			vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 			vendor.setVendorEnterprise(enterprise);
 			vendor.setVendEnUU(enterprise.getUu());
 			if (proofingItem.getVendUserUU() != null) {

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

@@ -138,6 +138,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 	private Vendor addVendor(PurchaseOrderInfo order) {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(order.getEnUU());
+		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 		// 买方用户（联系人）
 		// 1、单据存在买方用户UU号：买方企业存在对应uu号的用户，设为该用户；买方企业不存在对应uu号的用户，供应商和单据设为当前用户(管理员)
 		// 2、单据不存在买方用户UU号：供应商和单据设为当前用户(管理员)

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

@@ -170,6 +170,7 @@ public class QuotationServiceImpl implements QuotationService {
 			if (cust != null) {
 				vendor.setVendEnUU(vendUU);
 				vendor.setMyEnUU(custUU);
+				vendor.setMyEnterprise(cust);
 				if (custUserUU != null) {// 买方用户UU号存在且有效，既保留，否则设为买方企业的管理员UU号
 					List<User> custUsers = userDao.findByEnUUAndUserUU(custUU, custUserUU);
 					if (CollectionUtils.isEmpty(custUsers)) {

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

@@ -659,6 +659,7 @@ public class TenderServiceImpl implements TenderService {
         if (enterprise != null) {
             Vendor vendor = new Vendor();
             vendor.setMyEnUU(saleTender.getEnUU());
+            vendor.setMyEnterprise(saleTender.getEnterprise());
             vendor.setMyUserUU(saleTender.getRecorderuu());
             vendor.setVendorEnterprise(enterprise);
             vendor.setVendEnUU(enterprise.getUu());

src/main/java/com/uas/platform/b2b/mobile/service/impl/MobileReleaseServiceImpl.java

@@ -216,7 +216,7 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
 
     @Override
     public void pushReleases(List<PagingReleaseDetail> pagingReleaseDetails) {
-        List<PagingReleaseDetail> details = new ArrayList<>();
+        List<Long> detailIds = new ArrayList<>();
         Set<Long> userUUs = new HashSet<>();
         for (PagingReleaseDetail releaseDetail : pagingReleaseDetails) {
             // 推送消息同一个人只推一次
@@ -247,10 +247,14 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
                     }
                 }
             }
-            releaseDetail.setPushStatus(Constant.YES);
-            details.add(releaseDetail);
+            if (null != releaseDetail.getId()) {
+                releaseDetail.setPushStatus(Constant.YES);
+                detailIds.add(releaseDetail.getId());
+            }
+        }
+        if (!CollectionUtils.isEmpty(detailIds)) {
+            pagingReleaseDetailDao.setPushedByIds(detailIds.toArray());
         }
-        pagingReleaseDetailDao.save(details);
     }
 
 }

src/main/java/com/uas/platform/b2b/model/PurchaseTender.java

@@ -107,7 +107,6 @@ public class PurchaseTender implements Serializable {
     @Column(name = "pt_status")
     private String status;
 
-
     /**
      * 币别
      */
@@ -246,8 +245,6 @@ public class PurchaseTender implements Serializable {
         this.useruu = useruu;
     }
 
-    @JsonIgnore
-    @JSONField(serialize = false)
     public UserBaseInfo getUserInfo() {
         return userInfo;
     }

src/main/java/com/uas/platform/b2b/model/SaleTender.java

@@ -31,7 +31,7 @@ import com.uas.platform.b2b.temporary.model.TenderContactInfo;
  * Created by dongbw on 17/03/07 11:16.
  */
 
-@Table(name = "sale$tender")
+@Table(name = "v$sale$tender_b2b")
 @Entity
 public class SaleTender implements Serializable, Comparable<SaleTender> {
 
@@ -211,7 +211,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     /**
      * 投标企业基本信息
      */
-    @OneToOne(cascade = CascadeType.REFRESH)
+    @OneToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "st_venduu", insertable = false, updatable = false)
     private EnterpriseBaseInfo enterpriseBaseInfo;
 
@@ -227,6 +227,20 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     @Column(name = "st_ptid")
     private Long ptId;
 
+    /**
+     * 是否已过期，根据enddate判断，为视图虚拟列 0 未过期，1已过期
+     * @param tender
+     */
+    @Column(name = "st_overdue", insertable = false, updatable = false)
+    private Short overdue;
+
+    /**
+     * 是否已过期，根据publishdate判断，为视图虚拟列 0 未公布，1已公布
+     * @param tender
+     */
+    @Column(name = "st_result", insertable = false, updatable = false)
+    private Short result;
+
     public SaleTender(PurchaseTender tender) {
         this.setCode(tender.getCode());
         this.setCertificate(tender.getCertificate());
@@ -526,4 +540,20 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     public void setPtId(Long ptId) {
         this.ptId = ptId;
     }
+
+    public Short getOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(Short overdue) {
+        this.overdue = overdue;
+    }
+
+    public Short getResult() {
+        return result;
+    }
+
+    public void setResult(Short result) {
+        this.result = result;
+    }
 }

src/main/java/com/uas/platform/b2b/service/PurchaseTenderService.java

@@ -201,4 +201,6 @@ public interface PurchaseTenderService {
     void setReadByOrder(String category, Long[] sourceId);
 
     SPage<PurchaseTender> findAllByPageInfo(PageInfo pageInfo, SearchFilter filter);
+
+    SPage<PurchaseTender> findAllBySaleTenderPageInfo(PageInfo pageInfo, SearchFilter filter);
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -810,5 +810,34 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         tenderSPage.setTotalPage(tenders.getTotalPages());
         return tenderSPage;
     }
+
+    @Override
+    public SPage<PurchaseTender> findAllBySaleTenderPageInfo(final PageInfo pageInfo, SearchFilter filter) {
+        SPage<PurchaseTender> tenderSPage = new SPage<>();
+        List<Long> tenderIds = new ArrayList<>();
+        if (filter != null) {
+            if (filter.getFromDate() != null)
+                pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+            if (filter.getEndDate() != null)
+                pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+        }
+        org.springframework.data.domain.Page<SaleTender> saleTenderPage = saleTenderDao.findAll(new Specification<SaleTender>() {
+            public Predicate toPredicate(Root<SaleTender> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+                return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+            }
+        }, pageInfo);
+        for (SaleTender saleTender : saleTenderPage.getContent()) {
+            if (null != saleTender.getPtId()) {
+                tenderIds.add(saleTender.getPtId());
+            }
+        }
+        List<PurchaseTender> purchaseTenders = purchaseTenderDao.findAll(tenderIds);
+        tenderSPage.setContent(purchaseTenders);
+        tenderSPage.setPage(saleTenderPage.getNumber());
+        tenderSPage.setSize(saleTenderPage.getSize());
+        tenderSPage.setTotalElement(saleTenderPage.getTotalElements());
+        tenderSPage.setTotalPage(saleTenderPage.getTotalPages());
+        return tenderSPage;
+    }
 }
 

src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -58,6 +58,7 @@ public class VendorsServiceImpl implements VendorService {
 	@Override
 	public Vendor addVendor(Vendor vendor) {
 		vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
+		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 		Vendor vendor1 = vendorDao.save(vendor);
 		addPartnerShipRecord(vendor1); // 添加合作伙伴关系
 		return vendor1;

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

@@ -891,7 +891,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     // endDate: getDateTime($scope.condition.dateTo)
                 };
                 // AccountEnterprise.get({}, function(data){
-                //     $scope.loading = false;
                 //     $scope.currentEn = data;
                 // });
                 getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
@@ -4777,7 +4776,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     endDate: getDateTime($scope.condition.dateTo)
                 };
 //                AccountEnterprise.get({}, function(data){
-//                    $scope.loading = false;
 //                    $scope.currentEn = data;
 //                });
                 PurchaseInquiry.publicInquiryItem.call(null, BaseService.parseParams(pageParams), function (page) {
@@ -4831,7 +4829,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 当前企业
         AccountEnterprise.get({}, function (data) {
-            $scope.loading = false;
             $scope.enterprise = data;
         });
 
@@ -17494,16 +17491,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
         var getService = function () {
-            return PurcTender;
+            if ($scope.searchStatus) {
+                return PurcTender;
+            }
+            return PurcTenderInfo;
         };
 
         $scope.tableParams = new ngTableParams({
             page: 1,
             count: 20,
             sorting: {
-                'tender.endDate': 'desc',
-                'tender.enterprise.enName': 'asc',
-                'tender.code': 'asc'
+                'id': 'desc'
             }
         }, {
             total: 0,
@@ -17519,7 +17517,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     endDate: getDateTime($scope.condition.dateTo)
                 };
                 AccountEnterprise.get({}, function (data) {
-                    $scope.loading = false;
                     $scope.currentEn = data;
                 });
                 getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
@@ -17615,6 +17612,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 搜索框回车
         $scope.onSearch = function () {
+            $scope.searchStatus = true;
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
@@ -17741,7 +17739,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     endDate: getDateTime($scope.condition.dateTo)
                 };
                 AccountEnterprise.get({}, function (data) {
-                    $scope.loading = false;
                     $scope.currentEn = data;
                 });
                 PurcTender[getOpenState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
@@ -19676,7 +19673,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         var loadAccount = function () {
             AccountEnterprise.get({}, function (data) {
-                $scope.loading = false;
                 $scope.enterprise = data;
                 $scope.purcStatus = $scope.enterprise.prodpurc;
             });

src/main/webapp/resources/js/index/services/Purc.js

@@ -416,6 +416,35 @@ define([ 'ngResource'], function() {
             },
             getOpenAll: {
                 url: 'tender/open'
+            },
+            getAll: {
+            },
+            getEnd: {
+                params: {
+                    _state: 'end'
+                }
+            },
+            getWaiting: {
+                params: {
+                    _state: 'waiting'
+                }
+            },
+            getDone: {
+                url: 'tender/info',
+                params: {
+                    _state: 'done'
+                }
+            },
+            getTodo: {
+                url: 'tender/info',
+                params: {
+                    _state: 'todo'
+                }
+            },
+            getInvalid: {
+                params: {
+                    _state: 'invalid'
+                }
             }
         });
     }]).factory('PurcTender', ['$resource', function($resource) {

src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -152,12 +152,12 @@
     }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
+<div class="loading in" ng-class="{'in': loading}">
+    <i></i>
+</div>
 <div id="public">
     <!-- 顶部导航及搜索框 -->
     <div class="block main-content">
-        <div class="loading in" ng-class="{'in': loading}">
-            <i></i>
-        </div>
         <div class="pub-com_head">
             <span>采购招标</span>
             <div class="p-right">

src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -196,6 +196,9 @@
     }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
+<div class="loading in" ng-class="{'in': loading}">
+    <i></i>
+</div>
 <div id="public">
     <!-- 顶部导航及搜索框 -->
     <div class="pub-com_head">
@@ -241,9 +244,6 @@
         </div>
     </div>
     <div class="block main-content">
-        <div class="loading in" ng-class="{'in': loading}">
-        <i></i>
-        </div>
         <!-- 选项菜单和新增按钮 -->
         <div class="block">
             <div class="condition block">