公开招标列表显示修改，投标时，修改投标单最后修改时间

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

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

@@ -625,6 +625,7 @@ public class TenderServiceImpl implements TenderService {
 //        saleTenderDao.save(saleTender);
         if (tenderItems.size() > 0) {
             saleTender.setStatus("已投标");
+            saleTender.setModified(new Date());
         }
         List<Attach> attachList = new ArrayList<>();
         for (Attach attach : attaches) {
@@ -673,6 +674,7 @@ public class TenderServiceImpl implements TenderService {
         SaleTender saleTender = saleTenderDao.findOne(saleTenderId);
         if (tenderItems.size() > 0) {
             saleTender.setStatus("已投标");
+            saleTender.setModified(new Date());
         }
         saleTenderDao.save(saleTender);
         if (tenderItems.size() > 0 ) {

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

@@ -177,7 +177,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.setCode(tender.getCode());
         this.setCertificate(tender.getCertificate());
         this.setCurrency(tender.getCurrency());
-        this.setDate(tender.getDate());
+        this.setDate(new Date());
         this.setEndDate(tender.getEndDate());
         this.setEnterprise(tender.getEnterprise());
         this.setIfOpen(tender.getIfOpen());
@@ -192,7 +192,6 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.setUser(tender.getUser());
         this.setUserTel(tender.getUserTel());
         this.setEnUU(tender.getEnUU());
-        this.setModified(new Date());
     }
 
     public SaleTender() {

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -734,13 +734,13 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 				tenderList.add(tender);
 			}
 		}
-		Integer totalElement = tenderList.size(); // 根据新的单据List修改页面参数
-		Integer totalPage = totalElement/idsPage.getSize();
-		if (totalPage < 1) {
-			totalPage = 1;
-		}
-		idsPage.setTotalElement(totalElement);
-		idsPage.setTotalPage(totalPage);
+//		Integer totalElement = tenderList.size(); // 根据新的单据List修改页面参数(这里只获取到第一页的数据，这样改有问题)
+//		Integer totalPage = totalElement/idsPage.getSize();
+//		if (totalPage < 1) {
+//			totalPage = 1;
+//		}
+//		idsPage.setTotalElement(totalElement);
+//		idsPage.setTotalPage(totalPage);
 		sortByProperty(tenderList, PurchaseTender.class, "id", idsPage.getContent());
 		return toSPage(idsPage, tenderList);
 	}

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

@@ -198,8 +198,8 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                 Predicate p2 = builder.equal(root.get("isPublish"), Constant.YES);
                 Predicate p3 = builder.notEqual(root.get("enUU"), SystemSession.getUser().getEnterprise().getUu());
                 Predicate p4 = builder.equal(root.get("overdue"), Constant.NO);
-                Predicate p5 = builder.equal(root.get("status"), "待投标");
-                Predicate predicate = builder.and(p1, p2, p3, p4, p5);
+//                Predicate p5 = builder.equal(root.get("status"), "待投标"); // 只要有人投标就变成了已投标
+                Predicate predicate = builder.and(p1, p2, p3, p4);
                 query.where(predicate);
                 return null;
             }
@@ -585,6 +585,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         SaleTenderItem item = saleTenderItemDao.findOne(tenderItems.get(0).getId());
         SaleTender saleTender = item.getSaleTender();
         saleTender.setStatus("已投标");
+        saleTender.setModified(new Date());
         Set<Attach> attachSet = new HashSet<>();
         attachSet.addAll(attaches);
         saleTender.setBidAttaches(attachSet);

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

