招标保存单据删除修改，

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

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

@@ -252,7 +252,7 @@ public class PurchaseTenderController {
     }
 
     /**
-     * 作为供应商，查看收到的招标单（已评标）
+     * 作为供应商，查看收到的招标单（已结标）
      *
      * @param params
      * @return
@@ -274,8 +274,8 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("pt_result", Constant.YES);
+//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
@@ -305,6 +305,7 @@ public class PurchaseTenderController {
 //        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("pt_overdue", Constant.YES);
         pageParams.getFilters().put("pt_result", Constant.NO);
+        pageParams.getFilters().put("pt_status", "待评标");
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
@@ -650,9 +651,10 @@ public class PurchaseTenderController {
      *
      * @param id
      */
-    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
-    public void deleteTender(@PathVariable("id") Long id) {
-        purchaseTenderService.delete(id);
+    @RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
+    @ResponseBody
+    public ModelMap deleteTender(@PathVariable("id") Long id) {
+        return purchaseTenderService.delete(id);
     }
 
     /**

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

@@ -102,7 +102,7 @@ public interface PurchaseTenderService {
      *  删除指定id招标单
      * @param id
      */
-    void delete(Long id);
+    ModelMap delete(Long id);
 
     /**
      * 根据id删除单个附件

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

@@ -53,8 +53,9 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     @Autowired
     private EnterpriseBaseInfoDao enterpriseBaseInfoDao;
 
-	@Autowired
-	private CommonDao commonDao;
+    @Autowired
+    private CommonDao commonDao;
+
     /**
      * 保存招标单
      *
@@ -85,7 +86,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         saveTenderItem(tender, vendUUs);
     }
 
-    private void saveTenderItem (PurchaseTender tender, List<Long> vendUUs) {
+    private void saveTenderItem(PurchaseTender tender, List<Long> vendUUs) {
 //        List<SaleTenderItem> saleTenderItems = new ArrayList<>();
         Set<PurchaseTenderProd> tenderProds = tender.getPurchaseTenderProds();
         for (PurchaseTenderProd tenderProd : tenderProds) {
@@ -117,7 +118,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     }
 
     @Override
-    public Attach addTenderAttaches(FileUpload uploadItem) throws Exception{
+    public Attach addTenderAttaches(FileUpload uploadItem) throws Exception {
         if (uploadItem.getFile() == null) {
             throw new Exception("没有附件");
         }
@@ -129,7 +130,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     }
 
     @Override
-    public Attach addTenderItemAttaches(FileUpload uploadItem) throws Exception{
+    public Attach addTenderItemAttaches(FileUpload uploadItem) throws Exception {
         if (uploadItem.getFile() == null) {
             throw new Exception("没有附件");
         }
@@ -171,7 +172,7 @@ 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.notEqual(root.get("status"), "待投标");
-                Predicate predicate = builder.and(p1,p2,p3,p4);
+                Predicate predicate = builder.and(p1, p2, p3, p4);
                 query.where(predicate);
                 return null;
             }
@@ -179,23 +180,40 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     }
 
     @Override
-    public void delete(Long id) {
+    public ModelMap delete(Long id) {
         PurchaseTender tender = purchaseTenderDao.findOne(id);
         if (null != tender) {
             List<SaleTender> saleTenders = saleTenderDao.findByEnUUAndCode(tender.getEnUU(), tender.getCode());
             if (!CollectionUtils.isEmpty(saleTenders)) {
                 for (SaleTender saleTender : saleTenders) {
                     if (!CollectionUtils.isEmpty(saleTender.getSaleTenderItems())) {
-                        saleTenderItemDao.delete(saleTender.getSaleTenderItems());
+                        for (SaleTenderItem saleTenderItem : saleTender.getSaleTenderItems()) {
+                            SaleTenderItem oldItem = saleTenderItemDao.findOne(saleTenderItem.getId());
+                            if (oldItem != null) {
+                                saleTenderItemDao.delete(oldItem);
+                            }
+                        }
+                    }
+                    SaleTender oldSaleTender = saleTenderDao.findOne(saleTender.getId());
+                    if (oldSaleTender != null) {
+                        saleTenderDao.delete(oldSaleTender);
                     }
                 }
-                saleTenderDao.delete(saleTenders);
             }
             if (!CollectionUtils.isEmpty(tender.getPurchaseTenderProds())) {
-                purchaseTenderProdDao.delete(tender.getPurchaseTenderProds());
+                for (PurchaseTenderProd tenderProd : tender.getPurchaseTenderProds()) {
+                    PurchaseTenderProd oldtenderProd = purchaseTenderProdDao.findOne(tenderProd.getId());
+                    if (oldtenderProd != null) {
+                        purchaseTenderProdDao.delete(oldtenderProd);
+                    }
+                }
+            }
+            PurchaseTender oldTender = purchaseTenderDao.findOne(tender.getId());
+            if (oldTender != null) {
+                purchaseTenderDao.delete(oldTender);
             }
-                purchaseTenderDao.delete(tender);
         }
+        return new ModelMap();
     }
 
     @Override
@@ -287,7 +305,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
             }
             SaleTenderItem tenderItem = new SaleTenderItem();
             // 找不到投标单主表才新建一个
-            SaleTender saleTender =  saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnterprise().getUu(), enBaseInfo.getUu(), tender.getCode());
+            SaleTender saleTender = saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnterprise().getUu(), enBaseInfo.getUu(), tender.getCode());
             if (null == saleTender) { // 不存在投标单说明未转投标单，进行新增投标单操作
                 saleTender = new SaleTender(tender);
                 saleTender.setVendUU(enBaseInfo.getUu()); // 投标单主表构造完毕
@@ -310,7 +328,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      */
     @Override
     public void publishSaved(PurchaseTender purchaseTender, List<Long> vendUUs) {
-        publishOrSave(purchaseTender, vendUUs , true , false);
+        publishOrSave(purchaseTender, vendUUs, true, false);
     }
 
     /**
@@ -320,7 +338,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      */
     @Override
     public void publishSavedOpen(PurchaseTender purchaseTender) {
-        publishOrSave(purchaseTender, null , true , true);
+        publishOrSave(purchaseTender, null, true, true);
     }
 
     /**
@@ -331,7 +349,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      */
     @Override
     public void updateSaved(PurchaseTender purchaseTender, List<Long> vendUUs) {
-        publishOrSave(purchaseTender, vendUUs , false , false);
+        publishOrSave(purchaseTender, vendUUs, false, false);
     }
 
     /**
@@ -341,7 +359,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      */
     @Override
     public void updateSavedOpen(PurchaseTender purchaseTender) {
-        publishOrSave(purchaseTender, null , false , false);
+        publishOrSave(purchaseTender, null, false, false);
     }
 
     /**
@@ -416,6 +434,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                         oldTenderProd.setProdTitle(tenderProd.getProdTitle());
                         oldTenderProd.setUnit(tenderProd.getUnit());
                         oldTenderProd.setQty(tenderProd.getQty());
+                        oldTenderProd.setSaleTenderItems(Collections.emptySet());
                         purchaseTenderProdDao.save(oldTenderProd);
                     } else { // 新增的
                         tenderProd.setTender(oldTender);
@@ -442,14 +461,15 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     }
 
     /**
-     *  根据供应商信息和招标单新增投标单
+     * 根据供应商信息和招标单新增投标单
+     *
      * @param tender
      * @param vendUUs
      * @param tenderProd
      */
     private void addSaleTender(PurchaseTender tender, List<Long> vendUUs, PurchaseTenderProd tenderProd) {
         List<Enterprise> vendors = new ArrayList<>();
-        for (Long vendUU: vendUUs) {
+        for (Long vendUU : vendUUs) {
             Enterprise vendor = enterpriseDao.findOne(vendUU);
             vendors.add(vendor);
         }
@@ -461,7 +481,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
             SaleTenderItem tenderItem = new SaleTenderItem();
             // 找不到投标单主表才新建一个,确保只有一个投标单
             if (tender.getEnUU() != null && enBaseInfo.getUu() != null && tender.getCode() != null) {
-                SaleTender saleTender =  saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnUU(), enBaseInfo.getUu(), tender.getCode());
+                SaleTender saleTender = saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnUU(), enBaseInfo.getUu(), tender.getCode());
                 if (null == saleTender) {
                     saleTender = new SaleTender(tender);
                     saleTender.setVendUU(enBaseInfo.getUu());
@@ -514,7 +534,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     /**
      * 投标
      *
-     *
      * @param tenderItems
      * @param enBaseInfo
      * @return
@@ -638,14 +657,14 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         }
     }
 
-	@Override
-	public Long getTenderTodoCount() {
-		Long count = commonDao.queryForObject(
-				"select count(*) from v$purc$tender pu left join sale$tender sa on sa.st_code = pu.pt_code and sa.st_enuu = pu.pt_enuu where pu.pt_ispublish = 1 and pu.pt_overdue = 0 and sa.st_venduu = "
-						+ SystemSession.getUser().getEnterprise().getUu(),
-				Long.class);
-		return count;
-	}
+    @Override
+    public Long getTenderTodoCount() {
+        Long count = commonDao.queryForObject(
+                "select count(*) from v$purc$tender pu left join sale$tender sa on sa.st_code = pu.pt_code and sa.st_enuu = pu.pt_enuu where pu.pt_ispublish = 1 and pu.pt_overdue = 0 and sa.st_venduu = "
+                        + SystemSession.getUser().getEnterprise().getUu(),
+                Long.class);
+        return count;
+    }
 
     /**
      * 待投标的招标单（采购）
@@ -669,7 +688,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     @Override
     public Long getSaleTenderWaitingCount() {
         Long count = commonDao.queryForObject(
-                "select count(*) from v$purc$tender pu where pu.pt_ispublish = 1 and pu.pt_overdue = 1 and pu.pt_result = 0 and pu.pt_enuu = "
+                "select count(*) from v$purc$tender pu where pu.pt_ispublish = 1 and pu.pt_overdue = 1 and pu.pt_result = 0 and pu.pt_status = '待评标' and pu.pt_enuu = "
                         + SystemSession.getUser().getEnterprise().getUu(),
                 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" ng-controller="TodoCtrl" style="padding: 0">
+		<div class="container" style="padding: 0">
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云"></a>
@@ -54,7 +54,7 @@
 						<input type="search" ng-model="keyword" placeholder=" 输入企业或器件" ng-search="search(keyword)"><a class="btn input-group-addon" ng-click="search(keyword)">搜索</a>
 					</div>
 				</ul>
-				<div id="home-headerBtns">
+				<div id="home-headerBtns" ng-controller="TodoCtrl">
 					<a href="javascript:void(0);" class="moblie-btn"><i class="fa fa-tablet fa-lg"></i></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>

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

@@ -127,10 +127,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/tender",
             templateUrl : "static/tpl/index/purc/tenderlist.html",
             controller : 'PurcTenderCtrl'
-        }).state('purc.done.tenderlist', {
+        }).state('purc.waiting.tenderlist', {
             url : "/tender",
             templateUrl : "static/tpl/index/purc/tenderlist.html",
             controller : 'PurcTenderCtrl'
+        }).state('purc.todo.tenderlist', {
+            url : "/tender/todo",
+            templateUrl : "static/tpl/index/purc/tenderlist.html",
+            controller : 'PurcTenderCtrl'
             /* 招标 */
         }).state('purc.tender', {
             url : "/addTender",
@@ -768,8 +772,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         };
 
         // 单选
-        $scope.checkOne = function(message) {
-            message.checked = true;
+        $scope.checkOne = function(vendor) {
+            vendor.checked = true;
+
+        };
+
+        // 单反选
+        $scope.unCheckOne = function(vendor) {
+            vendor.checked = false;
 
         };
 
@@ -1055,11 +1065,15 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		};
 	}]);
 	
