uas招标接口获取供应商联系人方法修改

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

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.service.TenderService;
@@ -21,10 +22,7 @@ import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -166,12 +164,29 @@ public class TenderController {
 
     /**
      * 获取供应商联系人
+     * @param enuu 招标企业uu
      * @param venduu 供应商UU
      *
      */
     @RequestMapping(value = "/contacts", method = RequestMethod.GET)
-    private List<VendorContact> getContacts(Long venduu) {
-        return vendorService.getContacts(venduu);
+    public List<VendorContact> getVendorContacts(Long enuu, Long venduu) {
+       return tenderService.getVendContacts(enuu, venduu);
+    }
+
+    /**
+     * 保存供应商联系人
+     *
+     * @param contact
+     * @return
+     */
+    @RequestMapping(value = "/addcontact", method = RequestMethod.POST)
+    public ModelMap savecontact(String contact) throws UnsupportedEncodingException {
+        contact = URLDecoder.decode(contact, "UTF-8");
+        VendorContact vendor = JSON.parseObject(contact, VendorContact.class);
+        vendorService.saveContact(vendor);
+        ModelMap map = new ModelMap();
+        map.put("success", true);
+        return map;
     }
 
     /**

src/main/java/com/uas/platform/b2b/erp/service/TenderService.java

@@ -170,4 +170,6 @@ public interface TenderService {
     ModelMap updateSavedOpen(PurchaseTender purchaseTender);
 
     ModelMap updateSavedOpen(PurchaseTender purchaseTender, List<Attach> attachList);
+
+    List<VendorContact> getVendContacts(Long enuu, Long venduu);
 }

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

@@ -59,7 +59,7 @@ public class TenderServiceImpl implements TenderService {
     private EnterpriseBaseInfoDao enterpriseBaseInfoDao;
 
     @Autowired
-    private CommonDao commonDao;
+    private VendorContactDao vendorContactDao;
 
     /**
      *  发布和保存
@@ -440,6 +440,11 @@ public class TenderServiceImpl implements TenderService {
         return publishOrUpdateSaved(purchaseTender, null, false, true);
     }
 
+    @Override
+    public List<VendorContact> getVendContacts(Long enuu, Long venduu) {
+        return vendorContactDao.findByMyenuuAndVenduu(enuu, venduu);
+    }
+
     /**
      * 发布或保存方法（针对保存的单据）
      *

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

@@ -12879,9 +12879,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 en.contact = data;
                 en.contact.venduu = en.uu;
                 Vendor.saveContact({}, en.contact, function(data) {
+                    en.contact = data;  // 新增的作为联系人
                     Vendor.contacts({venduu: en.uu}, {}, function(data) {
                         en.contacts = data;
-                        en.contact = en.contacts[0];
                     });
                     toaster.pop('success', '提示', '联系人保存成功');
                 }, function(response) {

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

@@ -347,7 +347,7 @@
                     </div>
                     <div class = "col-xs-4">
                         <div class="bid-desc">员工人数：</div>
-                        <div class="unchanged-info">{{currentEnBaseInfo.enNum}}</div>
+                        <div class="unchanged-info">{{currentEnBaseInfo.emNum}}</div>
                     </div>
                     <div class = "col-xs-4">
                         <div class="bid-desc">企业电话：</div>