@@ -13179,7 +13179,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         $scope.tableParams = new ngTableParams({
             page : 1,
-            count : 10,
+            count : 20,
             sorting: {
                 'tender.endDate': 'desc',
                 'tender.enterprise.enName': 'asc',
@@ -13187,7 +13187,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
         }, {
             total : 0,
-            counts: [10, 25, 50, 100],
+            counts: [],
             getData : function($defer, params) {
                 $scope.loading = true;
                 var pageParams = params.url();

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

@@ -3,6 +3,7 @@
     .top-nav {
         margin-bottom: 10px;
     }
+
     .top-nav #search_input {
         height: 36px;
         font-size: 16px;
@@ -32,7 +33,7 @@
 
     /* 选项菜单 招标单按钮*/
     .div-menu .text-num {
-        color: rgb(211,37,38);
+        color: rgb(211, 37, 38);
         padding: 0 5px;
     }
 
@@ -77,14 +78,16 @@
     .div-menu .btn-select:hover {
         border-bottom: 2px solid #D32526;
     }
+
     .div-menu .btn-select:focus {
         border-bottom: 2px solid #D32526;
     }
+
     .div-menu .btn-select:first-child {
         margin-left: 10px;
-     }
+    }
 
-    .div-menu>div:first-child .btn {
+    .div-menu > div:first-child .btn {
         font-size: 16px;
     }
 
@@ -92,35 +95,43 @@
     .tender-table {
         text-align: center;
     }
+
     .tender-table .header {
         height: 50px;
         background-color: #fff;
-        color: rgb(50,50,50);
+        color: rgb(50, 50, 50);
         border-bottom: 1px solid #969595;
     }
-    .tender-table .header>th {
+
+    .tender-table .header > th {
         text-align: center;
     }
-    .tender-table>tbody {
+
+    .tender-table > tbody {
         font-size: 14px;
         color: #323232;
         border: 1px solid transparent;
     }
-    .tender-table>tbody>tr:nth-child(odd) {
+
+    .tender-table > tbody > tr:nth-child(odd) {
         height: 100px;
     }
-    .tender-table tbody>tr:nth-child(odd):hover {
+
+    .tender-table tbody > tr:nth-child(odd):hover {
         border: 2px solid #D32526;
 
     }
+
     .tender-table tbody tr td a {
         color: #327ebe;
     }
-    .main-content  .btn-group{
+
+    .main-content .btn-group {
         font-family: "Microsoft YaHei", "微软雅黑";
         font-weight: 500;
     }
-    .main-content  .btn-group button{
+
+    .main-content .btn-group button {
         font-weight: inherit;
     }
 </style>
@@ -131,7 +142,8 @@
             <span>服务>销售模块></span><span style="color: #327EBE;">投标</span>
         </div>
         <div class="input-group search-group col-xs-4">
-            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入投标信息" />
+            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword"
+                   ng-search="onSearch()" placeholder="输入投标信息"/>
             <span class="input-group-btn">
             <button id="search_btn" class="btn btn-selected x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
         </span>
@@ -145,19 +157,23 @@
         <!-- 选项菜单和新增按钮 -->
         <div class="block">
             <div class="row div-menu">
-                <div class="col-xs-8" style="width: 766px; height: 40px; font-size: 16px; font-weight: 600; font-family: 'Microsoft Yahei Regular'; color: #000000;">
+                <div class="col-xs-8"
+                     style="width: 766px; height: 40px; font-size: 16px; font-weight: 600; font-family: 'Microsoft Yahei Regular'; color: #000000;">
                     <div class="btn-group menu-status">
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='all'}" ng-click="setActive('all')">全部</button>
+                                    ng-class="{'btn-selected':active=='all'}" ng-click="setActive('all')">全部
+                            </button>
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">待投标</button>
+                                    ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">待投标
+                            </button>
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='end'}" ng-click="setActive('end')">过期</button>
+                                    ng-class="{'btn-selected':active=='end'}" ng-click="setActive('end')">过期
+                            </button>
                         </div>
                     </div>
                     <div class="col-xs-1 pull-right" style="padding-top: 5px;">
@@ -229,14 +245,14 @@
         </div>
         <table class="tender-table block" ng-table="tableParams">
             <thead>
-                <tr class="header">
-                    <th width="150">招标标题</th>
-                    <th width="200">产品信息</th>
-                    <th width="150">采购数量</th>
-                    <th width="150">投标截止时间</th>
-                    <th width="150">公布结果时间</th>
-                    <th width="150">状态</th>
-                </tr>
+            <tr class="header">
+                <th width="150">招标标题</th>
+                <th width="200">产品信息</th>
+                <th width="150">采购数量</th>
+                <th width="150">投标截止时间</th>
+                <th width="150">公布结果时间</th>
+                <th width="150">状态</th>
+            </tr>
             <!-- <tr class="toolbar toolbar-top">
                  <td colspan="5">
                      <div>
@@ -266,29 +282,29 @@
             </thead>
             <tbody ng-if="tableParams.total() == 0">
             <tr>
-            <td colspan="6">
-            <div class="row text-muted info-container" style="padding: 50px 10px;">
-            <div class="col-md-4 text-center">
-            <br>
-            <br>
-            <div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-            <div class="f16">当前没有对应的公开招标单！</div>
-            </div>
-            <div class="col-md-8 br-l">
-            <div class="f16">
-            <p>为什么我没有接收到的公开招标单？</p>
-            </div>
-            <div class="f14">
-            <div class="info">
-            <p>还没有企业发布平台公开招标单<br>
-            解决：等待其他平台用户发布公开招标单</p>
-            </div>
-            </div>
-            <br>
-            <br>
-            </div>
-            </div>
-            </td>
+                <td colspan="6">
+                    <div class="row text-muted info-container" style="padding: 50px 10px;">
+                        <div class="col-md-4 text-center">
+                            <br>
+                            <br>
+                            <div><img src="static/img/all/info.png" width="130px" height="90px"></div>
+                            <div class="f16">当前没有对应的公开招标单！</div>
+                        </div>
+                        <div class="col-md-8 br-l">
+                            <div class="f16">
+                                <p>为什么我没有接收到的公开招标单？</p>
+                            </div>
+                            <div class="f14">
+                                <div class="info">
+                                    <p>还没有企业发布平台公开招标单<br>
+                                        解决：等待其他平台用户发布公开招标单</p>
+                                </div>
+                            </div>
+                            <br>
+                            <br>
+                        </div>
+                    </div>
+                </td>
             </tr>
             </tbody>
             <!--<tbody ng-repeat="order in $data track by order.id">
@@ -298,74 +314,74 @@
                 </tr>
             </tbody>-->
             <tbody ng-repeat="tender in $data">
-                <tr>
-                    <td width="150">
-                        <div>
-                            {{tender.code}}
-                        </div>
-                        <div>
-                            {{tender.title}}
-                        </div>
-                        <div ng-show="currentEn.uu != tender.enterprise.uu"><!-- 当前企业的公开招标不显示 -->
-                            <a ui-sref="sale.tender({id:tender.id})" target="_self" title="生成投标单">转投标单</a>
-                        </div>
-                        <div ng-show="currentEn.uu == tender.enterprise.uu">
-                            <div><Strong>当前企业发布</Strong></div>
-                            <a ui-sref="purc.evaluation({id:tender.id})" target="_self" title="查看详情">查看评标单</a>
-                        </div>
-                    </td>
-                    <td width="200">
-                        <div>产品名称：{{tender.prodTitle}}</div>
-                        <!--<div>产品规格：{{tender.prodSpec}}</div>-->
-                        <div>产品所属行业：电子元器件</div>
-                    </td>
-                    <td width="150">{{tender.qty}}</td>
-                    <td width="150">{{tender.endDate | date:'yyyy-MM-dd'}}</td>
-                    <td width="150">{{tender.publishDate | date:'yyyy-MM-dd'}}</td>
-                    <td width="150">
-                        <div ng-if="tender.status == '已结标' && tender.result == 1 && tender.applyVendor">
-                            <img src="static/img/tender/zhongbiao.png">
-                        </div>
-                        <div ng-if="tender.status == '已结标' && tender.result == 1 && !tender.applyVendor">
-                            <img src="static/img/tender/weizhongbiao.png">
-                        </div>
-                        <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && !tender.vendorHasBid">
-                            <img src="static/img/tender/liubiao.png">
-                        </div>
-                        <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && tender.vendorHasBid">
-                            <img src="static/img/tender/weizhongbiao.png">
-                        </div>
-                        <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && tender.vendorHasBid">
-                            <img src="static/img/tender/daipingbiao.png">
-                        </div>
-                        <div ng-if="tender.result == 0 && tender.overdue == 1">
-                            <img src="static/img/tender/daipingbiao.png">
-                        </div>
-                        <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && !tender.vendorHasBid">
-                            <img src="static/img/tender/liubiao.png">
-                        </div>
-                        <!--<div ng-if="tender.status == '待评标' && tender.overdue != 1">-->
-                        <!--<img src="static/img/tender/toubiaozhong.png">-->
-                        <!--</div>-->
-                        <!-- overdue与投标截止日期比较  result与公布结果日期比较 -->
-                        <div ng-if="tender.overdue != 1 && tender.vendorHasBid">
-                            <img src="static/img/tender/yitoubiao.png">
-                        </div>
-                        <div ng-if="tender.status == '待投标' && tender.overdue != 1 && !tender.vendorHasBid">
-                            <img src="static/img/tender/daitoubiao.png">
-                        </div>
-                        <div ng-if="tender.status == '待投标' && tender.overdue == 1">
-                            <img src="static/img/tender/liubiao.png">
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="6">
-                        <div style="height: 16px; background-color: #f5f5f5;">
-                            <!-- 间隙 -->
-                        </div>
-                    </td>
-                </tr>
+            <tr>
+                <td width="150">
+                    <div>
+                        {{tender.code}}
+                    </div>
+                    <div>
+                        {{tender.title}}
+                    </div>
+                    <div ng-show="currentEn.uu != tender.enterprise.uu"><!-- 当前企业的公开招标不显示 -->
+                        <a ui-sref="sale.tender({id:tender.id})" target="_self" title="生成投标单">转投标单</a>
+                    </div>
+                    <div ng-show="currentEn.uu == tender.enterprise.uu">
+                        <div><Strong>当前企业发布</Strong></div>
+                        <a ui-sref="purc.evaluation({id:tender.id})" target="_self" title="查看详情">查看评标单</a>
+                    </div>
+                </td>
+                <td width="200">
+                    <div>产品名称：{{tender.prodTitle}}</div>
+                    <!--<div>产品规格：{{tender.prodSpec}}</div>-->
+                    <div>产品所属行业：电子元器件</div>
+                </td>
+                <td width="150">{{tender.qty}}</td>
+                <td width="150">{{tender.endDate | date:'yyyy-MM-dd'}}</td>
+                <td width="150">{{tender.publishDate | date:'yyyy-MM-dd'}}</td>
+                <td width="150">
+                    <div ng-if="tender.status == '已结标' && tender.result == 1 && tender.applyVendor">
+                        <img src="static/img/tender/zhongbiao.png">
+                    </div>
+                    <div ng-if="tender.status == '已结标' && tender.result == 1 && !tender.applyVendor">
+                        <img src="static/img/tender/weizhongbiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && !tender.vendorHasBid">
+                        <img src="static/img/tender/liubiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result == 1 && tender.vendorHasBid">
+                        <img src="static/img/tender/weizhongbiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && tender.vendorHasBid">
+                        <img src="static/img/tender/daipingbiao.png">
+                    </div>
+                    <div ng-if="tender.result == 0 && tender.overdue == 1">
+                        <img src="static/img/tender/daipingbiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && !tender.vendorHasBid">
+                        <img src="static/img/tender/liubiao.png">
+                    </div>
+                    <!--<div ng-if="tender.status == '待评标' && tender.overdue != 1">-->
+                    <!--<img src="static/img/tender/toubiaozhong.png">-->
+                    <!--</div>-->
+                    <!-- overdue与投标截止日期比较  result与公布结果日期比较 -->
+                    <div ng-if="tender.overdue != 1 && tender.vendorHasBid">
+                        <img src="static/img/tender/yitoubiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待投标' && tender.overdue != 1 && !tender.vendorHasBid">
+                        <img src="static/img/tender/daitoubiao.png">
+                    </div>
+                    <div ng-if="tender.status == '待投标' && tender.overdue == 1">
+                        <img src="static/img/tender/liubiao.png">
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6">
+                    <div style="height: 16px; background-color: #f5f5f5;">
+                        <!-- 间隙 -->
+                    </div>
+                </td>
+            </tr>
             </tbody>
         </table>
     </div>