获取消息详情接口修改

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

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

@@ -99,10 +99,29 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
 
     @Override
     public ModelMap getReleaseDetails(Long vendUseruu, Long venduu, String type) {
+//        ModelMap map = new ModelMap();
+//        String countSql = "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type = '" + type + "' and prd.prd_status = 0";
+//        Integer allCount = commonDao.queryForObject(countSql, Integer.class);
+//        String idSql = "select pr.pr_id from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type = '" + type + "' and prd.prd_status = 0";
+//        List<Integer> ids = commonDao.queryForList(idSql, Integer.class);
+//        String idString = "";
+//        for (Integer id : ids) {
+//            if (!"".equals(idString)) {
+//                idString = idString.concat(",");
+//            }
+//            idString = idString.concat(String.valueOf(id));
+//        }
+//        String releaseSql = "select pr.pr_id id,pr.pr_emname releaser,pr.pr_date createTime,pr.pr_context subTitle,pr.pr_title title from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type= '" + type + "' and prd.prd_status = 0 order by pr.pr_date desc";
+//        List<ReleaseDetail> releaseDetailList = commonDao.query(releaseSql, ReleaseDetail.class);
+//        map.put("allCount", allCount);
+//        map.put("success", true);
+//        map.put("ids", idString);
+//        map.put("listdata", releaseDetailList);
+//        return map;
         ModelMap map = new ModelMap();
-        String countSql = "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type = '" + type + "' and prd.prd_status = 0";
+        String countSql = "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and prd.prd_status = 0";
         Integer allCount = commonDao.queryForObject(countSql, Integer.class);
-        String idSql = "select pr.pr_id from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type = '" + type + "' and prd.prd_status = 0";
+        String idSql = "select pr.pr_id from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and prd.prd_status = 0";
         List<Integer> ids = commonDao.queryForList(idSql, Integer.class);
         String idString = "";
         for (Integer id : ids) {
@@ -111,43 +130,7 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
             }
             idString = idString.concat(String.valueOf(id));
         }
-//        String idSql = "select pr.pr_id from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type = " + type + " and prd.prd_status == 0;";
-//        List<Integer> ids = commonDao.queryForList(idSql, Integer.class);
-//        String idString = new String();
-//        for (Integer id : ids) {
-//            if (!"".equals(idString)) {
-//                idString = idString.concat(",");
-//            }
-//            idString = idString.concat(String.valueOf(id));
-//        }
-//        List<PagingReleaseDetail> detailList = pagingReleaseDetailDao.findAll(new Specification<PagingReleaseDetail>() {
-//            @Override
-//            public Predicate toPredicate(Root<PagingReleaseDetail> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-//                cb.equal(root.get("status"), Constant.NO);
-//                return query.getRestriction();
-//            }
-//        });
-//        final Set<Long> ids = new HashSet<>();
-//        for (PagingReleaseDetail detail : detailList) {
-//            ids.add(detail.getPagingRelease().getId());
-//        }
-//        List<PagingRelease> pagingReleaseList = pagingReleaseDao.findAll(new Specification<PagingRelease>() {
-//            @Override
-//            public Predicate toPredicate(Root<PagingRelease> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-//                Predicate p1 = root.get("id").in(ids.toArray());
-//                Predicate p2 = cb.equal(root.get("emUU"), emuu);
-//                Predicate p3 = cb.equal(root.get("enUU"), enuu);
-//                Predicate p = cb.and(p1,cb.and(p2,p3));
-//                query.where(p);
-//                return query.getRestriction();
-//            }
-//        });
-//        List<ReleaseDetail> releaseDetailList = new ArrayList<>();
-//        for (PagingRelease release : pagingReleaseList) {
-//            ReleaseDetail releaseDetail = new ReleaseDetail(release.getId(), release.getUser().getUserName(), release.getDate(), release.getContext(), release.getTitle());
-//            releaseDetailList.add(releaseDetail);
-//        }
-        String releaseSql = "select pr.pr_id id,pr.pr_emname releaser,pr.pr_date createTime,pr.pr_context subTitle,pr.pr_title title from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and pr.pr_type= '" + type + "' and prd.prd_status = 0 order by pr.pr_date desc";
+        String releaseSql = "select pr.pr_id id,pr.pr_emname releaser,pr.pr_date createTime,pr.pr_context subTitle,pr.pr_title title from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and prd.prd_status = 0 order by pr.pr_date";
         List<ReleaseDetail> releaseDetailList = commonDao.query(releaseSql, ReleaseDetail.class);
         map.put("allCount", allCount);
         map.put("success", true);
