修改问题

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

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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.controller;
 
+import com.uas.platform.b2b.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -9,27 +10,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.uas.platform.b2b.service.AddPartnerService;
-import com.uas.platform.b2b.service.CartService;
-import com.uas.platform.b2b.service.MakeAcceptService;
-import com.uas.platform.b2b.service.MakeOrderChangeService;
-import com.uas.platform.b2b.service.MakeOrderService;
-import com.uas.platform.b2b.service.MakeReturnService;
-import com.uas.platform.b2b.service.PurchaseAcceptService;
-import com.uas.platform.b2b.service.PurchaseApBillService;
-import com.uas.platform.b2b.service.PurchaseBadInService;
-import com.uas.platform.b2b.service.PurchaseBadOutService;
-import com.uas.platform.b2b.service.PurchaseInquiryMouldService;
-import com.uas.platform.b2b.service.PurchaseInquiryService;
-import com.uas.platform.b2b.service.PurchaseMRBService;
-import com.uas.platform.b2b.service.PurchaseNoticeService;
-import com.uas.platform.b2b.service.PurchaseOrderChangeService;
-import com.uas.platform.b2b.service.PurchaseOrderService;
-import com.uas.platform.b2b.service.PurchaseProofingService;
-import com.uas.platform.b2b.service.PurchaseReturnService;
-import com.uas.platform.b2b.service.PurchaseTenderService;
-import com.uas.platform.b2b.service.SaleARCheckService;
-import com.uas.platform.b2b.service.SaleQuotationService;
 import com.uas.platform.b2b.support.SystemSession;
 
 /**
@@ -105,6 +85,9 @@ public class SnapshotController {
 	@Autowired
 	private PurchaseTenderService tenderService;
 
+	@Autowired
+	private PagingReleaseService pagingReleaseService;
+
 	/**
 	 * 统计待处理事项
 	 * 
@@ -173,6 +156,9 @@ public class SnapshotController {
 		modelMap.put("tenderTodo", tenderService.getTenderTodoCount());
 		modelMap.put("saleTenderTodo", tenderService.getSaleTenderTodoCount());
 		modelMap.put("saleTenderWaiting", tenderService.getSaleTenderWaitingCount());
+
+		// 消息
+		modelMap.put("messageToRead", pagingReleaseService.getToReadCount());
 		return modelMap;
 	}
 

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

@@ -246,6 +246,8 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
                         e.printStackTrace();
                     }
                 }
+                releaseDetail.setPushStatus(Constant.YES);
+                pagingReleaseDetailDao.save(releaseDetail);
             }
         }
     }

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

@@ -6,4 +6,10 @@ package com.uas.platform.b2b.service;
  */
 public interface PagingReleaseService {
 
+    /**
+     * 获取未读消息数量
+     *
+     * @return
+     */
+    Long getToReadCount();
 }

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

@@ -1,9 +1,9 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.model.PagingRelease;
+import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.service.PagingReleaseService;
-import com.uas.platform.core.model.PageInfo;
-import org.springframework.data.domain.Page;
+import com.uas.platform.b2b.support.SystemSession;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,4 +13,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class PagingReleaseServiceImpl implements PagingReleaseService {
 
+    @Autowired
+    private CommonDao commonDao;
+    /**
+     * 获取未读消息数量
+     *
+     * @return
+     */
+    @Override
+    public Long getToReadCount() {
+        Long count = commonDao.queryForObject(
+                "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + SystemSession.getUser().getUserUU() + " and prd.prd_venduu = " + SystemSession.getUser().getEnterprise().getUu() + " and prd.prd_readstatus = 0",
+                Long.class);
+        return count;
+    }
 }

src/main/webapp/WEB-INF/views/normal/index.html

@@ -34,7 +34,7 @@
 	<!-- header Start -->
 	<div class="height6">&nbsp;</div>
 	<div class="navbar navbar-inverse" id="header" ng-controller="MyCtrl">
-		<div class="container" style="padding: 0">
+		<div class="container" ng-controller="TodoCtrl" style="padding: 0">
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云"></a>
@@ -56,7 +56,7 @@
 				</ul>
 				<div id="home-headerBtns">
 					<a href="javascript:void(0);" class="moblie-btn"><i class="fa fa-tablet fa-lg"></i></a>
-					<a ng-click="showMessage()" title="查看消息" class="notice-dot"><i class="fa fa-comments-o fa-lg"></i><em></em></a>
+					<a ng-click="showMessage()" title="查看消息" ng-class="{'notice-dot': todo.messageToRead > 0}"><i class="fa fa-comments-o fa-lg"></i><em></em></a>
 					<a ui-sref="approvalflow.flow"><i class="fa fa-cog fa-lg"></i></a>
 					<a ng-click="logout()" title="退出登录"><i class="fa fa-power-off fa-lg"></i></a>
 				</div>

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