-	app.controller('TodoCtrl', ['$scope', 'SnapshotService', 'BaseService', function($scope, SnapshotService, BaseService){
+	app.controller('TodoCtrl', ['$scope', 'SnapshotService', 'BaseService', '$rootScope', function($scope, SnapshotService, BaseService, $rootScope){
 		BaseService.scrollBackToTop();
 		SnapshotService.getTodo(function(data){
 			$scope.todo = data;
 		});
+		$scope.setTenderActive = function(active) {
+		    $rootScope.tenderActive = active;
+		    window.location.hash = '#/purc/tender';
+        }
 	}]);
 	
 	app.controller('TruckCtrl', ['$scope', '$rootScope', '$modal', 'SaleTruck', function($scope, $rootScope, $modal, SaleTruck){
@@ -10636,6 +10650,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
     app.controller('PurcTenderCtrl', ['$scope', '$filter', 'PurcTender', 'ngTableParams', 'toaster', 'BaseService', '$stateParams', '$modal', '$rootScope', function($scope, $filter, PurcTender, ngTableParams, toaster, BaseService, $stateParams, $modal, $rootScope) {
     	BaseService.scrollBackToTop();
     	$scope.active = 'done';
+    	if ($rootScope.tenderActive) {
+    	    $scope.active = $rootScope.tenderActive;
+        }
         $scope.dateZoneText = '不限';
         $scope.deliveryZoneText = '不限';
         $scope.condition = {dateZone: -1, deliveryZone: -1};
@@ -11283,7 +11300,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         // 删除（在录入状态）
         $scope.deleteThis = function(id) {
-            PurcTender.deleteOne({}, id, function() {
+            PurcTender.deleteOne({id:id}, {}, function(data) {
                 toaster.pop('info', '提示', '删除成功');
                 window.location.hash = '#/purc/tender';
             });

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

@@ -286,7 +286,7 @@ define([ 'ngResource'], function() {
             },
             deleteOne: {
                 url: 'tender/delete/:id',
-                method: 'POST',
+                method: 'DELETE',
                 params: {
                     id: 'id'
                 }

src/main/webapp/resources/tpl/index/home/pagingRelease.html

@@ -181,7 +181,8 @@
         <tbody>
         <tr ng-repeat="releaseDetail in $data">
             <td ng-hide="active == 'done'">
-                <input ng-model="releaseDetail.checked" name="checkbox" ng-click="checkOne(releaseDetail)" type="checkbox">
+                <input ng-model="releaseDetail.checked" name="checkbox" ng-show="!releaseDetail.checked" ng-click="checkOne(releaseDetail)" type="checkbox">
+                <input ng-model="releaseDetail.checked" name="checkbox" ng-show="releaseDetail.checked" ng-click="unCheckOne(releaseDetail)" type="checkbox">
             </td>
             <td>
                 <div>{{releaseDetail.pagingRelease.date | date:'yyyy-MM-dd HH:mm'}}</div>

src/main/webapp/resources/tpl/index/home/right.html

@@ -87,10 +87,10 @@
 										ng-class="{'text-inverse': todo.cartTodo>0}">{{todo.cartTodo ||
 											0}}</span>)
 								</a></li>
-								<li><a href="#/purc/tender">待评标的招标单(<span
+								<li><a ng-click="setTenderActive('done')" >待评标的招标单(<span
 										ng-class="{'text-inverse': todo.saleTenderWaiting>0}">{{todo.saleTenderWaiting ||
 										0}}</span>)</a></li>
-								<li><a href="#/purc/tender">待投标的招标单(<span
+								<li><a ng-click="setTenderActive('todo')">待投标的招标单(<span
 										ng-class="{'text-inverse': todo.saleTenderTodo>0}">{{todo.saleTenderTodo ||
 										0}}</span>)</a></li>
 							</ul>

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

@@ -169,8 +169,15 @@
     .tender-list02 .comment-oder-text ul li{width: 88%;margin: 0 auto;height: 30px;line-height: 30px;}
     .tender-list02 .comment-oder-text ul li span{width: 33.3333%;float: left;}
     .tender-list02 .comment-oder-text ul li span em,.comment-oder-text ul li span b{font-size: 14px;}
-    .tender-list02 .comment-oder-text ul li span em{width:110px;display: inline-block;}
-    .tender-list02 .comment-oder-text ul li span b{color: #959595;}
+    .tender-list02 .comment-oder-text ul li span em{width:70px;display: inline-block;}
+    .tender-list02 .comment-oder-text ul li span b{color: #959595;
+        width: 190px;
+        display: inline-block;
+        float: right;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
     .tender-list02 .comment-oder-list,.comment-oder-list dl{width: 100%;margin:0 auto;}
     .tender-list02 .comment-oder-list dl dt,.comment-oder-list dl dd{width: 100%;margin: 0 auto;border-bottom: #ccc 1px dashed;height: 50px;line-height: 50px;}
     .tender-list02 .comment-oder-list dl dt span.wid01{ text-align: left; padding-left: 30px;}

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

@@ -45,7 +45,7 @@
         </thead>
         <tbody>
         <tr ng-repeat="vendor in $data">
-            <td class="text-center">{{$index}}</td>
+            <td class="text-center">{{$index + 1}}</td>
             <td class="text-center" ng-bind="::vendor.vendorEnterprise.uu"></td>
             <td class="text-center" ng-bind="::vendor.vendorEnterprise.enName"></td>
             <td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>

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

@@ -181,7 +181,7 @@
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">已评标
+                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">已结标
                             </button>
                         </div>
                         <div class="btn-group">