@@ -175,33 +158,6 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
         return map;
     }
 
-//    @Override
-//    public ResponseEntity<ModelMap> pushRelease(Long vendUseruu, Long venduu) throws Exception {
-//        List<PagingReleaseDetail> releaseDetailList = pagingReleaseDetailDao.findByVendUserUUAndVendUU(vendUseruu, venduu);
-//        for (PagingReleaseDetail releaseDetail : releaseDetailList) {
-//            Map<String, Object> params = new HashMap<>();
-//            if (releaseDetail.getPagingRelease().getUser().getUserIMId() != null) {
-//                params.put("master", releaseDetail.getPagingRelease().getEnterprise().getEnName());//账套 公司名称
-//                params.put("userid", String.valueOf(releaseDetail.getPagingRelease().getUser().getUserIMId()));//推送目标用户
-//                params.put("title", releaseDetail.getPagingRelease().getTitle());//推送标题
-//                params.put("content", releaseDetail.getPagingRelease().getContext());//正文
-//                params.put("enUU", String.valueOf(releaseDetail.getPagingRelease().getEnUU()));//UU号
-////                params.put("masterId", masterId);//账套ID
-//                params.put("url", "http://uas.ubtob.com/#/sale/order");//跳转链接地址
-//                params.put("pageTitle", releaseDetail.getPagingRelease().getTitle());//页面标题
-//                params.put("platform", "B2B");//系统名称，ERP或
-//                ResponseWrap res = null;
-//                try {
-//                    res = HttpUtil.doPost(URL, params);
-//                    if (!res.isSuccess())
-//                        throw new Exception(res.getContent());
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        }
-//        return new ResponseEntity<ModelMap>(HttpStatus.OK);
-//    }
 
     @Override
     public void pushReleases(List<PagingReleaseDetail> pagingReleaseDetails) {

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

@@ -10807,7 +10807,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                     fn = 'getMyWaiting';break;
             }
             return fn;
-        }
+        };
 
         $scope.tableParams = new ngTableParams({
             page : 1,
@@ -10889,6 +10889,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             ShipAddress.shipAddList({}, function(data) {
                 $scope.ships = data;
                 $scope.tender.shipadd = $scope.ships[0];
+                console.log($scope.ships);
             });
         };
         loadShipAddress();
@@ -11180,6 +11181,30 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             });
         };
 
+        // 新增供应商联系人
+        $scope.addContact = function(uu) {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: 'static/tpl/index/purc/modal/contact_person_modal.html',
+                controller: 'AddContacCtrl',
+                resolve: {
+                }
+            });
+            modalInstance.result.then(function(data) {
+                $scope.contact = data;
+                $scope.contact.venduu = uu;
+                Vendor.saveContact({}, $scope.contact, function(data) {
+                    Vendor.contacts({venduu: $scope.order.cust.uu}, {}, function(data) {
+                        $scope.contacts = data;
+                        $scope.order.vendor = $scope.contacts[0];
+                    });
+                    toaster.pop('success', '提示', '联系人保存成功');
+                }, function(response) {
+                    toaster.pop('error', '失败', response.data);
+                });
+            });
+        };
+
         // 已存在id的为查看招标单(用于在录入的招标单的发布和删除)
         if( ! angular.isUndefined($stateParams.id)) {
             $scope.loading  = true;
@@ -11417,7 +11442,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         // 切换为在平台公开招标时，清除掉已添加的供应商信息
         $scope.removeChecked = function() {
-            if ($scope.tenderProd.enterpriseBaseInfo.size > 0) {
+            if ($scope.tenderProd.enterpriseBaseInfo && $scope.tenderProd.enterpriseBaseInfo.length > 0) {
                 $scope.tenderProd.enterpriseBaseInfo = [];
             }
         };