@@ -695,12 +695,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		};
 
 		$scope.showMessage = function() {
-            $rootScope.isOpen  = true;
             var $modalInstance = $modal.open({
                 templateUrl: 'static/tpl/index/home/pagingRelease.html',
                 controller: 'PagingReleaseCtrl'
             });
         };
+
 	}]);
 
     app.controller('PagingReleaseCtrl', ['$scope', 'PagingRelease', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', function($scope, PagingRelease, BaseService, ngTableParams, toaster, $modalInstance){
@@ -11100,7 +11100,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         $scope.removeChecked = function() {
             if ($scope.tenderProd.enterpriseBaseInfo.length > 0) {
-                $scope.tenderProd.enterpriseBaseInfo = [{}];
+                $scope.tenderProd.enterpriseBaseInfo = [];
             }
         };
 
@@ -11732,12 +11732,16 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                         params.total(page.totalElement);
                         $defer.resolve(page.content);
                         console.log(page.content);
+                        $scope.vendorHasBid = false; // 判断供应商是否已投标
                         // $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
                         angular.forEach(page.content, function(purcTender) {
                             angular.forEach(purcTender.purchaseTenderProds, function(tenderProd) {
                                 angular.forEach(tenderProd.saleTenderItems, function(saleTenderItem) {
                                     if ($scope.currentEn.uu === saleTenderItem.saleTender.vendUU) {
                                         tenderProd.currentItem = saleTenderItem;
+                                        if (saleTenderItem.price) { //TODO 如果存在当前企业的投标明细已投标，即判断为已投标
+                                            $scope.vendorHasBid = true;
+                                        }
                                     }
                                 });
                             });
@@ -11955,9 +11959,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         console.log($stateParams);
         PurcTender.getOne({id: $stateParams.id}, function(data){
             $scope.bid = data;
+            var vendUU = Number($stateParams.vendUU);
             angular.forEach(data.purchaseTenderProds, function(tenderProd) {
                 angular.forEach(tenderProd.saleTenderItems, function(saleTenderItem) {
-                    if (saleTenderItem.saleTender.vendUU == $stateParams.vendUU) {// 与传出的参数venUU相等，即为查看企业对应的明细
+                    if (saleTenderItem.saleTender.vendUU === vendUU) {// 与传出的参数venUU相等，即为查看企业对应的明细
                         tenderProd.currentItem = saleTenderItem;
                         $scope.saleTender = saleTenderItem.saleTender;
                         $scope.currentEnBaseInfo = saleTenderItem.saleTender.enterpriseBaseInfo;
@@ -11995,7 +12000,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         var sleep = function (d){
             for(var t = Date.now();Date.now() - t <= d;);
-        }
+        };
 
         AccountEnterprise.get({}, function(data){
             $scope.currentEn = data;

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

@@ -134,6 +134,11 @@
     .main-content .btn-group button {
         font-weight: inherit;
     }
+
+    .main-content .prod-notnum {
+        text-align: left;
+        padding-left: 20px;
+    }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div ng-controller="PurcTenderCtrl" id="public">
@@ -321,9 +326,9 @@
         <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="300">招标标题</th>
+                <th width="80">联系人</th>
+                <th width="100">联系电话</th>
                 <th width="150">投标截止时间</th>
                 <th width="150">公布结果时间</th>
                 <th width="150">状态</th>
@@ -389,32 +394,33 @@
             </tbody>-->
             <tbody ng-repeat="tender in $data">
             <tr>
-                <td width="150">
+                <td class="prod-notnum" width="300">
                     <div>
-                        <a ng-if="tender.isPublish == 1" ui-sref="purc.evaluation({id:tender.id})" target="_self"
-                           title="点击查看详情">
-                            {{tender.code}}
-                        </a>
-                        <a ng-if="tender.isPublish != 1" ui-sref="purc.savedtender({id:tender.id})" target="_self"
-                           title="点击查看详情">
-                            {{tender.code}}
-                        </a>
+                        标题：{{tender.title}}
                     </div>
                     <div>
-                        {{tender.title}}
+                        {{tender.code}}
                     </div>
                     <div>
                         招标类型:
                         <span ng-if="tender.ifOpen == 1" style="font-weight: 600;">公开招标</span>
                         <span ng-if="tender.ifOpen == 0" style="font-weight: 600;">指定招标</span>
                     </div>
+                    <div>
+                        <a ng-if="tender.isPublish == 1" ui-sref="purc.evaluation({id:tender.id})" target="_self"
+                           title="点击查看详情">
+                            查看详情
+                        </a>
+                        <a ng-if="tender.isPublish != 1" ui-sref="purc.savedtender({id:tender.id})" target="_self"
+                           title="点击查看详情">
+                            查看详情
+                        </a>
+                    </div>
                 </td>
-                <td width="200">
-                    <div>产品名称：{{tender.prodTitle}}</div>
-                    <!--<div>产品规格：{{tender.prodSpec}}</div>-->
-                    <div>产品所属行业：电子元器件</div>
+                <td class="prod-notnum" width="80">
+                    <div>{{tender.user}}</div>
                 </td>
-                <td width="150">{{tender.qty}}</td>
+                <td width="100">{{tender.userTel}}</td>
                 <td width="150">{{tender.endDate | date:'yyyy-MM-dd'}}</td>
                 <td width="150">{{tender.publishDate | date:'yyyy-MM-dd'}}</td>
                 <td width="150">
@@ -428,7 +434,7 @@
                         <img src="resources/img/tender/daipingbiao.png">
                     </div>
                     <div ng-if="(tender.status == '待评标' && tender.overdue != 1) || (tender.status == '待投标' && tender.overdue != 1)">
-                        <img src="resources/img/tender/toubiaozhong.png">
+                        <img src="resources/img/tender/daitoubiao.png">
                     </div>
                     <div ng-if="tender.status == '待发布'">
                         <img src="resources/img/tender/zailuru.png">

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

@@ -191,12 +191,12 @@
                        <div class="filter row">
                            <span>时间</span>
                            <div>
-                               <a ng-click="changeDateZone(-1)" title="" class="active">最新</a>
-                               <a ng-click="changeDateZone(7)" title="">一个星期内</a>
-                               <a ng-click="changeDateZone(1)" title="">一个月内</a>
-                               <a ng-click="changeDateZone(3)" title="">三个月内</a>
-                               <a ng-click="changeDateZone(6)" title="">半年内</a>
-                               <a ng-click="changeDateZone()" title="">一年内</a>
+                               <a ng-click="changeDateZone(-1)" title="" ng-class="{'active':condition.dateZone=='-1'}">最新</a>
+                               <a ng-click="changeDateZone(7)" title="" ng-class="{'active':condition.dateZone=='7'}">一个星期内</a>
+                               <a ng-click="changeDateZone(1)" title="" ng-class="{'active':condition.dateZone=='1'}">一个月内</a>
+                               <a ng-click="changeDateZone(3)" title="" ng-class="{'active':condition.dateZone=='3'}">三个月内</a>
+                               <a ng-click="changeDateZone(6)" title="" ng-class="{'active':condition.dateZone=='6'}">半年内</a>
+                               <a ng-click="changeDateZone()" title="" ng-class="{'active':condition.dateZone== null}">一年内</a>
                            </div>
                        </div>
                         <div class="filter row">

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

@@ -186,7 +186,7 @@
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='waiting'}" ng-click="setActive('waiting')">已投标
+                                    ng-class="{'btn-selected':active=='waiting'}" ng-click="setActive('waiting')">待评标
                             </button>
                         </div>
                         <div class="btn-group">
@@ -399,8 +399,11 @@
                     <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1">
                         <img src="resources/img/tender/daipingbiao.png">
                     </div>
-                    <div ng-if="(tender.status == '待评标' && tender.overdue != 1) || (tender.status == '待投标' && tender.overdue != 1)">
-                        <img src="resources/img/tender/toubiaozhong.png">
+                    <div ng-if="tender.overdue != 1 && vendorHasBid">
+                        <img src="resources/img/tender/yitoubiao.png">
+                    </div>
+                    <div ng-if="tender.overdue != 1 && !vendorHasBid">
+                        <img src="resources/img/tender/daitoubiao.png">
                     </div>
                     <div ng-if="tender.status == '待发布'">
                         <img src="resources/img/tender/zailuru.png">

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

@@ -1,4 +1,4 @@
-<!-- 投标单 -->
+<!-- 供应商查看投标单 -->
 <style>
 
     /* 标题 */
@@ -212,7 +212,7 @@
             <div class="list-unstyled">
                 <div class="com_head"><span>投标单</span></div>
             </div>
-            <div class="bid-content ng-scope" ng-controller="SaleTenderDetailCtrl">
+            <div class="bid-content ng-scope" ng-controller="SaleVendorTenderDetailCtrl">
                 <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
                     <span>基本信息</span>&nbsp;
                 </div>
@@ -306,8 +306,8 @@
                                     <span ng-bind="prod.qty"></span>
                                     <span ng-bind="prod.currentItem.cycle"></span>
                                     <span ng-bind="prod.currentItem.taxrate"></span>
-                                    <span ng-bind="prod.currentItem.price"></span>
-                                    <span ng-bind="prod.currentItem.price * prod.qty || ''"></span>
+                                    <span ng-bind="prod.currentItem.price|number:6"></span>
+                                    <span ng-bind="prod.currentItem.price * prod.qty || '' | number:2"></span>
                                 </dd>
                             </dl>
                         </div>