diff --git a/src/main/java/com/ifish/action/VipAction.java b/src/main/java/com/ifish/action/VipAction.java
index e4fbb2e..8c3d2f2 100644
--- a/src/main/java/com/ifish/action/VipAction.java
+++ b/src/main/java/com/ifish/action/VipAction.java
@@ -4,8 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.ifish.entity.*;
-import com.ifish.excel.VipMemberExportExcel;
-import com.ifish.excel.VipMemberImportTemplateExcel;
+import com.ifish.excel.*;
 import com.ifish.hibernate.Pagination;
 import com.ifish.search.SearchFilter;
 import com.ifish.service.VipService;
@@ -44,8 +43,7 @@ public class VipAction {
     @RequestMapping("/sendSms.do")
     @ResponseBody
     public boolean vipSendSms(HttpServletRequest request) throws ClientException {
-        final String birthdayType = "SMS_139242320";
-        final String noticeType = "SMS_139242334";
+        final String noticeType = "SMS_139227937";
         String oneTel = request.getParameter("oneTel");
         String smsType = request.getParameter("smsType");
         //生日
@@ -65,22 +63,17 @@ public class VipAction {
             String[] idTel = oneTel.split("_");
             String id = idTel[0];
             VipMember vipMember = this.vipService.getVipMember(Integer.parseInt(id));
-            String name = vipMember.getMemberLegal();
             vipSmsResult.setResultBussId(Integer.parseInt(id));
             vipSmsResult.setResultTel(vipMember.getMemberTel());
             vipSmsResult.setResultTemplate(smsType);
-            //生日提醒
-            if (birthdayType.equals(smsType)) {
-                param.put("name",name);
-                param.put("tel",smsTel);
-                response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString());
-            } else if (noticeType.equals(smsType)) {
+            if (noticeType.equals(smsType)) {
                 param.put("title",smsTitle);
                 param.put("time",smsTime);
                 param.put("address",smsAddress);
                 param.put("signTime",smsSignTime);
                 param.put("contact",smsContact + " " + smsContactTel);
                 response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString());
+                System.out.println("单条短信发送-Result："  + response.getCode() + "-" + response.getMessage());
             }
             vipSmsResult.setResultCode(response.getCode());
             vipSmsResult.setResultMessage(response.getMessage());
@@ -102,19 +95,15 @@ public class VipAction {
                 vipSmsResult.setResultBussId(Integer.parseInt(id));
                 vipSmsResult.setResultTel(vipMember.getMemberTel());
                 vipSmsResult.setResultTemplate(smsType);
-                String name = vipMember.getMemberLegal();
                 //生日提醒
-                if (birthdayType.equals(smsType)) {
-                    param.put("name",name);
-                    param.put("tel",smsTel);
-                    response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString());
-                } else if (noticeType.equals(smsType)) {
+                if (noticeType.equals(smsType)) {
                     param.put("title",smsTitle);
                     param.put("time",smsTime);
                     param.put("address",smsAddress);
                     param.put("signTime",smsSignTime);
                     param.put("contact",smsContact + " " + smsContactTel);
                     response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString());
+                    System.out.println("多条短信发送-Result："  + response.getCode() + "-" + response.getMessage());
                 }
                 vipSmsResult.setResultCode(response.getCode());
                 vipSmsResult.setResultMessage(response.getMessage());
@@ -203,6 +192,13 @@ public class VipAction {
         return b;
     }
 
+    @RequestMapping("/getMembersByReferrerId.do")
+    @ResponseBody
+    public Object getMembersByReferrerId(Integer referrerId){
+        List<VipMember> members = this.vipService.getMembersByReferrerId(referrerId).getList();
+        return members;
+    }
+
     /** ====================================个人培训============================================ **/
 
     @RequestMapping("/personal.do")
@@ -340,6 +336,7 @@ public class VipAction {
 
     /** ====================================下载上传============================================ **/
 
+    /**======================================会员信息===================================================**/
     @RequestMapping("/downloadMemberImportTemplateToExcel.do")
     public ModelAndView downloadMemberImportTemplateToExcel(ModelMap model,SearchFilter searchFilter) {
         Pagination<VipType> vipTypes = this.vipService.getVipTypeByPage(searchFilter);
@@ -367,7 +364,127 @@ public class VipAction {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
         return new ModelAndView("vip/vipMember");
     }
+
+    /**======================================单位评价证===================================================**/
+
+    @RequestMapping("/downloadCompanyImportTemplateToExcel.do")
+    public ModelAndView downloadCompanyImportTemplateToExcel(ModelMap model,SearchFilter searchFilter) {
+        searchFilter.setiDisplayStart(1);
+        searchFilter.setiDisplayStart(99999);
+        Pagination<VipMember> vipMembers = this.vipService.getVipMemberByPage(searchFilter);
+        model.put("vipMembers", vipMembers.getList());
+        VipCompanyImportTemplateExcel excel = new VipCompanyImportTemplateExcel();
+        return new ModelAndView(excel, model);
+    }
+
+    @RequestMapping("/downloadCompanyExportToExcel.do")
+    public ModelAndView downloadCompanyExportToExcel(ModelMap model,SearchFilter searchFilter){
+        searchFilter.setiDisplayStart(1);
+        searchFilter.setiDisplayStart(99999);
+        Pagination<VipCompany> vipCompanys = this.vipService.getVipCompanyByPage(searchFilter);
+        model.put("vipCompanys",vipCompanys.getList());
+        VipCompanyExportExcel excel = new VipCompanyExportExcel();
+        return new ModelAndView(excel,model);
+    }
+
+    @RequestMapping("/downloadCompanyImportToExcel.do")
+    public ModelAndView downloadCompanyImportToExcel(@RequestParam("fileUpload") MultipartFile fileUpload,HttpServletRequest request){
+        SecurityContextImpl securityContextImpl = (SecurityContextImpl) request.getSession().getAttribute("SPRING_SECURITY_CONTEXT");
+        try {
+            this.vipService.filesSaveVipCompany(fileUpload.getInputStream(), securityContextImpl.getAuthentication().getName());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new ModelAndView("vip/vipCompany");
+    }
+
+
+    /**======================================个人培训证===================================================**/
+
+    @RequestMapping("/downloadPersonalImportTemplateToExcel.do")
+    public ModelAndView downloadPersonalImportTemplateToExcel(ModelMap model,SearchFilter searchFilter) {
+        searchFilter.setiDisplayStart(1);
+        searchFilter.setiDisplayStart(99999);
+        Pagination<VipMember> vipMembers = this.vipService.getVipMemberByPage(searchFilter);
+        model.put("vipMembers", vipMembers.getList());
+        VipPersonalImportTemplateExcel excel = new VipPersonalImportTemplateExcel();
+        return new ModelAndView(excel, model);
+    }
+
+    @RequestMapping("/downloadPersonalExportToExcel.do")
+    public ModelAndView downloadPersonalExportToExcel(ModelMap model,SearchFilter searchFilter){
+        searchFilter.setiDisplayStart(1);
+        searchFilter.setiDisplayStart(99999);
+        Pagination<VipPersonal> vipPersonals = this.vipService.getVipPersonalByPage(searchFilter);
+        model.put("vipPersonals",vipPersonals.getList());
+        VipPersonalExportExcel excel = new VipPersonalExportExcel();
+        return new ModelAndView(excel,model);
+    }
+
+
+    @RequestMapping("/downloadPersonalImportToExcel.do")
+    public ModelAndView downloadPersonalImportToExcel(@RequestParam("fileUpload") MultipartFile fileUpload,HttpServletRequest request){
+        SecurityContextImpl securityContextImpl = (SecurityContextImpl) request.getSession().getAttribute("SPRING_SECURITY_CONTEXT");
+        try {
+            this.vipService.filesSaveVipPersonal(fileUpload.getInputStream(), securityContextImpl.getAuthentication().getName());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new ModelAndView("vip/vipPersonal");
+    }
+
+    /**======================================会议活动通知===================================================**/
+
+    @RequestMapping("/activity.do")
+    public ModelAndView activity(){
+        return new ModelAndView("vip/vipActivity");
+    }
+
+    @RequestMapping("/activityList.do")
+    @ResponseBody
+    public Object activityList(SearchFilter searchFilter){
+        Pagination<VipActivityNotice> page = this.vipService.getVipActivityNoticeByPage(searchFilter);
+        return IfishUtil.returnPageData(page,searchFilter.getsEcho());
+    }
+
+    @RequestMapping("/downloadActivityImportTemplateToExcel.do")
+    public ModelAndView downloadActivityImportTemplateToExcel(ModelMap model) {
+        VipActivityImportTemplateExcel excel = new VipActivityImportTemplateExcel();
+        return new ModelAndView(excel, model);
+    }
+
+    @RequestMapping("/downloadActivityImportToExcel.do")
+    public ModelAndView downloadActivityImportToExcel(@RequestParam("fileUpload") MultipartFile fileUpload,HttpServletRequest request){
+        SecurityContextImpl securityContextImpl = (SecurityContextImpl) request.getSession().getAttribute("SPRING_SECURITY_CONTEXT");
+        String smsType = request.getParameter("smsType");
+        String smsTitle = request.getParameter("smsTitle");
+        String smsTime = request.getParameter("smsTime");
+        String smsAddress = request.getParameter("smsAddress");
+        String smsSignTime = request.getParameter("smsSignTime");
+        String smsContact = request.getParameter("smsContact");
+        String smsContactTel = request.getParameter("smsContactTel");
+
+        JSONObject param = new JSONObject();
+        param.put("title",smsTitle);
+        param.put("time",smsTime);
+        param.put("address",smsAddress);
+        param.put("signTime",smsSignTime);
+        param.put("contact",smsContact + " " + smsContactTel);
+
+        try {
+            this.vipService.filesSaveVipActivityNotice(fileUpload.getInputStream(), securityContextImpl.getAuthentication().getName(),param,smsType);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new ModelAndView("vip/vipActivity");
+    }
+
+
+
+
+
+
+
 }
diff --git a/src/main/java/com/ifish/dao/VipActivityNoticeDao.java b/src/main/java/com/ifish/dao/VipActivityNoticeDao.java
new file mode 100644
index 0000000..7a4f402
--- /dev/null
+++ b/src/main/java/com/ifish/dao/VipActivityNoticeDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.VipActivityNotice;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 21:11 2018/7/17
+ * @Modified by:
+ */
+public interface VipActivityNoticeDao extends BaseDao<VipActivityNotice,Integer>{
+}
diff --git a/src/main/java/com/ifish/daoImpl/VipActivityNoticeDaoImpl.java b/src/main/java/com/ifish/daoImpl/VipActivityNoticeDaoImpl.java
new file mode 100644
index 0000000..6db8b42
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/VipActivityNoticeDaoImpl.java
@@ -0,0 +1,20 @@
+package com.ifish.daoImpl;
+
+import com.ifish.dao.VipActivityNoticeDao;
+import com.ifish.entity.VipActivityNotice;
+import com.ifish.hibernate.HibernateBaseDao;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 18:38 2018/7/4
+ * @Modified by:
+ */
+@Repository("vipActivityNoticeDao")
+public class VipActivityNoticeDaoImpl extends HibernateBaseDao<VipActivityNotice,Integer> implements VipActivityNoticeDao {
+    @Override
+    protected Class<VipActivityNotice> getEntityClass() {
+        return VipActivityNotice.class;
+    }
+}
diff --git a/src/main/java/com/ifish/entity/VipActivityNotice.java b/src/main/java/com/ifish/entity/VipActivityNotice.java
new file mode 100644
index 0000000..36d4e27
--- /dev/null
+++ b/src/main/java/com/ifish/entity/VipActivityNotice.java
@@ -0,0 +1,144 @@
+package com.ifish.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 21:05 2018/7/17
+ * @Modified by:
+ */
+@Entity
+@Table(name = "tbl_vip_activity_notice")
+public class VipActivityNotice {
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name = "vip_activity_id")
+    private Integer activityId;
+
+    @Column(name = "vip_activity_member_name")
+    private String activityMemberName;
+
+    @Column(name = "vip_activity_contact")
+    private String activityContact;
+
+    @Column(name = "vip_activity_contact_tel")
+    private String activityContactTel;
+
+    @Column(name = "vip_activity_phone")
+    private String activityPhone;
+
+    @Column(name = "vip_activity_email")
+    private String activityEmail;
+
+    @Column(name = "vip_activity_wechat")
+    private String activityWechat;
+
+    @Column(name = "vip_activity_position")
+    private String activityPosition;
+
+    @Column(name = "vip_activity_import_date")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JSONField(format="yyyy-MM-dd")
+    private Date activityImportDate;
+
+    @Column(name = "vip_create_user")
+    private String createUser;
+
+    @Column(name = "vip_create_time")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date createTime;
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getActivityMemberName() {
+        return activityMemberName;
+    }
+
+    public void setActivityMemberName(String activityMemberName) {
+        this.activityMemberName = activityMemberName;
+    }
+
+    public String getActivityContact() {
+        return activityContact;
+    }
+
+    public void setActivityContact(String activityContact) {
+        this.activityContact = activityContact;
+    }
+
+    public String getActivityContactTel() {
+        return activityContactTel;
+    }
+
+    public void setActivityContactTel(String activityContactTel) {
+        this.activityContactTel = activityContactTel;
+    }
+
+    public String getActivityPhone() {
+        return activityPhone;
+    }
+
+    public void setActivityPhone(String activityPhone) {
+        this.activityPhone = activityPhone;
+    }
+
+    public String getActivityEmail() {
+        return activityEmail;
+    }
+
+    public void setActivityEmail(String activityEmail) {
+        this.activityEmail = activityEmail;
+    }
+
+    public String getActivityWechat() {
+        return activityWechat;
+    }
+
+    public void setActivityWechat(String activityWechat) {
+        this.activityWechat = activityWechat;
+    }
+
+    public String getActivityPosition() {
+        return activityPosition;
+    }
+
+    public void setActivityPosition(String activityPosition) {
+        this.activityPosition = activityPosition;
+    }
+
+    public Date getActivityImportDate() {
+        return activityImportDate;
+    }
+
+    public void setActivityImportDate(Date activityImportDate) {
+        this.activityImportDate = activityImportDate;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
diff --git a/src/main/java/com/ifish/entity/VipCompany.java b/src/main/java/com/ifish/entity/VipCompany.java
index b0cb975..71f0141 100644
--- a/src/main/java/com/ifish/entity/VipCompany.java
+++ b/src/main/java/com/ifish/entity/VipCompany.java
@@ -35,6 +35,9 @@ public class VipCompany implements Serializable{
     @Column(name = "vip_certificate_type")
     private String certificateType;
 
+    @Column(name = "vip_certificate_remark")
+    private String certificateRemark;
+
     @Column(name = "vip_certificate_apply_time")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @JSONField(format="yyyy-MM-dd")
@@ -121,6 +124,14 @@ public class VipCompany implements Serializable{
         this.certificateType = certificateType;
     }
 
+    public String getCertificateRemark() {
+        return certificateRemark;
+    }
+
+    public void setCertificateRemark(String certificateRemark) {
+        this.certificateRemark = certificateRemark;
+    }
+
     public Date getCertificateApplyTime() {
         return certificateApplyTime;
     }
diff --git a/src/main/java/com/ifish/entity/VipMember.java b/src/main/java/com/ifish/entity/VipMember.java
index bc67716..0c68f91 100644
--- a/src/main/java/com/ifish/entity/VipMember.java
+++ b/src/main/java/com/ifish/entity/VipMember.java
@@ -109,6 +109,23 @@ public class VipMember implements Serializable{
     @Column(name = "vip_certificate_status")
     private String certificateStatus;
 
+    @Column(name = "vip_member_level")
+    private String memberLevel;
+
+    @Column(name = "vip_member_established_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JSONField(format="yyyy-MM-dd")
+    private Date memberEstablishedTime;
+
+    @Column(name = "vip_member_notice_book")
+    private String memberNoticeBook;
+
+    @Column(name = "vip_member_registered_capital")
+    private String memberRegisteredCapital;
+
+    @Column(name = "vip_member_qualification_info")
+    private String memberQualificationInfo;
+
     @Column(name = "vip_create_user")
     private String createUser;
 
@@ -370,4 +387,44 @@ public class VipMember implements Serializable{
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
+
+    public String getMemberLevel() {
+        return memberLevel;
+    }
+
+    public void setMemberLevel(String memberLevel) {
+        this.memberLevel = memberLevel;
+    }
+
+    public Date getMemberEstablishedTime() {
+        return memberEstablishedTime;
+    }
+
+    public void setMemberEstablishedTime(Date memberEstablishedTime) {
+        this.memberEstablishedTime = memberEstablishedTime;
+    }
+
+    public String getMemberNoticeBook() {
+        return memberNoticeBook;
+    }
+
+    public void setMemberNoticeBook(String memberNoticeBook) {
+        this.memberNoticeBook = memberNoticeBook;
+    }
+
+    public String getMemberRegisteredCapital() {
+        return memberRegisteredCapital;
+    }
+
+    public void setMemberRegisteredCapital(String memberRegisteredCapital) {
+        this.memberRegisteredCapital = memberRegisteredCapital;
+    }
+
+    public String getMemberQualificationInfo() {
+        return memberQualificationInfo;
+    }
+
+    public void setMemberQualificationInfo(String memberQualificationInfo) {
+        this.memberQualificationInfo = memberQualificationInfo;
+    }
 }
diff --git a/src/main/java/com/ifish/entity/VipPersonal.java b/src/main/java/com/ifish/entity/VipPersonal.java
index 32079d0..667b76c 100644
--- a/src/main/java/com/ifish/entity/VipPersonal.java
+++ b/src/main/java/com/ifish/entity/VipPersonal.java
@@ -32,6 +32,30 @@ public class VipPersonal implements Serializable{
     @Column(name = "vip_card_num")
     private String cardNum;
 
+    @Column(name = "vip_personal_gender")
+    private String personalGender;
+
+    @Column(name = "vip_personal_member")
+    private String personalMember;
+
+    @Column(name = "vip_personal_school")
+    private String personalSchool;
+
+    @Column(name = "vip_personal_profession")
+    private String personalProfession;
+
+    @Column(name = "vip_personal_research_direction")
+    private String personalResearchDirection;
+
+    @Column(name = "vip_personal_email")
+    private String personalEmail;
+
+    @Column(name = "vip_personal_wechat")
+    private String personalWechat;
+
+    @Column(name = "vip_personal_tel")
+    private String personalTel;
+
     @Column(name = "vip_certificate_level")
     private String  certificateLevel;
 
@@ -111,6 +135,70 @@ public class VipPersonal implements Serializable{
         this.cardNum = cardNum;
     }
 
+    public String getPersonalGender() {
+        return personalGender;
+    }
+
+    public void setPersonalGender(String personalGender) {
+        this.personalGender = personalGender;
+    }
+
+    public String getPersonalMember() {
+        return personalMember;
+    }
+
+    public void setPersonalMember(String personalMember) {
+        this.personalMember = personalMember;
+    }
+
+    public String getPersonalSchool() {
+        return personalSchool;
+    }
+
+    public void setPersonalSchool(String personalSchool) {
+        this.personalSchool = personalSchool;
+    }
+
+    public String getPersonalProfession() {
+        return personalProfession;
+    }
+
+    public void setPersonalProfession(String personalProfession) {
+        this.personalProfession = personalProfession;
+    }
+
+    public String getPersonalResearchDirection() {
+        return personalResearchDirection;
+    }
+
+    public void setPersonalResearchDirection(String personalResearchDirection) {
+        this.personalResearchDirection = personalResearchDirection;
+    }
+
+    public String getPersonalEmail() {
+        return personalEmail;
+    }
+
+    public void setPersonalEmail(String personalEmail) {
+        this.personalEmail = personalEmail;
+    }
+
+    public String getPersonalWechat() {
+        return personalWechat;
+    }
+
+    public void setPersonalWechat(String personalWechat) {
+        this.personalWechat = personalWechat;
+    }
+
+    public String getPersonalTel() {
+        return personalTel;
+    }
+
+    public void setPersonalTel(String personalTel) {
+        this.personalTel = personalTel;
+    }
+
     public String getCertificateLevel() {
         return certificateLevel;
     }
diff --git a/src/main/java/com/ifish/entity/VipReferrer.java b/src/main/java/com/ifish/entity/VipReferrer.java
index 2955c3b..d507b53 100644
--- a/src/main/java/com/ifish/entity/VipReferrer.java
+++ b/src/main/java/com/ifish/entity/VipReferrer.java
@@ -41,6 +41,21 @@ public class VipReferrer implements Serializable{
     @Column(name = "vip_referrer_status")
     private String referrerStatus;
 
+    @Column(name = "vip_referrer_card")
+    private String referrerCard;
+
+    @Column(name = "vip_referrer_birthday")
+    private String referrerBirthday;
+
+    @Column(name = "vip_referrer_email")
+    private String referrerEmail;
+
+    @Column(name = "vip_referrer_tel")
+    private String referrerTel;
+
+    @Column(name = "vip_referrer_fee")
+    private Double referrerFee;
+
     @Column(name = "vip_create_user")
     private String createUser;
 
@@ -52,11 +67,12 @@ public class VipReferrer implements Serializable{
     @Column(name = "vip_modify_user")
     private String modifyUser;
 
-    @Column(name = "vip_mofify_time")
+    @Column(name = "vip_modify_time")
     @Temporal(TemporalType.TIMESTAMP)
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
+
     public Integer getReferrerId() {
         return referrerId;
     }
@@ -97,6 +113,46 @@ public class VipReferrer implements Serializable{
         this.referrerRemark = referrerRemark;
     }
 
+    public String getReferrerCard() {
+        return referrerCard;
+    }
+
+    public void setReferrerCard(String referrerCard) {
+        this.referrerCard = referrerCard;
+    }
+
+    public String getReferrerBirthday() {
+        return referrerBirthday;
+    }
+
+    public void setReferrerBirthday(String referrerBirthday) {
+        this.referrerBirthday = referrerBirthday;
+    }
+
+    public String getReferrerEmail() {
+        return referrerEmail;
+    }
+
+    public void setReferrerEmail(String referrerEmail) {
+        this.referrerEmail = referrerEmail;
+    }
+
+    public String getReferrerTel() {
+        return referrerTel;
+    }
+
+    public void setReferrerTel(String referrerTel) {
+        this.referrerTel = referrerTel;
+    }
+
+    public Double getReferrerFee() {
+        return referrerFee;
+    }
+
+    public void setReferrerFee(Double referrerFee) {
+        this.referrerFee = referrerFee;
+    }
+
     public String getReferrerStatus() {
         return referrerStatus;
     }
diff --git a/src/main/java/com/ifish/excel/VipActivityImportTemplateExcel.java b/src/main/java/com/ifish/excel/VipActivityImportTemplateExcel.java
new file mode 100644
index 0000000..ceca9e2
--- /dev/null
+++ b/src/main/java/com/ifish/excel/VipActivityImportTemplateExcel.java
@@ -0,0 +1,71 @@
+package com.ifish.excel;
+
+import com.ifish.entity.VipMember;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.springframework.web.servlet.view.document.AbstractExcelView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 22:23 2018/7/9
+ * @Modified by:
+ */
+public class VipActivityImportTemplateExcel extends AbstractExcelView {
+
+    @Override
+    protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook workbook, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        //表头样式
+        HSSFCellStyle style = workbook.createCellStyle();
+        //字体样式
+        HSSFFont fontStyle = workbook.createFont();
+        fontStyle.setFontName("微软雅黑");
+        fontStyle.setFontHeightInPoints((short)12);
+        style.setFont(fontStyle);
+
+        HSSFSheet sheet = workbook.createSheet("sheet");
+        sheet.autoSizeColumn(0);
+        getCell(sheet,0,0).setCellValue("单位名称（必填）");
+        getCell(sheet,0,1).setCellValue("联系人（必填）");
+        getCell(sheet,0,2).setCellValue("手机（必填）");
+        getCell(sheet,0,3).setCellValue("电话（必填）");
+        getCell(sheet,0,4).setCellValue("邮箱（必填）");
+        getCell(sheet,0,5).setCellValue("职位（必填）");
+        getCell(sheet,0,6).setCellValue("微信（必填）");
+
+
+        HSSFCellStyle cellStyle = workbook.createCellStyle();
+        HSSFDataFormat format = workbook.createDataFormat();
+        cellStyle.setDataFormat(format.getFormat("@"));
+        sheet.setDefaultColumnStyle(0,cellStyle);
+        sheet.setDefaultColumnStyle(1,cellStyle);
+        sheet.setDefaultColumnStyle(2,cellStyle);
+        sheet.setDefaultColumnStyle(3,cellStyle);
+        sheet.setDefaultColumnStyle(4,cellStyle);
+        sheet.setDefaultColumnStyle(5,cellStyle);
+        sheet.setDefaultColumnStyle(6,cellStyle);
+
+        String filename = URLEncoder.encode("会议活动通知导入模板.xls", "UTF-8");
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-disposition", "attachment;filename=" + filename);
+        OutputStream ouputStream = response.getOutputStream();
+        workbook.write(ouputStream);
+        ouputStream.flush();
+        ouputStream.close();
+
+
+
+
+
+
+
+    }
+}
diff --git a/src/main/java/com/ifish/excel/VipCompanyExportExcel.java b/src/main/java/com/ifish/excel/VipCompanyExportExcel.java
new file mode 100644
index 0000000..21cd1e2
--- /dev/null
+++ b/src/main/java/com/ifish/excel/VipCompanyExportExcel.java
@@ -0,0 +1,90 @@
+package com.ifish.excel;
+
+import com.ifish.entity.VipCompany;
+import com.ifish.entity.VipMember;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.web.servlet.view.document.AbstractExcelView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 23:59 2018/7/10
+ * @Modified by:
+ */
+public class VipCompanyExportExcel extends AbstractExcelView{
+
+    @Override
+    protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook workbook, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        //表头样式
+        HSSFCellStyle style = workbook.createCellStyle();
+        //字体样式
+        HSSFFont fontStyle = workbook.createFont();
+        fontStyle.setFontName("微软雅黑");
+        fontStyle.setFontHeightInPoints((short)12);
+        style.setFont(fontStyle);
+
+        HSSFSheet sheet = workbook.createSheet("sheet");
+        getCell(sheet,0,0).setCellValue("单位名称");
+        getCell(sheet,0,1).setCellValue("证书编号");
+        getCell(sheet,0,2).setCellValue("证书等级");
+        getCell(sheet,0,3).setCellValue("证书类型");
+        getCell(sheet,0,4).setCellValue("证书申请时间");
+        getCell(sheet,0,5).setCellValue("证书到期时间");
+        getCell(sheet,0,6).setCellValue("开票时间");
+        getCell(sheet,0,7).setCellValue("出证时间");
+        getCell(sheet,0,8).setCellValue("年审时间");
+        getCell(sheet,0,9).setCellValue("费用");
+        getCell(sheet,0,10).setCellValue("备注");
+        Calendar calendar = Calendar.getInstance();
+        List<VipCompany> vipCompanys = (List<VipCompany>) model.get("vipCompanys");
+        for (int i = 0; i < vipCompanys.size(); i++) {
+            VipCompany vipCompany = vipCompanys.get(i);
+            getCell(sheet,i+1,0).setCellValue(vipCompany.getVipMember().getMemberName());
+            getCell(sheet,i+1,1).setCellValue(vipCompany.getCertificateCard());
+            getCell(sheet,i+1,2).setCellValue(vipCompany.getCertificateLevel());
+            getCell(sheet,i+1,3).setCellValue(vipCompany.getCertificateType());
+            Date certificateApplyTime = vipCompany.getCertificateApplyTime();
+            calendar.setTime(certificateApplyTime);
+
+            getCell(sheet,i+1,4).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+            Date certificateMaturityTime = vipCompany.getCertificateMaturityTime();
+            calendar.setTime(certificateMaturityTime);
+            getCell(sheet,i+1,5).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+            Date openticketTime = vipCompany.getOpenticketTime();
+            calendar.setTime(openticketTime);
+
+            getCell(sheet,i+1,6).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+            Date outcardTime = vipCompany.getOutcardTime();
+            calendar.setTime(outcardTime);
+
+            getCell(sheet,i+1,7).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+            Date annualReviewTime = vipCompany.getAnnualReviewTime();
+            calendar.setTime(annualReviewTime);
+
+            getCell(sheet,i+1,8).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+            getCell(sheet,i+1,9).setCellValue(vipCompany.getCost());
+            getCell(sheet,i+1,10).setCellValue(vipCompany.getCertificateRemark());
+        }
+
+        String filename = URLEncoder.encode("单位评价证信息导出.xls", "UTF-8");
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-disposition", "attachment;filename=" + filename);
+        OutputStream ouputStream = response.getOutputStream();
+        workbook.write(ouputStream);
+        ouputStream.flush();
+        ouputStream.close();
+
+    }
+}
diff --git a/src/main/java/com/ifish/excel/VipCompanyImportTemplateExcel.java b/src/main/java/com/ifish/excel/VipCompanyImportTemplateExcel.java
new file mode 100644
index 0000000..7739ad2
--- /dev/null
+++ b/src/main/java/com/ifish/excel/VipCompanyImportTemplateExcel.java
@@ -0,0 +1,92 @@
+package com.ifish.excel;
+
+import com.ifish.entity.VipMember;
+import com.ifish.entity.VipReferrer;
+import com.ifish.entity.VipType;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.springframework.web.servlet.view.document.AbstractExcelView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 22:23 2018/7/9
+ * @Modified by:
+ */
+public class VipCompanyImportTemplateExcel extends AbstractExcelView {
+
+    @Override
+    protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook workbook, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        //表头样式
+        HSSFCellStyle style = workbook.createCellStyle();
+        //字体样式
+        HSSFFont fontStyle = workbook.createFont();
+        fontStyle.setFontName("微软雅黑");
+        fontStyle.setFontHeightInPoints((short)12);
+        style.setFont(fontStyle);
+
+        HSSFSheet sheet = workbook.createSheet("sheet");
+        sheet.autoSizeColumn(0);
+        getCell(sheet,0,0).setCellValue("单位名称（必填）");
+        getCell(sheet,0,1).setCellValue("证书编号（必填）");
+        getCell(sheet,0,2).setCellValue("证书等级（必填）");
+        getCell(sheet,0,3).setCellValue("证书类型（必填）");
+        getCell(sheet,0,4).setCellValue("证书申请时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,5).setCellValue("证书到期时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,6).setCellValue("开票时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,7).setCellValue("出证时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,8).setCellValue("年审时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,9).setCellValue("费用（必填）");
+        getCell(sheet,0,10).setCellValue("备注");
+
+        //单位名称
+        List<VipMember> vipMembers = (List<VipMember>) model.get("vipMembers");
+        String[] vipMembersStr = new String[vipMembers.size()];
+        for (int i = 0; i < vipMembers.size(); i++) {
+            vipMembersStr[i] = vipMembers.get(i).getMemberName();
+        }
+
+        CellRangeAddressList regions1 = new CellRangeAddressList(0, 65535, 0, 0);
+        DVConstraint constraint1 = DVConstraint.createExplicitListConstraint(vipMembersStr);
+        HSSFDataValidation dataValidation1 = new HSSFDataValidation(regions1, constraint1);
+        sheet.addValidationData(dataValidation1);
+
+        HSSFCellStyle cellStyle = workbook.createCellStyle();
+        HSSFDataFormat format = workbook.createDataFormat();
+        cellStyle.setDataFormat(format.getFormat("@"));
+        sheet.setDefaultColumnStyle(0,cellStyle);
+        sheet.setDefaultColumnStyle(1,cellStyle);
+        sheet.setDefaultColumnStyle(2,cellStyle);
+        sheet.setDefaultColumnStyle(3,cellStyle);
+        sheet.setDefaultColumnStyle(4,cellStyle);
+        sheet.setDefaultColumnStyle(5,cellStyle);
+        sheet.setDefaultColumnStyle(6,cellStyle);
+        sheet.setDefaultColumnStyle(7,cellStyle);
+        sheet.setDefaultColumnStyle(8,cellStyle);
+        sheet.setDefaultColumnStyle(9,cellStyle);
+        sheet.setDefaultColumnStyle(10,cellStyle);
+
+        String filename = URLEncoder.encode("单位评价证导入模板.xls", "UTF-8");
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-disposition", "attachment;filename=" + filename);
+        OutputStream ouputStream = response.getOutputStream();
+        workbook.write(ouputStream);
+        ouputStream.flush();
+        ouputStream.close();
+
+
+
+
+
+
+
+    }
+}
diff --git a/src/main/java/com/ifish/excel/VipMemberExportExcel.java b/src/main/java/com/ifish/excel/VipMemberExportExcel.java
index 6173f46..75d4174 100644
--- a/src/main/java/com/ifish/excel/VipMemberExportExcel.java
+++ b/src/main/java/com/ifish/excel/VipMemberExportExcel.java
@@ -59,6 +59,11 @@ public class VipMemberExportExcel extends AbstractExcelView{
         getCell(sheet,0,21).setCellValue("项目匹配");
         getCell(sheet,0,22).setCellValue("会费");
         getCell(sheet,0,23).setCellValue("是否有环保资质");
+        getCell(sheet,0,24).setCellValue("等级");
+        getCell(sheet,0,25).setCellValue("成立时间");
+        getCell(sheet,0,26).setCellValue("通知书");
+        getCell(sheet,0,27).setCellValue("注册资金");
+        getCell(sheet,0,28).setCellValue("资质情况");
         Calendar calendar = Calendar.getInstance();
         List<VipMember> vipMembers = (List<VipMember>) model.get("vipMembers");
         for (int i = 0; i < vipMembers.size(); i++) {
@@ -92,6 +97,11 @@ public class VipMemberExportExcel extends AbstractExcelView{
             getCell(sheet,i+1,21).setCellValue(vipMember.getMemberItem());
             getCell(sheet,i+1,22).setCellValue(vipMember.getMemberFee());
             getCell(sheet,i+1,23).setCellValue(vipMember.getMemberQualification().equals("0") ? "是" : "否");
+            getCell(sheet,i+1,24).setCellValue(vipMember.getMemberLevel());
+            getCell(sheet,i+1,25).setCellValue(vipMember.getMemberEstablishedTime());
+            getCell(sheet,i+1,26).setCellValue(vipMember.getMemberNoticeBook());
+            getCell(sheet,i+1,27).setCellValue(vipMember.getMemberRegisteredCapital());
+            getCell(sheet,i+1,28).setCellValue(vipMember.getMemberQualificationInfo());
         }
 
         String filename = URLEncoder.encode("会员信息导出.xls", "UTF-8");
diff --git a/src/main/java/com/ifish/excel/VipMemberImportTemplateExcel.java b/src/main/java/com/ifish/excel/VipMemberImportTemplateExcel.java
index a74eefa..6847d21 100644
--- a/src/main/java/com/ifish/excel/VipMemberImportTemplateExcel.java
+++ b/src/main/java/com/ifish/excel/VipMemberImportTemplateExcel.java
@@ -45,7 +45,7 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView {
         getCell(sheet,0,8).setCellValue("联系人（必填）");
         getCell(sheet,0,9).setCellValue("联系人电话（必填）");
         getCell(sheet,0,10).setCellValue("联系情况");
-        getCell(sheet,0,11).setCellValue("官网是否录入");
+        getCell(sheet,0,11).setCellValue("官网");
         getCell(sheet,0,12).setCellValue("手机（必填）发短信手机号");
         getCell(sheet,0,13).setCellValue("QQ");
         getCell(sheet,0,14).setCellValue("微信");
@@ -59,6 +59,13 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView {
         getCell(sheet,0,21).setCellValue("项目匹配");
         getCell(sheet,0,22).setCellValue("会费（必填）");
         getCell(sheet,0,23).setCellValue("是否有环保资质（必填）");
+
+        getCell(sheet,0,24).setCellValue("等级");
+        getCell(sheet,0,25).setCellValue("成立时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,26).setCellValue("通知书");
+        getCell(sheet,0,27).setCellValue("注册资金");
+        getCell(sheet,0,28).setCellValue("资质情况");
+
         //环保资质
         String[] qualifications = {"是","否"};
         CellRangeAddressList regions = new CellRangeAddressList(0, 65535, 23, 23);
@@ -117,6 +124,11 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView {
         sheet.setDefaultColumnStyle(21,cellStyle);
         sheet.setDefaultColumnStyle(22,cellStyle);
         sheet.setDefaultColumnStyle(23,cellStyle);
+        sheet.setDefaultColumnStyle(24,cellStyle);
+        sheet.setDefaultColumnStyle(25,cellStyle);
+        sheet.setDefaultColumnStyle(26,cellStyle);
+        sheet.setDefaultColumnStyle(27,cellStyle);
+        sheet.setDefaultColumnStyle(28,cellStyle);
 
         String filename = URLEncoder.encode("会员信息导入模板.xls", "UTF-8");
         response.setContentType("application/vnd.ms-excel");
diff --git a/src/main/java/com/ifish/excel/VipPersonalExportExcel.java b/src/main/java/com/ifish/excel/VipPersonalExportExcel.java
new file mode 100644
index 0000000..bc02623
--- /dev/null
+++ b/src/main/java/com/ifish/excel/VipPersonalExportExcel.java
@@ -0,0 +1,99 @@
+package com.ifish.excel;
+
+import com.ifish.entity.VipCompany;
+import com.ifish.entity.VipPersonal;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.web.servlet.view.document.AbstractExcelView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 23:59 2018/7/10
+ * @Modified by:
+ */
+public class VipPersonalExportExcel extends AbstractExcelView{
+
+    @Override
+    protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook workbook, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        //表头样式
+        HSSFCellStyle style = workbook.createCellStyle();
+        //字体样式
+        HSSFFont fontStyle = workbook.createFont();
+        fontStyle.setFontName("微软雅黑");
+        fontStyle.setFontHeightInPoints((short)12);
+        style.setFont(fontStyle);
+
+        HSSFSheet sheet = workbook.createSheet("sheet");
+        getCell(sheet,0,0).setCellValue("姓名");
+        getCell(sheet,0,1).setCellValue("身份证号");
+        getCell(sheet,0,2).setCellValue("性别");
+        getCell(sheet,0,3).setCellValue("手机号码");
+        getCell(sheet,0,4).setCellValue("微信");
+        getCell(sheet,0,5).setCellValue("邮箱");
+        getCell(sheet,0,6).setCellValue("研究方向");
+        getCell(sheet,0,7).setCellValue("专业");
+        getCell(sheet,0,8).setCellValue("毕业学校");
+        getCell(sheet,0,9).setCellValue("单位名称");
+        getCell(sheet,0,10).setCellValue("证书等级");
+        getCell(sheet,0,11).setCellValue("证书类型");
+        getCell(sheet,0,12).setCellValue("证书编号");
+        getCell(sheet,0,13).setCellValue("证书申请时间");
+        getCell(sheet,0,14).setCellValue("证书领取时间");
+        getCell(sheet,0,15).setCellValue("证书到期时间");
+        getCell(sheet,0,16).setCellValue("证书上传官网");
+        getCell(sheet,0,17).setCellValue("备注");
+        Calendar calendar = Calendar.getInstance();
+        List<VipPersonal> vipPersonals = (List<VipPersonal>) model.get("vipPersonals");
+        for (int i = 0; i < vipPersonals.size(); i++) {
+            VipPersonal vipPersonal = vipPersonals.get(i);
+            getCell(sheet,i+1,0).setCellValue(vipPersonal.getPersonalName());
+            getCell(sheet,i+1,1).setCellValue(vipPersonal.getCardNum());
+            getCell(sheet,i+1,2).setCellValue(vipPersonal.getPersonalGender());
+            getCell(sheet,i+1,3).setCellValue(vipPersonal.getPersonalTel());
+            getCell(sheet,i+1,4).setCellValue(vipPersonal.getPersonalWechat());
+            getCell(sheet,i+1,5).setCellValue(vipPersonal.getPersonalEmail());
+            getCell(sheet,i+1,6).setCellValue(vipPersonal.getPersonalResearchDirection());
+            getCell(sheet,i+1,7).setCellValue(vipPersonal.getPersonalProfession());
+            getCell(sheet,i+1,8).setCellValue(vipPersonal.getPersonalSchool());
+            getCell(sheet,i+1,9).setCellValue(vipPersonal.getPersonalMember());
+            getCell(sheet,i+1,10).setCellValue(vipPersonal.getCertificateLevel());
+            getCell(sheet,i+1,11).setCellValue(vipPersonal.getCertificateType());
+            getCell(sheet,i+1,12).setCellValue(vipPersonal.getCertificateCard());
+            Date certificateApplyTime = vipPersonal.getCertificateApplyTime();
+            calendar.setTime(certificateApplyTime);
+            getCell(sheet,i+1,13).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+
+            Date certificateReceiveTime = vipPersonal.getCertificateReceiveTime();
+            calendar.setTime(certificateReceiveTime);
+            getCell(sheet,i+1,14).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+
+            Date certificateMaturityTime = vipPersonal.getCertificateMaturityTime();
+            calendar.setTime(certificateMaturityTime);
+            getCell(sheet,i+1,15).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH));
+
+            getCell(sheet,i+1,16).setCellValue(vipPersonal.getUploadWebsite());
+            getCell(sheet,i+1,17).setCellValue(vipPersonal.getCertificateRemark());
+        }
+
+        String filename = URLEncoder.encode("个人培训证信息导出.xls", "UTF-8");
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-disposition", "attachment;filename=" + filename);
+        OutputStream ouputStream = response.getOutputStream();
+        workbook.write(ouputStream);
+        ouputStream.flush();
+        ouputStream.close();
+
+    }
+}
diff --git a/src/main/java/com/ifish/excel/VipPersonalImportTemplateExcel.java b/src/main/java/com/ifish/excel/VipPersonalImportTemplateExcel.java
new file mode 100644
index 0000000..ca0bf01
--- /dev/null
+++ b/src/main/java/com/ifish/excel/VipPersonalImportTemplateExcel.java
@@ -0,0 +1,111 @@
+package com.ifish.excel;
+
+import com.ifish.entity.VipMember;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.springframework.web.servlet.view.document.AbstractExcelView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: yan.y
+ * @Description:
+ * @Date: Created in 22:23 2018/7/9
+ * @Modified by:
+ */
+public class VipPersonalImportTemplateExcel extends AbstractExcelView {
+
+    @Override
+    protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook workbook, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        //表头样式
+        HSSFCellStyle style = workbook.createCellStyle();
+        //字体样式
+        HSSFFont fontStyle = workbook.createFont();
+        fontStyle.setFontName("微软雅黑");
+        fontStyle.setFontHeightInPoints((short)12);
+        style.setFont(fontStyle);
+
+        HSSFSheet sheet = workbook.createSheet("sheet");
+        sheet.autoSizeColumn(0);
+        getCell(sheet,0,0).setCellValue("姓名（必填）");
+        getCell(sheet,0,1).setCellValue("身份证号（必填）");
+        getCell(sheet,0,2).setCellValue("性别（必填）");
+        getCell(sheet,0,3).setCellValue("手机号码（必填）");
+        getCell(sheet,0,4).setCellValue("微信（必填）");
+        getCell(sheet,0,5).setCellValue("邮箱（必填）");
+        getCell(sheet,0,6).setCellValue("研究方向（必填）");
+        getCell(sheet,0,7).setCellValue("专业（必填）");
+        getCell(sheet,0,8).setCellValue("毕业学校（必填）");
+        getCell(sheet,0,9).setCellValue("单位名称（必填）");
+        getCell(sheet,0,10).setCellValue("证书等级（必填）");
+        getCell(sheet,0,11).setCellValue("证书类型（必填）");
+        getCell(sheet,0,12).setCellValue("证书编号（必填）");
+        getCell(sheet,0,13).setCellValue("证书申请时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,14).setCellValue("证书领取时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,15).setCellValue("证书到期时间（必填）格式：YYYY-MM-DD");
+        getCell(sheet,0,16).setCellValue("证书上传官网（必填）");
+        getCell(sheet,0,17).setCellValue("备注");
+
+        //性别
+        String[] qualifications = {"男","女"};
+        CellRangeAddressList regions = new CellRangeAddressList(0, 65535, 2, 2);
+        DVConstraint constraint = DVConstraint.createExplicitListConstraint(qualifications);
+        HSSFDataValidation dataValidation = new HSSFDataValidation(regions, constraint);
+        sheet.addValidationData(dataValidation);
+
+        //单位名称
+        List<VipMember> vipMembers = (List<VipMember>) model.get("vipMembers");
+        String[] vipMembersStr = new String[vipMembers.size()];
+        for (int i = 0; i < vipMembers.size(); i++) {
+            vipMembersStr[i] = vipMembers.get(i).getMemberName();
+        }
+
+        CellRangeAddressList regions1 = new CellRangeAddressList(0, 65535, 9, 9);
+        DVConstraint constraint1 = DVConstraint.createExplicitListConstraint(vipMembersStr);
+        HSSFDataValidation dataValidation1 = new HSSFDataValidation(regions1, constraint1);
+        sheet.addValidationData(dataValidation1);
+
+        HSSFCellStyle cellStyle = workbook.createCellStyle();
+        HSSFDataFormat format = workbook.createDataFormat();
+        cellStyle.setDataFormat(format.getFormat("@"));
+        sheet.setDefaultColumnStyle(0,cellStyle);
+        sheet.setDefaultColumnStyle(1,cellStyle);
+        sheet.setDefaultColumnStyle(2,cellStyle);
+        sheet.setDefaultColumnStyle(3,cellStyle);
+        sheet.setDefaultColumnStyle(4,cellStyle);
+        sheet.setDefaultColumnStyle(5,cellStyle);
+        sheet.setDefaultColumnStyle(6,cellStyle);
+        sheet.setDefaultColumnStyle(7,cellStyle);
+        sheet.setDefaultColumnStyle(8,cellStyle);
+        sheet.setDefaultColumnStyle(9,cellStyle);
+        sheet.setDefaultColumnStyle(10,cellStyle);
+        sheet.setDefaultColumnStyle(11,cellStyle);
+        sheet.setDefaultColumnStyle(12,cellStyle);
+        sheet.setDefaultColumnStyle(13,cellStyle);
+        sheet.setDefaultColumnStyle(14,cellStyle);
+        sheet.setDefaultColumnStyle(15,cellStyle);
+        sheet.setDefaultColumnStyle(16,cellStyle);
+        sheet.setDefaultColumnStyle(17,cellStyle);
+
+        String filename = URLEncoder.encode("个人培训证导入模板.xls", "UTF-8");
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-disposition", "attachment;filename=" + filename);
+        OutputStream ouputStream = response.getOutputStream();
+        workbook.write(ouputStream);
+        ouputStream.flush();
+        ouputStream.close();
+
+
+
+
+
+
+
+    }
+}
diff --git a/src/main/java/com/ifish/service/VipService.java b/src/main/java/com/ifish/service/VipService.java
index 54f9aff..c13cfbb 100644
--- a/src/main/java/com/ifish/service/VipService.java
+++ b/src/main/java/com/ifish/service/VipService.java
@@ -1,5 +1,6 @@
 package com.ifish.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ifish.entity.*;
 import com.ifish.hibernate.Pagination;
 import com.ifish.search.SearchFilter;
@@ -38,6 +39,8 @@ public interface VipService {
 
     boolean deleteVipReferrer(VipReferrer vipReferrer,String userName);
 
+    Pagination<VipMember> getMembersByReferrerId(Integer referrerId);
+
     /**=================================个人评价=================================================*/
 
     Pagination<VipPersonal> getVipPersonalByPage(SearchFilter searchFilter);
@@ -72,9 +75,17 @@ public interface VipService {
 
     boolean deleteVipMember(VipMember vipMember,String userName);
 
+    /**=================================会员信息=================================================*/
+
+    Pagination<VipActivityNotice> getVipActivityNoticeByPage(SearchFilter searchFilter);
+
+
     /**=================================会员信息上传保存=================================================*/
 
     void filesSaveVipMember(InputStream inputStream,String userName);
+    void filesSaveVipCompany(InputStream inputStream,String userName);
+    void filesSaveVipPersonal(InputStream inputStream,String userName);
+    void filesSaveVipActivityNotice(InputStream inputStream, String userName, JSONObject param,String smsType);
 
     void saveSmsResult(VipSmsResult vipSmsResult);
 }
diff --git a/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java b/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java
index 925bd26..c6f9fe6 100644
--- a/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java
+++ b/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java
@@ -1,18 +1,19 @@
 package com.ifish.serviceImpl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.ifish.dao.*;
 import com.ifish.entity.*;
 import com.ifish.hibernate.Pagination;
 import com.ifish.search.SearchFilter;
 import com.ifish.service.VipService;
 import com.ifish.util.IfishUtil;
+import com.ifish.util.SmsUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Sheet;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -20,10 +21,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author: yan.y
@@ -53,6 +55,9 @@ public class VipServiceImpl implements VipService{
     @Autowired
     private VipSmsResultDao vipSmsResultDao;
 
+    @Autowired
+    private VipActivityNoticeDao vipActivityNoticeDao;
+
     @Override
     public Pagination<VipType> getVipTypeByPage(SearchFilter searchFilter) {
         //查询条件
@@ -129,11 +134,19 @@ public class VipServiceImpl implements VipService{
         Integer referrerId = vipReferrer.getReferrerId();
         if (referrerId != null) {
             VipType vipType = this.vipTypeDao.get(vipReferrer.getReferrerType().getTypeId());
-            vipReferrer = this.vipReferrerDao.get(referrerId);
-            vipReferrer.setReferrerType(vipType);
-            vipReferrer.setModifyTime(new Date());
-            vipReferrer.setModifyUser(userName);
-            this.vipReferrerDao.update(vipReferrer);
+            VipReferrer vipReferrerUpdate = this.vipReferrerDao.get(referrerId);
+            vipReferrerUpdate.setReferrerType(vipType);
+            vipReferrerUpdate.setReferrerName(vipReferrer.getReferrerName());
+            vipReferrerUpdate.setReferrerCard(vipReferrer.getReferrerCard());
+            vipReferrerUpdate.setReferrerTel(vipReferrer.getReferrerTel());
+            vipReferrerUpdate.setReferrerEmail(vipReferrer.getReferrerEmail());
+            vipReferrerUpdate.setReferrerBirthday(vipReferrer.getReferrerBirthday());
+            vipReferrerUpdate.setReferrerFee(vipReferrer.getReferrerFee());
+            vipReferrerUpdate.setReferrerAdmissionTime(vipReferrer.getReferrerAdmissionTime());
+            vipReferrerUpdate.setReferrerRemark(vipReferrer.getReferrerRemark());
+            vipReferrerUpdate.setModifyTime(new Date());
+            vipReferrerUpdate.setModifyUser(userName);
+            this.vipReferrerDao.update(vipReferrerUpdate);
         } else {
             VipType vipType = this.vipTypeDao.get(vipReferrer.getReferrerType().getTypeId());
             vipReferrer.setReferrerType(vipType);
@@ -162,6 +175,23 @@ public class VipServiceImpl implements VipService{
     }
 
 
+    @Override
+    public Pagination<VipMember> getMembersByReferrerId(Integer referrerId) {
+        //查询条件
+        List<Criterion> queryList = new ArrayList<Criterion>();
+        //排序条件
+        List<Order> orderList = new ArrayList<Order>();
+        //分页
+        Integer iDisplayStart = 1;
+        Integer iDisplayLength = 9999;
+
+        queryList.add(Restrictions.eq("memberReferrer.referrerId",referrerId));
+        queryList.add(Restrictions.eq("certificateStatus","0"));
+
+        Pagination<VipMember> page = this.vipMemberDao.findByCriteria(iDisplayStart, iDisplayLength, orderList, queryList.toArray(new Criterion[queryList.size()]));
+        return page;
+    }
+
     @Override
     public Pagination<VipPersonal> getVipPersonalByPage(SearchFilter searchFilter) {
         //查询条件
@@ -205,6 +235,15 @@ public class VipServiceImpl implements VipService{
             personal.setCertificateMaturityTime(vipPersonal.getCertificateMaturityTime());
             personal.setUploadWebsite(vipPersonal.getUploadWebsite());
             personal.setCertificateRemark(vipPersonal.getCertificateRemark());
+
+            personal.setPersonalGender(vipPersonal.getPersonalGender());
+            personal.setPersonalTel(vipPersonal.getPersonalTel());
+            personal.setPersonalWechat(vipPersonal.getPersonalWechat());
+            personal.setPersonalEmail(vipPersonal.getPersonalEmail());
+            personal.setPersonalResearchDirection(vipPersonal.getPersonalResearchDirection());
+            personal.setPersonalProfession(vipPersonal.getPersonalProfession());
+            personal.setPersonalSchool(vipPersonal.getPersonalSchool());
+            personal.setPersonalMember(vipPersonal.getPersonalMember());
             this.vipPersonalDao.update(personal);
         } else {
             vipPersonal.setCreateUser(userName);
@@ -284,6 +323,7 @@ public class VipServiceImpl implements VipService{
             vipCompanyUpdate.setOutcardTime(vipCompany.getOutcardTime());
             vipCompanyUpdate.setAnnualReviewTime(vipCompany.getAnnualReviewTime());
             vipCompanyUpdate.setCost(vipCompany.getCost());
+            vipCompanyUpdate.setCertificateRemark(vipCompany.getCertificateRemark());
             vipCompanyUpdate.setModifyUser(userName);
             vipCompanyUpdate.setModifyTime(new Date());
             this.vipCompanyDao.update(vipCompanyUpdate);
@@ -521,6 +561,11 @@ public class VipServiceImpl implements VipService{
                 row.getCell(21).setCellType(Cell.CELL_TYPE_STRING);
                 row.getCell(22).setCellType(Cell.CELL_TYPE_STRING);
                 row.getCell(23).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(24).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(25).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(26).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(27).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(28).setCellType(Cell.CELL_TYPE_STRING);
                 String memberName = row.getCell(0).getStringCellValue();
                 if (StringUtils.isBlank(memberName)) {
                     break;
@@ -548,6 +593,11 @@ public class VipServiceImpl implements VipService{
                 String memberItem = row.getCell(21).getStringCellValue();
                 String memberFee = row.getCell(22).getStringCellValue();
                 String memberQualification = row.getCell(23).getStringCellValue().equals("是") ? "0" : "1";
+                String memberLevel = row.getCell(24).getStringCellValue();
+                String memberEstablishedTime = row.getCell(25).getStringCellValue();
+                String memberNoticeBook = row.getCell(26).getStringCellValue();
+                String memberRegisteredCapital = row.getCell(27).getStringCellValue();
+                String memberQualificationInfo = row.getCell(28).getStringCellValue();
 
                 List<VipReferrer> referrers = this.vipReferrerDao.findByProperty(Restrictions.eq("referrerName", memberReferrer));
                 if (referrers.size() > 0) {
@@ -583,6 +633,11 @@ public class VipServiceImpl implements VipService{
                 member.setMemberItem(memberItem);
                 member.setMemberFee(Double.parseDouble(memberFee));
                 member.setMemberQualification(memberQualification);
+                member.setMemberLevel(memberLevel);
+                member.setMemberEstablishedTime(yyMMdd.parse(memberEstablishedTime));
+                member.setMemberNoticeBook(memberNoticeBook);
+                member.setMemberRegisteredCapital(memberRegisteredCapital);
+                member.setMemberQualificationInfo(memberQualificationInfo);
                 member.setCreateUser(userName);
                 member.setCreateTime(new Date());
                 member.setModifyUser(userName);
@@ -600,4 +655,243 @@ public class VipServiceImpl implements VipService{
     public void saveSmsResult(VipSmsResult vipSmsResult) {
         this.vipSmsResultDao.save(vipSmsResult);
     }
+
+    @Override
+    public void filesSaveVipCompany(InputStream inputStream, String userName) {
+        SimpleDateFormat yyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+
+        HSSFWorkbook wk = null;
+        VipMember vipMember =  null;
+        VipCompany vipCompany = null;
+        try {
+            wk = new HSSFWorkbook(inputStream);
+            HSSFSheet sheet = wk.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            for (int i = 1; i <= rows; i++) {
+                HSSFRow row = sheet.getRow(i);
+                row.getCell(0).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(2).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(3).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(4).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(6).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(7).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(8).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(9).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(10).setCellType(Cell.CELL_TYPE_STRING);
+                String memberName = row.getCell(0).getStringCellValue();
+                if (StringUtils.isBlank(memberName)) {
+                    break;
+                }
+                String certificateCard = row.getCell(1).getStringCellValue();
+                String certificateLevel = row.getCell(2).getStringCellValue();
+                String certificateType = row.getCell(3).getStringCellValue();
+                String certificateApplyTime = row.getCell(4).getStringCellValue();
+                String certificateMaturityTime = row.getCell(5).getStringCellValue();
+                String openticketTime = row.getCell(6).getStringCellValue();
+                String outcardTime = row.getCell(7).getStringCellValue();
+                String annualReviewTime = row.getCell(8).getStringCellValue();
+                String cost = row.getCell(9).getStringCellValue();
+                String certificateRemark = row.getCell(10).getStringCellValue();
+
+                List<VipMember> vipMembers = this.vipMemberDao.findByProperty(Restrictions.eq("memberName", memberName));
+                if (vipMembers.size() > 0) {
+                    vipMember = vipMembers.get(0);
+                }
+
+                vipCompany = new VipCompany();
+                vipCompany.setVipMember(vipMember);
+                vipCompany.setCertificateCard(certificateCard);
+                vipCompany.setCertificateLevel(certificateLevel);
+                vipCompany.setCertificateType(certificateType);
+                vipCompany.setCertificateApplyTime(yyMMdd.parse(certificateApplyTime));
+                vipCompany.setCertificateMaturityTime(yyMMdd.parse(certificateMaturityTime));
+                vipCompany.setOpenticketTime(yyMMdd.parse(openticketTime));
+                vipCompany.setOutcardTime(yyMMdd.parse(outcardTime));
+                vipCompany.setAnnualReviewTime(yyMMdd.parse(annualReviewTime));
+                vipCompany.setCost(Double.parseDouble(cost));
+                vipCompany.setCertificateRemark(certificateRemark);
+                vipCompany.setCreateUser(userName);
+                vipCompany.setCreateTime(new Date());
+                vipCompany.setModifyUser(userName);
+                vipCompany.setModifyTime(new Date());
+                vipCompany.setCertificateStatus("0");
+                this.vipCompanyDao.save(vipCompany);
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void filesSaveVipPersonal(InputStream inputStream, String userName) {
+        SimpleDateFormat yyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+
+        HSSFWorkbook wk = null;
+        VipPersonal vipPersonal = null;
+        try {
+            wk = new HSSFWorkbook(inputStream);
+            HSSFSheet sheet = wk.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            for (int i = 1; i <= rows; i++) {
+                HSSFRow row = sheet.getRow(i);
+                row.getCell(0).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(2).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(3).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(4).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(6).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(7).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(8).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(9).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(10).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(11).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(12).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(13).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(14).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(15).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(16).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(17).setCellType(Cell.CELL_TYPE_STRING);
+                String personalName = row.getCell(0).getStringCellValue();
+                if (StringUtils.isBlank(personalName)) {
+                    break;
+                }
+                String cardNum = row.getCell(1).getStringCellValue();
+                String personalGender = row.getCell(2).getStringCellValue();
+                String personalTel = row.getCell(3).getStringCellValue();
+                String personalWechat = row.getCell(4).getStringCellValue();
+                String personalEmail = row.getCell(5).getStringCellValue();
+                String personalResearchDirection = row.getCell(6).getStringCellValue();
+                String personalProfession = row.getCell(7).getStringCellValue();
+                String personalSchool = row.getCell(8).getStringCellValue();
+                String personalMember = row.getCell(9).getStringCellValue();
+                String certificateLevel = row.getCell(10).getStringCellValue();
+                String certificateType = row.getCell(11).getStringCellValue();
+                String certificateCard = row.getCell(12).getStringCellValue();
+                String certificateApplyTime = row.getCell(13).getStringCellValue();
+                String certificateMaturityTime = row.getCell(14).getStringCellValue();
+                String certificateReceiveTime = row.getCell(15).getStringCellValue();
+                String uploadWebsite = row.getCell(16).getStringCellValue();
+                String certificateRemark = row.getCell(17).getStringCellValue();
+
+                vipPersonal = new VipPersonal();
+                vipPersonal.setPersonalName(personalName);
+                vipPersonal.setCardNum(cardNum);
+                vipPersonal.setPersonalGender(personalGender);
+                vipPersonal.setPersonalTel(personalTel);
+                vipPersonal.setPersonalWechat(personalWechat);
+                vipPersonal.setPersonalEmail(personalEmail);
+                vipPersonal.setPersonalResearchDirection(personalResearchDirection);
+                vipPersonal.setPersonalProfession(personalProfession);
+                vipPersonal.setPersonalSchool(personalSchool);
+                vipPersonal.setPersonalMember(personalMember);
+                vipPersonal.setCertificateLevel(certificateLevel);
+                vipPersonal.setCertificateType(certificateType);
+                vipPersonal.setCertificateCard(certificateCard);
+                vipPersonal.setCertificateApplyTime(yyMMdd.parse(certificateApplyTime));
+                vipPersonal.setCertificateMaturityTime(yyMMdd.parse(certificateMaturityTime));
+                vipPersonal.setCertificateReceiveTime(yyMMdd.parse(certificateReceiveTime));
+                vipPersonal.setUploadWebsite(uploadWebsite);
+                vipPersonal.setCertificateRemark(certificateRemark);
+                vipPersonal.setCreateUser(userName);
+                vipPersonal.setCreateTime(new Date());
+                vipPersonal.setModifyUser(userName);
+                vipPersonal.setModifyTime(new Date());
+                vipPersonal.setCertificateStatus("0");
+                this.vipPersonalDao.save(vipPersonal);
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    public Pagination<VipActivityNotice> getVipActivityNoticeByPage(SearchFilter searchFilter) {
+        //查询条件
+        List<Criterion> queryList = new ArrayList<Criterion>();
+        //排序条件
+        List<Order> orderList = new ArrayList<Order>();
+        //分页
+        Integer iDisplayStart = searchFilter.getiDisplayStart();
+        Integer iDisplayLength = searchFilter.getiDisplayLength();
+        if (searchFilter.getsSearch1() != null && StringUtils.isNotBlank(searchFilter.getsSearch1())) {
+            queryList.add(Restrictions.eq("activityImportDate", IfishUtil.StrToDate(searchFilter.getsSearch1())));
+        }
+        orderList.add(Order.desc("activityImportDate"));
+        Pagination<VipActivityNotice> page = this.vipActivityNoticeDao.findByCriteria(iDisplayStart, iDisplayLength, orderList, queryList.toArray(new Criterion[queryList.size()]));
+
+        return page;
+    }
+
+    @Override
+    public void filesSaveVipActivityNotice(InputStream inputStream, String userName, JSONObject param,String smsType) {
+
+        HSSFWorkbook wk = null;
+        VipActivityNotice vipActivityNotice = null;
+        SendSmsResponse response = null;
+        try {
+            wk = new HSSFWorkbook(inputStream);
+            HSSFSheet sheet = wk.getSheetAt(0);
+            int rows = sheet.getLastRowNum();
+            for (int i = 1; i <= rows; i++) {
+                VipSmsResult vipSmsResult = new VipSmsResult();
+                HSSFRow row = sheet.getRow(i);
+                row.getCell(0).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(2).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(3).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(4).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
+                row.getCell(6).setCellType(Cell.CELL_TYPE_STRING);
+                String activityMemberName = row.getCell(0).getStringCellValue();
+                if (StringUtils.isBlank(activityMemberName)) {
+                    break;
+                }
+                String activityContact = row.getCell(1).getStringCellValue();
+                String activityContactTel = row.getCell(2).getStringCellValue();
+                String activityPhone = row.getCell(3).getStringCellValue();
+                String activityEmail = row.getCell(4).getStringCellValue();
+                String activityPosition = row.getCell(5).getStringCellValue();
+                String activityWechat = row.getCell(6).getStringCellValue();
+
+                vipActivityNotice = new VipActivityNotice();
+                vipActivityNotice.setActivityMemberName(activityMemberName);
+                vipActivityNotice.setActivityContact(activityContact);
+                vipActivityNotice.setActivityContactTel(activityContactTel);
+                vipActivityNotice.setActivityPhone(activityPhone);
+                vipActivityNotice.setActivityEmail(activityEmail);
+                vipActivityNotice.setActivityWechat(activityWechat);
+                vipActivityNotice.setActivityPosition(activityPosition);
+                vipActivityNotice.setActivityImportDate(new Date());
+                vipActivityNotice.setCreateUser(userName);
+                vipActivityNotice.setCreateTime(new Date());
+                VipActivityNotice activityNotice = this.vipActivityNoticeDao.save(vipActivityNotice);
+
+                vipSmsResult.setResultBussId(activityNotice.getActivityId());
+                vipSmsResult.setResultTel(activityContactTel);
+                vipSmsResult.setResultTemplate(smsType);
+                response = SmsUtil.sendSms(activityContactTel, smsType, param.toJSONString());
+                System.out.println("短信发送-Result："  + response.getCode() + "-" + response.getMessage());
+                vipSmsResult.setResultCode(response.getCode());
+                vipSmsResult.setResultMessage(response.getMessage());
+                vipSmsResult.setResultRequestId(response.getRequestId());
+                vipSmsResult.setResultBizId(response.getBizId());
+                vipSmsResult.setResultCreateTime(new Date());
+                this.vipSmsResultDao.save(vipSmsResult);
+
+
+
+
+
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/src/main/java/com/ifish/util/SmsUtil.java b/src/main/java/com/ifish/util/SmsUtil.java
index e727cf9..5c5bfa9 100644
--- a/src/main/java/com/ifish/util/SmsUtil.java
+++ b/src/main/java/com/ifish/util/SmsUtil.java
@@ -71,7 +71,7 @@ public class SmsUtil {
         param.put("signTime","8:30-9:00");
         param.put("contact","胡萧 18907487848");
         //发短信
-        SendSmsResponse response = sendSms("18521303581","SMS_139242334",param.toJSONString());
+        SendSmsResponse response = sendSms("18521303581","SMS_139227937",param.toJSONString());
         System.out.println("短信接口返回的数据----------------");
         System.out.println("Code=" + response.getCode());
         System.out.println("Message=" + response.getMessage());
diff --git a/src/main/webapp/WEB-INF/view/htm/taglib.jsp b/src/main/webapp/WEB-INF/view/htm/taglib.jsp
index fd51b04..3304870 100644
--- a/src/main/webapp/WEB-INF/view/htm/taglib.jsp
+++ b/src/main/webapp/WEB-INF/view/htm/taglib.jsp
@@ -10,8 +10,8 @@
         picturePath = request.getScheme() + "://" + request.getServerName() + ":81/";
     } //测试环境
     else if (IfishFileDirectory.env.equals("test")) {
-        basePath = "http://139.196.24.156:8080/";
-        picturePath = "http://139.196.24.156:8080/";
+        basePath = "http://139.196.24.156:8888/";
+        picturePath = "http://139.196.24.156:8888/";
         IMPath = "http://www.zhangxinyanv5.top/neteaseIM/im/index.html";
     } //正式环境
     else if (IfishFileDirectory.env.equals("product")) {
diff --git a/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp
new file mode 100644
index 0000000..75c575f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp
@@ -0,0 +1,295 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>会议活动通知</title>
+        <!-- css and js -->
+        <%@ include file="../htm/script.jsp" %>
+        <link href="<%=basePath%>static/css/datepicker.css" rel="stylesheet"/>
+        <script src="<%=basePath%>static/js/date-time/bootstrap-datepicker.min.js"></script>
+        <style type="text/css">
+            .important
+            {
+                vertical-align:middle;
+                text-align:right;
+                padding:10px;
+            }
+        </style>
+        <script type="text/javascript">
+            var dataTable = null;
+            var dataTableMember = null;
+            $(function () {
+                $("#searchTable").find("td:even").addClass("important");
+                $("#searchTable").find("input").addClass("searchClass");
+                $("#searchTable").find("select").addClass("searchClass");
+
+                //日期控件
+                $('#sSearch1').datepicker({
+                    language: 'zh-CN',
+                    format: "yyyy-mm-dd"
+                });
+                //分页
+                dataTable = $("#sample-table-2").dataTable({
+                    "sPaginationType": "bootstrap",
+                    //"bProcessing": true,
+                    "bLengthChange": true,
+                    "bFilter": false,
+                    "bServerSide": true,//指定从服务器端获取数据
+                    "sAjaxSource": "<%=basePath%>page/vip/activityList.do",
+                    "fnServerData": returnServerData,
+                    "aoColumns": [
+                        {"mData": "activityMemberName","bSortable": false },
+                        {"mData": "activityContact", "bSortable": false},
+                        {"mData": "activityContactTel", "bSortable": false},
+                        {"mData": "activityPhone", "bSortable": false},
+                        {"mData": "activityEmail", "bSortable": false},
+                        {"mData": "activityWechat", "bSortable": false},
+                        {"mData": "activityPosition", "bSortable": false},
+                        {"mData": "activityImportDate", "bSortable": false}
+                    ],
+                    "oLanguage": {
+                        "sLengthMenu": "每页显示 _MENU_条",
+                        "sZeroRecords": "没有找到符合条件的数据",
+                        "sInfo": "当前第 _START_ - _END_ 条　共计 _TOTAL_ 条",
+                        "sProcessing": "<img src='<%=basePath%>static/css/images/loading.gif'>",
+                        "sInfoEmpty": "木有记录",
+                        "sInfoFiltered": "(从 _MAX_ 条记录中过滤)",
+                        "sSearch": "",
+                        "oPaginate": {
+                            "sFirst": "首页",
+                            "sPrevious": "前一页",
+                            "sNext": "后一页",
+                            "sLast": "尾页"
+                        }
+                    }
+                });
+
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="templateDownload" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">模板下载</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="import" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">导入</span></a></label>');
+                //重置
+                $("#reset").click(function () {
+                    var searchClass = $(".searchClass");
+                    for (var i = 0; i < searchClass.length; i++) {
+                        $(searchClass[i]).val("");
+                    }
+                    dataTable.fnDraw();
+                });
+
+                //模态框
+                $('.modal').modal({
+                    backdrop: 'static',
+                    show: false
+                });
+                //关闭
+                $(".closeBtn").click(function () {
+                    $('.modal').modal("hide");
+                });
+                $("#templateDownload").click(function () {
+                    $("#templateDownForm").submit();
+                });
+                $("#import").click(function () {
+                    $("#vipSmsModal").modal("show");
+                });
+
+                $("#addOrUpdateSubmitBtn").click(function () {
+                    $("#fileUpload").click();
+                });
+
+                //自动查询
+                $("#searchTable").find("input,select").change(function () {
+                    dataTable.fnDraw();
+                });
+            });
+
+            //服务器返回数据
+            function returnServerData(sSource, aoData, fnCallback) {
+                //查询参数
+                var searchClass = $(".searchClass");
+                for (var i = 0; i < searchClass.length; i++) {
+                    var id = $(searchClass[i]).attr("id");
+                    var value = $(searchClass[i]).val();
+                    aoData.push({"name": id, "value": value});
+                }
+                $.ajax({
+                    "url": sSource,
+                    "type": "POST",
+                    "data": aoData,
+                    "dataType": "json",
+                    "cache": false,
+                    "success": function (json) {
+                        fnCallback(json);
+                    }
+                });
+            }
+            //刷新当前页
+            function refreshTable() {
+                var iDisplayStart = dataTable.fnSettings()._iDisplayStart;
+                var iDisplayLength = dataTable.fnSettings()._iDisplayLength;
+                var pageNum = (iDisplayStart + iDisplayLength) / iDisplayLength;
+                dataTable.fnPageChange(--pageNum, true);
+            }
+
+            function uploadFile() {
+                var file = $("#fileUpload");
+                var fileName = file[0].files[0].name;
+                var suffixName = fileName.substr(fileName.lastIndexOf("."))
+                if (suffixName != '.xls') {
+                    jAlert('只能为xls的文件！', '提示');
+                    return ;
+                }
+                $("#importForm").submit();
+            }
+
+        </script>
+    </head>
+
+    <body>
+
+        <!-- 头部 -->
+        <%@ include file="../htm/header.jsp" %>
+        <!-- 主体 -->
+        <div class="main-container" id="main-container">
+            <script type="text/javascript">
+                try {
+                    ace.settings.check('main-container', 'fixed')
+                } catch (e) {
+                }
+            </script>
+            <div class="main-container-inner">
+                <!-- 侧边栏 -->
+                <%@ include file="../htm/sidebar.jsp" %>
+                <!-- 主体内容 -->
+                <div class="main-content">
+                    <div class="breadcrumbs" id="breadcrumbs">
+                        <script type="text/javascript">
+                            try {
+                                ace.settings.check('breadcrumbs', 'fixed')
+                            } catch (e) {
+                            }
+                        </script>
+                        <ul class="breadcrumb">
+                            <li>
+                                <i class="icon-home home-icon"></i>
+                                <a href="<%=basePath%>page/public/index.do">首页</a>
+                            </li>
+                                <li class="active">会议活动通知列表</li>
+                        </ul>
+                    </div>
+                    <div class="page-content">
+                        <div class="row">
+                            <div class="col-xs-12">
+                                <div class="table-header"></div>
+                                <div class="table-responsive">
+                                    <table id="searchTable" class="col-xs-12">
+                                        <tr>
+                                            <td>
+                                                <label>导入时间</label>
+                                            </td>
+                                            <td>
+                                                <input type="text" name="sSearch1" id='sSearch1' class="input-medium" value="" />
+                                            </td>
+                                        </tr>
+
+                                        <tr>
+                                            <td colspan="12" style="text-align:center;">
+                                                <button type="button"  class="btn btn-sm btn-info" onclick="refreshTable();" style="margin-right:20px;"><i class="icon-refresh"></i>刷新</button>
+                                                <button id="reset" type="reset"  class="btn btn-sm btn-info" style="margin-right:20px;"><i class="icon-undo"></i>重置</button>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <table id="sample-table-2" class="table table-striped table-bordered table-hover">
+                                        <thead>
+                                            <tr>
+                                                <th>单位名称</th>
+                                                <th>联系人</th>
+                                                <th>手机</th>
+                                                <th>电话</th>
+                                                <th>邮箱</th>
+                                                <th>职位</th>
+                                                <th>微信</th>
+                                                <th>导入时间</th>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                <form id="templateDownForm" action="<%=basePath%>page/vip/downloadActivityImportTemplateToExcel.do"></form>
+                <form id="importForm" action="<%=basePath%>page/vip/downloadActivityImportToExcel.do" class="form-horizontal" method="post" enctype="multipart/form-data">
+                    <div class="modal fade" id="vipSmsModal">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button type="button" class="closeBtn close">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                    <h4 class="modal-title">短信发送</h4>
+                                </div>
+                                <div class="modal-body row">
+                                    <div class="col-xs-12">
+                                        <div class="space-4"></div>
+                                        <div class="form-group">
+                                            <label class="col-xs-2 control-label no-padding-right">短信类型<span style="color:red;">*</span></label>
+                                            <div class="col-xs-8">
+                                                <select id="smsType" name="smsType" class="form-control">
+                                                    <option value="SMS_139227937">活动通知</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="space-4" id="SMS_139227937_smsTitle_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsTitle">
+                                            <label class="col-xs-2 control-label no-padding-right">会议名称<span style="color:red;">*</span></label>
+                                            <div class="col-xs-8">
+                                                <input type="text" id='smsTitle' name="smsTitle" class="input-medium" maxlength='20'/>
+                                            </div>
+                                        </div>
+                                        <div class="space-4" id="SMS_139227937_smsTime_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsTime">
+                                            <label class="col-xs-2 control-label no-padding-right">会议时间<span style="color:red;">*</span></label>
+                                            <div class="col-xs-8">
+                                                <input type="text" id='smsTime' name="smsTime" class="input-medium" maxlength='20'/>
+                                            </div>
+                                        </div>
+                                        <div class="space-4" id="SMS_139227937_smsAddress_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsAddress">
+                                            <label class="col-xs-2 control-label no-padding-right">会议地址<span style="color:red;">*</span></label>
+                                            <div class="col-xs-8">
+                                                <input type="text" id='smsAddress' name="smsAddress" class="input-medium" maxlength='20'/>
+                                            </div>
+                                        </div>
+                                        <div class="space-4" id="SMS_139227937_smsSignTime_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsSignTime">
+                                            <label class="col-xs-2 control-label no-padding-right">签到时间<span style="color:red;">*</span></label>
+                                            <div class="col-xs-8">
+                                                <input type="text" id='smsSignTime' name="smsSignTime" class="input-medium" maxlength='20'/>
+                                            </div>
+                                        </div>
+                                        <div class="space-4" id="SMS_139227937_smsContact_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsContact">
+                                            <label class="col-xs-2 control-label no-padding-right">联系人及电话<span style="color:red;">*</span></label>
+                                            <div class="col-xs-8">
+                                                <input type="text" id='smsContact' name="smsContact" class="input-medium" value="胡萧" maxlength='20'/>
+                                                <input type="text" id='smsContactTel' name="smsContactTel" class="input-medium" value="18907487848" maxlength='20'/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="closeBtn btn btn-default">关闭</button>
+                                    <button type="button" id="addOrUpdateSubmitBtn" class="btn btn-primary">确定</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div style="display: none;"><input type="file" id="fileUpload" onchange="uploadFile();" name="fileUpload" /></div>
+                </form>
+
+
+                <!-- 设置工具 -->
+                <%@ include file="../htm/setting.jsp" %>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp b/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp
index 29aeba0..820fbd6 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp
@@ -46,13 +46,14 @@
                             return vipCompany.vipMember.memberName;
                         }, "bSortable": false},
                         {"mData": "certificateCard","bSortable": false },
-                        {"mData": "certificateLevel", "bSortable": false},
-                        {"mData": "certificateType", "bSortable": false},
                         {"mData": function (vipCompany) {
                             var certificateApplyTime = "<div class='label label-light'><b>证书申请时间:" + vipCompany.certificateApplyTime + "</b></div><br>";
                             var certificateMaturityTime = "<div class='label label-light'><b>证书到期时间:" + vipCompany.certificateMaturityTime + "</b></div><br>";
                             return certificateApplyTime + certificateMaturityTime;
                         }, "bSortable": false},
+                        {"mData": "certificateLevel", "bSortable": false},
+                        {"mData": "certificateType", "bSortable": false},
+                        {"mData": "certificateRemark", "bSortable": false},
                         {"mData": "openticketTime", "bSortable": false},
                         {"mData": "outcardTime", "bSortable": false},
                         {"mData": "annualReviewTime", "bSortable": false},
@@ -115,7 +116,10 @@
                    }
                });
 
-                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="addVipCompany" class="btn btn-xs btn-primary"><i class="icon-edit"></i><span class="no-text-shadow">新增</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="addVipCompany" class="btn btn-default btn-sm"><i class="icon-edit"></i><span class="no-text-shadow">新增</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="templateDownload" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">模板下载</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="export" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">导出</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="import" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">导入</span></a></label>');
                 //重置
                 $("#reset").click(function () {
                     var searchClass = $(".searchClass");
@@ -138,6 +142,7 @@
                     $("#outcardTime").val("");
                     $("#annualReviewTime").val("");
                     $("#cost").val("");
+                    $("#certificateRemark").val("");
                     $("#addOrUpdateSubmitBtn").attr("disabled",false);
                     $("#companyModal").modal("show");
                 });
@@ -156,6 +161,15 @@
                 $("#memberClose,#memberClose1").click(function () {
                     $("#memberModal").modal("hide");
                 });
+                $("#templateDownload").click(function () {
+                    $("#templateDownForm").submit();
+                });
+                $("#export").click(function () {
+                    $("#exportForm").submit();
+                });
+                $("#import").click(function () {
+                    $("#fileUpload").click();
+                });
 
                 //自动查询
                 $("#searchTableMember").find("input,select").change(function () {
@@ -273,6 +287,7 @@
                            $("#outcardTime").val(data.outcardTime);
                            $("#annualReviewTime").val(data.annualReviewTime);
                            $("#cost").val(data.cost);
+                           $("#certificateRemark").val(data.certificateRemark);
                            $("#companyModal").modal("show");
                        }
                        else{
@@ -340,6 +355,17 @@
                 dataTable.fnPageChange(--pageNum, true);
             }
 
+            function uploadFile() {
+                var file = $("#fileUpload");
+                var fileName = file[0].files[0].name;
+                var suffixName = fileName.substr(fileName.lastIndexOf("."))
+                if (suffixName != '.xls') {
+                    jAlert('只能为xls的文件！', '提示');
+                    return ;
+                }
+                $("#importForm").submit();
+            }
+
         </script>
     </head>
 
@@ -415,9 +441,10 @@
                                                 <th class="center">ID</th>
                                                 <th>单位名称</th>
                                                 <th>证书编号</th>
+                                                <th>证书时间</th>
                                                 <th>证书等级</th>
                                                 <th>证书类型</th>
-                                                <th>证书时间</th>
+                                                <th>备注</th>
                                                 <th>开票时间</th>
                                                 <th>出证时间</th>
                                                 <th>年审时间</th>
@@ -516,6 +543,14 @@
                                                     <input type="text" name="cost" id="cost" class="input-medium" maxlength="50" />
                                                 </div>
                                             </div>
+
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">备注</label>
+                                                <div class="col-xs-8">
+                                                    <textarea rows="3" cols="10" name="certificateRemark" id="certificateRemark" class="form-control" maxlength="50" required></textarea>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="modal-footer">
@@ -528,6 +563,13 @@
                     </form>
                 </div>
 
+                <form id="templateDownForm" action="<%=basePath%>page/vip/downloadCompanyImportTemplateToExcel.do"></form>
+                <form id="exportForm" action="<%=basePath%>page/vip/downloadCompanyExportToExcel.do"></form>
+                <div style="display: none;">
+                    <form id="importForm" action="<%=basePath%>page/vip/downloadCompanyImportToExcel.do" method="post" enctype="multipart/form-data">
+                        <input type="file" id="fileUpload" onchange="uploadFile();" name="fileUpload" />
+                    </form>
+                </div>
 
 
                 <div class="modal fade" id="memberModal">
diff --git a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
index 1479cab..c52922e 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
@@ -49,15 +49,28 @@
                         }, "bSortable": false},
                         {"mData": "memberName","bSortable": false },
                         {"mData": "memberLegal","bSortable": false },
-                        {"mData": "memberTel","bSortable": false },
-                        {"mData": "memberWechat","bSortable": false },
+                        {"mData": "memberLegalCard","bSortable": false },
+                        {"mData": "memberLevel","bSortable": false },
+                        {"mData": "memberAdmissionTime", "bSortable": false},
+                        {"mData": "memberMaturityTime", "bSortable": false},
                         {"mData": function (vipMember) {
                             return vipMember.memberType.typeName;
                         }, "bSortable": false},
-                        {"mData": "memberAdmissionTime", "bSortable": false},
-                        {"mData": "memberMaturityTime", "bSortable": false},
+                        {"mData": "memberTel","bSortable": false },
+                        {"mData": "memberWechat","bSortable": false },
+                        {"mData": "memberEmail","bSortable": false },
+                        {"mData": "memberRegisteredCapital","bSortable": false },
+                        {"mData": "memberEstablishedTime","bSortable": false },
+                        {"mData": "memberBirthday","bSortable": false },
+                        {"mData": "memberQualificationInfo","bSortable": false },
+                        {"mData": "memberWebsite","bSortable": false },
+                        {"mData": "memberNoticeBook","bSortable": false },
+                        {"mData": "memberDemand","bSortable": false },
+                        {"mData": "memberUrl","bSortable": false },
+                        {"mData": "memberSituation","bSortable": false },
                         {"mData": "memberContact", "bSortable": false},
                         {"mData": "memberContactTel", "bSortable": false},
+                        {"mData": "memberContactSituation", "bSortable": false},
                         {"mData": function (vipMember) {
                             return vipMember.memberReferrer.referrerName;
                         }, "bSortable": false},
@@ -145,42 +158,8 @@
                     $("#oneTel").val("");
                     $("#arrTel").val("");
                     $("#vipSmsModal").modal("show");
-                    var type_ = $("#smsType").val();
-                    if (type_ == 'SMS_139242334') {
-                        $('div[id^=SMS_139242320]').each(function (item, index) {
-                            $(this).hide();
-                        });
-                        $('div[id^=SMS_139242334]').each(function (item, index) {
-                            $(this).show();
-                        });
-                    } else {
-                        $('div[id^=SMS_139242334]').each(function (item, index) {
-                            $(this).hide();
-                        });
-                        $('div[id^=SMS_139242320]').each(function (item, index) {
-                            $(this).show();
-                        });
-                    }
                 });
 
-                $("#smsType").change(function () {
-                    var type_ = $("#smsType").val();
-                    if (type_ == 'SMS_139242334') {
-                        $('div[id^=SMS_139242320]').each(function (item, index) {
-                            $(this).hide();
-                        });
-                        $('div[id^=SMS_139242334]').each(function (item, index) {
-                            $(this).show();
-                        });
-                    } else {
-                        $('div[id^=SMS_139242334]').each(function (item, index) {
-                            $(this).hide();
-                        });
-                        $('div[id^=SMS_139242320]').each(function (item, index) {
-                            $(this).show();
-                        });
-                    }
-                });
 
                 $("#templateDownload").click(function () {
                     $("#templateDownForm").submit();
@@ -269,22 +248,6 @@
             function sendSms(tel) {
                 $("#oneTel").val(tel);
                 $("#vipSmsModal").modal("show");
-                var type_ = $("#smsType").val();
-                if (type_ == 'SMS_139242334') {
-                    $('div[id^=SMS_139242320]').each(function (item, index) {
-                        $(this).hide();
-                    });
-                    $('div[id^=SMS_139242334]').each(function (item, index) {
-                        $(this).show();
-                    });
-                } else {
-                    $('div[id^=SMS_139242334]').each(function (item, index) {
-                        $(this).hide();
-                    });
-                    $('div[id^=SMS_139242320]').each(function (item, index) {
-                        $(this).show();
-                    });
-                }
             }
             
             function uploadFile() {
@@ -406,13 +369,26 @@
                                                 <th><input type="checkbox" name="checkAll" id="checkAll" onclick=""/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;全选</th>
                                                 <th>单位名称</th>
                                                 <th>法人代表</th>
-                                                <th>手机号码</th>
-                                                <th>微信</th>
-                                                <th>会员类型</th>
+                                                <th>法人身份证号</th>
+                                                <th>等级</th>
                                                 <th>入会时间</th>
                                                 <th>到期时间</th>
+                                                <th>会员类型</th>
+                                                <th>手机号码</th>
+                                                <th>微信</th>
+                                                <th>邮箱</th>
+                                                <th>注册资金</th>
+                                                <th>成立时间</th>
+                                                <th>生日</th>
+                                                <th>资质情况</th>
+                                                <th>官网</th>
+                                                <th>通知书</th>
+                                                <th>需求表</th>
+                                                <th>环保网</th>
+                                                <th>企业情况</th>
                                                 <th>联系人</th>
                                                 <th>联系电话</th>
+                                                <th>联系情况</th>
                                                 <th>推荐人</th>
                                                 <th>单位地址</th>
                                                 <th>会费</th>
@@ -452,49 +428,41 @@
                                             <label class="col-xs-2 control-label no-padding-right">短信类型<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <select id="smsType" name="smsType" class="form-control">
-                                                    <option value="SMS_139242320">生日</option>
-                                                    <option value="SMS_139242334">活动通知</option>
+                                                    <option value="SMS_139227937">活动通知</option>
                                                 </select>
                                             </div>
                                         </div>
-                                        <div class="space-4" id="SMS_139242320_smsTel_space"></div>
-                                        <div class="form-group" id="SMS_139242320_smsTel">
-                                            <label class="col-xs-2 control-label no-padding-right">秘书处电话<span style="color:red;">*</span></label>
-                                            <div class="col-xs-8">
-                                                <input type="text" id='smsTel' name="smsTel" class="input-medium" value="0731-84476408" maxlength='20'/>
-                                            </div>
-                                        </div>
 
-                                        <div class="space-4" id="SMS_139242334_smsTitle_space"></div>
-                                        <div class="form-group" id="SMS_139242334_smsTitle">
+                                        <div class="space-4" id="SMS_139227937_smsTitle_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsTitle">
                                             <label class="col-xs-2 control-label no-padding-right">会议名称<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <input type="text" id='smsTitle' name="smsTitle" class="input-medium" maxlength='20'/>
                                             </div>
                                         </div>
-                                        <div class="space-4" id="SMS_139242334_smsTime_space"></div>
-                                        <div class="form-group" id="SMS_139242334_smsTime">
+                                        <div class="space-4" id="SMS_139227937_smsTime_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsTime">
                                             <label class="col-xs-2 control-label no-padding-right">会议时间<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <input type="text" id='smsTime' name="smsTime" class="input-medium" maxlength='20'/>
                                             </div>
                                         </div>
-                                        <div class="space-4" id="SMS_139242334_smsAddress_space"></div>
-                                        <div class="form-group" id="SMS_139242334_smsAddress">
+                                        <div class="space-4" id="SMS_139227937_smsAddress_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsAddress">
                                             <label class="col-xs-2 control-label no-padding-right">会议地址<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <input type="text" id='smsAddress' name="smsAddress" class="input-medium" maxlength='20'/>
                                             </div>
                                         </div>
-                                        <div class="space-4" id="SMS_139242334_smsSignTime_space"></div>
-                                        <div class="form-group" id="SMS_139242334_smsSignTime">
+                                        <div class="space-4" id="SMS_139227937_smsSignTime_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsSignTime">
                                             <label class="col-xs-2 control-label no-padding-right">签到时间<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <input type="text" id='smsSignTime' name="smsSignTime" class="input-medium" maxlength='20'/>
                                             </div>
                                         </div>
-                                        <div class="space-4" id="SMS_139242334_smsContact_space"></div>
-                                        <div class="form-group" id="SMS_139242334_smsContact">
+                                        <div class="space-4" id="SMS_139227937_smsContact_space"></div>
+                                        <div class="form-group" id="SMS_139227937_smsContact">
                                             <label class="col-xs-2 control-label no-padding-right">联系人及电话<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <input type="text" id='smsContact' name="smsContact" class="input-medium" value="胡萧" maxlength='20'/>
diff --git a/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp b/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp
index 140b490..94adf12 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp
@@ -16,7 +16,7 @@
                 $("#searchTableReferrer").find("select").addClass("searchClass");
 
                 //日期控件
-                $('#memberAdmissionTime,#memberMaturityTime,#referrerAdmissionTime,#certificateApplyTime,#certificateMaturityTime,#openticketTime,#outcardTime,#annualReviewTime').datepicker({
+                $('#memberAdmissionTime,#memberEstablishedTime,#memberMaturityTime,#referrerAdmissionTime,#certificateApplyTime,#certificateMaturityTime,#openticketTime,#outcardTime,#annualReviewTime').datepicker({
 					   language: 'zh-CN',
 					   format: "yyyy-mm-dd"
 				   });
@@ -198,15 +198,12 @@
                 $('#form-company').ajaxForm(function(data){
                     //弹出ajax请求后的回调结果
                     var _data = eval("(" + data + ")");
-                    alert(_data);
-					alert(_data.companyId);
                     if(_data.companyId != null && _data.companyId != 'undefined'){
                         //刷新当前页面
                         $("#companyModal").modal("hide");
                         jAlert('成功', '提示');
                         $("#addOrUpdateCompanySubmitBtn").attr("disabled",false);
                         var ids = $("#companyIds").val().split("_");
-                        alert(ids);
                         var b = true;
                         ids.forEach(function (val,index) {
                             if (val == _data.companyId) {
@@ -388,38 +385,37 @@
 						<div class="col-xs-12">
 							<div class="table-responsive">
 								<h4 class="header smaller lighter blue">会员详情</h4>
-								<div class="page-content">
-									<h4 class="header smaller lighter blue"></h4>
-									<div class="row">
-										<div class="col-xs-12">
-											<form id="form-add" method="post" class="form-horizontal" action="<%=basePath%>page/vip/memberAddOrUpdate.do">
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">单位名称<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+								<div class="row" style="margin-left: 30px;">
+									<div class="col-xs-12">
+										<form id="form-add" method="post" class="form-horizontal" role="form" action="<%=basePath%>page/vip/memberAddOrUpdate.do">
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">单位名称</span>
 														<input type="hidden" name="memberId" id="memberId" value=""/>
 														<input type="hidden" name="companyIds" id="companyIds" value=""/>
 														<input type="hidden" name="memberReferrer.referrerId" id="referrerId" value=""/>
 														<input type="text" name="memberName" id="memberName" value="${vipMember.memberName}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">法人代表<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">法人代表</span>
 														<input type="text" name="memberLegal" id="memberLegal" value="${vipMember.memberLegal}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">法人身份证号<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">法人身份证号</span>
 														<input type="text" name="memberLegalCard" id="memberLegalCard" value="${vipMember.memberLegalCard}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">会员类型<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会员类型</span>
 														<select name="memberType.typeId" id="memberType.typeId">
 															<c:forEach items="${vipTypes}" var="vipType">
 																<option value="${vipType.typeId}">${vipType.typeName}</option>
@@ -427,149 +423,197 @@
 														</select>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">会员编号<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会员编号</span>
 														<input type="text" name="memberCard" id="memberCard" value="${vipMember.memberCard}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">手机<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">手机</span>
 														<input type="text" name="memberTel" id="memberTel" value="${vipMember.memberTel}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">QQ<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">QQ</span>
 														<input type="text" name="memberQQ" id="memberQQ" value="${vipMember.memberQQ}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">微信<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">微信</span>
 														<input type="text" name="memberWechat" id="memberWechat" value="${vipMember.memberWechat}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">邮箱<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">邮箱</span>
 														<input type="text" name="memberEmail" id="memberEmail" value="${vipMember.memberEmail}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">入会时间<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">成立时间</span>
+														<input type="text" name="memberEstablishedTime" id="memberEstablishedTime" value="${vipMember.memberEstablishedTime}" class="form-control" required="required" maxlength="20"/>
+													</div>
+												</div>
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">入会时间</span>
 														<input type="text" name="memberAdmissionTime" id="memberAdmissionTime" value="${vipMember.memberAdmissionTime}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">到期时间<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">到期时间</span>
 														<input type="text" name="memberMaturityTime" id="memberMaturityTime" value="${vipMember.memberMaturityTime}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">联系人<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">联系人</span>
 														<input type="text" name="memberContact" id="memberContact" value="${vipMember.memberContact}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">联系人电话<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">联系人电话</span>
 														<input type="text" name="memberContactTel" id="memberContactTel" value="${vipMember.memberContactTel}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">联系情况<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">联系情况</span>
 														<textarea name="memberContactSituation" id="memberContactSituation" class="form-control" required="required" maxlength="200">${vipMember.memberContactSituation }</textarea>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">官网是否录入<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">官网</span>
 														<input type="text" name="memberWebsite" id="memberWebsite" value="${vipMember.memberWebsite}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">企业情况<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">企业情况</span>
 														<textarea name="memberSituation" id="memberSituation" class="form-control" required="required" maxlength="200">${vipMember.memberSituation }</textarea>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">生日<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">生日</span>
 														<input type="text" name="memberBirthday" id="memberBirthday" value="${vipMember.memberBirthday}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">单位地址<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">单位地址</span>
 														<input type="text" name="memberAddress" id="memberAddress" value="${vipMember.memberAddress}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">企业网址<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">企业网址</span>
 														<input type="text" name="memberUrl" id="memberUrl" value="${vipMember.memberUrl}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">需求信息<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">需求表</span>
 														<textarea name="memberDemand" id="memberDemand" class="form-control" required="required" maxlength="200">${vipMember.memberDemand }</textarea>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">项目匹配<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">项目匹配</span>
 														<input type="text" name="memberItem" id="memberItem" value="${vipMember.memberItem}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">会费<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会费</span>
 														<input type="text" name="memberFee" id="memberFee" value="${vipMember.memberFee}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">是否有环保资质<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">是否有环保资质</span>
 														<select name="memberQualification" id="memberQualification">
 															<option value="0">是</option>
 															<option value="1">否</option>
 														</select>
 													</div>
 												</div>
-												<div class="clearfix form-actions">
-													<div class="col-md-offset-3 col-md-9">
-														<button class="btn btn-info" type="button" id="memberSubmitBtn"><i class="icon-ok bigger-110"></i>提交</button>
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">注册资金</span>
+														<input type="text" name="memberRegisteredCapital" id="memberRegisteredCapital" value="${vipMember.memberRegisteredCapital}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-											</form>
-										</div>
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">资质情况</span>
+														<textarea name="memberQualificationInfo" id="memberQualificationInfo" class="form-control" required="required" maxlength="200">${vipMember.memberQualificationInfo }</textarea>
+													</div>
+												</div>
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">通知书</span>
+														<input type="text" name="memberNoticeBook" id="memberNoticeBook" value="${vipMember.memberNoticeBook}" class="form-control" required="required" maxlength="20"/>
+													</div>
+												</div>
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会员等级</span>
+														<input type="text" name="memberLevel" id="memberLevel" value="${vipMember.memberLevel}" class="form-control" required="required" maxlength="20"/>
+													</div>
+												</div>
+											</div>
+
+											<div class="clearfix form-actions">
+												<div class="col-md-offset-3 col-md-9">
+													<button class="btn btn-info" type="button" id="memberSubmitBtn"><i class="icon-ok bigger-110"></i>提交</button>
+												</div>
+											</div>
+										</form>
 									</div>
 								</div>
 								<div class="space"></div>
diff --git a/src/main/webapp/WEB-INF/view/vip/vipMemberUpdate.jsp b/src/main/webapp/WEB-INF/view/vip/vipMemberUpdate.jsp
index 80cd960..25d3779 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipMemberUpdate.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipMemberUpdate.jsp
@@ -16,7 +16,7 @@
                 $("#searchTableReferrer").find("select").addClass("searchClass");
 
                 //日期控件
-                $('#memberAdmissionTime,#memberMaturityTime,#referrerAdmissionTime,#certificateApplyTime,#certificateMaturityTime,#openticketTime,#outcardTime,#annualReviewTime').datepicker({
+                $('#memberAdmissionTime,#memberEstablishedTime,#memberMaturityTime,#referrerAdmissionTime,#certificateApplyTime,#certificateMaturityTime,#openticketTime,#outcardTime,#annualReviewTime').datepicker({
 					   language: 'zh-CN',
 					   format: "yyyy-mm-dd"
 				   });
@@ -384,188 +384,235 @@
 						<div class="col-xs-12">
 							<div class="table-responsive">
 								<h4 class="header smaller lighter blue">会员详情</h4>
-								<div class="page-content">
-									<h4 class="header smaller lighter blue"></h4>
-									<div class="row">
-										<div class="col-xs-12">
-											<form id="form-add" method="post" class="form-horizontal" action="<%=basePath%>page/vip/memberAddOrUpdate.do">
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">单位名称<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
-														<input type="hidden" name="memberId" id="memberId" value="${vipMember.memberId}"/>
+								<div class="row" style="margin-left: 30px;">
+									<div class="col-xs-12">
+										<form id="form-add" method="post" class="form-horizontal" role="form" action="<%=basePath%>page/vip/memberAddOrUpdate.do">
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">单位名称</span>
+														<input type="hidden" name="memberId" id="memberId" value=""/>
 														<input type="hidden" name="companyIds" id="companyIds" value=""/>
 														<input type="hidden" name="memberReferrer.referrerId" id="referrerId" value=""/>
 														<input type="text" name="memberName" id="memberName" value="${vipMember.memberName}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">法人代表<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">法人代表</span>
 														<input type="text" name="memberLegal" id="memberLegal" value="${vipMember.memberLegal}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">法人身份证号<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">法人身份证号</span>
 														<input type="text" name="memberLegalCard" id="memberLegalCard" value="${vipMember.memberLegalCard}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">会员类型<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会员类型</span>
 														<select name="memberType.typeId" id="memberType.typeId">
 															<c:forEach items="${vipTypes}" var="vipType">
-																<option value="${vipType.typeId}">${vipType.typeName}</option>
+																<option value="${vipType.typeId}" <c:if test="${vipType.typeId == vipMember.memberType.typeId}">selected</c:if> >${vipType.typeName}</option>
 															</c:forEach>
 														</select>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">会员编号<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会员编号</span>
 														<input type="text" name="memberCard" id="memberCard" value="${vipMember.memberCard}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">手机<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">手机</span>
 														<input type="text" name="memberTel" id="memberTel" value="${vipMember.memberTel}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">QQ<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">QQ</span>
 														<input type="text" name="memberQQ" id="memberQQ" value="${vipMember.memberQQ}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">微信<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">微信</span>
 														<input type="text" name="memberWechat" id="memberWechat" value="${vipMember.memberWechat}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">邮箱<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">邮箱</span>
 														<input type="text" name="memberEmail" id="memberEmail" value="${vipMember.memberEmail}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">入会时间<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">成立时间</span>
+														<input type="text" name="memberEstablishedTime" id="memberEstablishedTime" value="<fmt:formatDate value="${vipMember.memberEstablishedTime}" pattern="yyyy-MM-dd" />" class="form-control" required="required" maxlength="20"/>
+													</div>
+												</div>
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">入会时间</span>
 														<input type="text" name="memberAdmissionTime" id="memberAdmissionTime" value="<fmt:formatDate value="${vipMember.memberAdmissionTime}" pattern="yyyy-MM-dd" />" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">到期时间<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">到期时间</span>
 														<input type="text" name="memberMaturityTime" id="memberMaturityTime" value="<fmt:formatDate value="${vipMember.memberMaturityTime}" pattern="yyyy-MM-dd" />" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">联系人<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">联系人</span>
 														<input type="text" name="memberContact" id="memberContact" value="${vipMember.memberContact}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">联系人电话<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">联系人电话</span>
 														<input type="text" name="memberContactTel" id="memberContactTel" value="${vipMember.memberContactTel}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">联系情况<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">联系情况</span>
 														<textarea name="memberContactSituation" id="memberContactSituation" class="form-control" required="required" maxlength="200">${vipMember.memberContactSituation }</textarea>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">官网是否录入<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">官网</span>
 														<input type="text" name="memberWebsite" id="memberWebsite" value="${vipMember.memberWebsite}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">企业情况<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">企业情况</span>
 														<textarea name="memberSituation" id="memberSituation" class="form-control" required="required" maxlength="200">${vipMember.memberSituation }</textarea>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">生日<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">生日</span>
 														<input type="text" name="memberBirthday" id="memberBirthday" value="${vipMember.memberBirthday}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">单位地址<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">单位地址</span>
 														<input type="text" name="memberAddress" id="memberAddress" value="${vipMember.memberAddress}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">企业网址<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">企业网址</span>
 														<input type="text" name="memberUrl" id="memberUrl" value="${vipMember.memberUrl}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">需求信息<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">需求表</span>
 														<textarea name="memberDemand" id="memberDemand" class="form-control" required="required" maxlength="200">${vipMember.memberDemand }</textarea>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">项目匹配<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">项目匹配</span>
 														<input type="text" name="memberItem" id="memberItem" value="${vipMember.memberItem}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">会费<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会费</span>
 														<input type="text" name="memberFee" id="memberFee" value="${vipMember.memberFee}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-												<div class="space-4"></div>
-												<div class="form-group">
-													<label class="col-sm-3 control-label no-padding-right">是否有环保资质<span style="color:red;">*</span></label>
-													<div class="col-sm-4">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">是否有环保资质</span>
 														<select name="memberQualification" id="memberQualification">
-															<option value="0" <c:if test="${vipMember.memberQualification == '0'}">selected</c:if>>是</option>
-															<option value="1" <c:if test="${vipMember.memberQualification == '1'}">selected</c:if>>否</option>
+															<option value="0">是</option>
+															<option value="1">否</option>
 														</select>
 													</div>
 												</div>
-												<div class="clearfix form-actions">
-													<div class="col-md-offset-3 col-md-9">
-														<button class="btn btn-info" type="button" id="memberSubmitBtn"><i class="icon-ok bigger-110"></i>提交</button>
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">注册资金</span>
+														<input type="text" name="memberRegisteredCapital" id="memberRegisteredCapital" value="${vipMember.memberRegisteredCapital}" class="form-control" required="required" maxlength="20"/>
 													</div>
 												</div>
-											</form>
-										</div>
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">资质情况</span>
+														<textarea name="memberQualificationInfo" id="memberQualificationInfo" class="form-control" required="required" maxlength="200">${vipMember.memberQualificationInfo }</textarea>
+													</div>
+												</div>
+											</div>
+
+											<div class="row">
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">通知书</span>
+														<input type="text" name="memberNoticeBook" id="memberNoticeBook" value="${vipMember.memberNoticeBook}" class="form-control" required="required" maxlength="20"/>
+													</div>
+												</div>
+												<div class="form-group col-lg-3">
+													<div class="input-group">
+														<span class="input-group-addon">会员等级</span>
+														<input type="text" name="memberLevel" id="memberLevel" value="${vipMember.memberLevel}" class="form-control" required="required" maxlength="20"/>
+													</div>
+												</div>
+											</div>
+
+											<div class="clearfix form-actions">
+												<div class="col-md-offset-3 col-md-9">
+													<button class="btn btn-info" type="button" id="memberSubmitBtn"><i class="icon-ok bigger-110"></i>提交</button>
+												</div>
+											</div>
+										</form>
 									</div>
 								</div>
 								<div class="space"></div>
diff --git a/src/main/webapp/WEB-INF/view/vip/vipPersonal.jsp b/src/main/webapp/WEB-INF/view/vip/vipPersonal.jsp
index 4837d7e..abd7508 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipPersonal.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipPersonal.jsp
@@ -38,16 +38,17 @@
                     "aoColumns": [
                         {"mData": "personalId", "bSortable": false},
                         {"mData": "personalName", "bSortable": false},
-                        {"mData": "cardNum","bSortable": false },
+                        {"mData": "personalGender", "bSortable": false},
                         {"mData": "certificateCard", "bSortable": false},
-                        {"mData": "certificateLevel", "bSortable": false},
-                        {"mData": "certificateType", "bSortable": false},
+                        {"mData": "cardNum","bSortable": false },
                         {"mData": function (vipPersonal) {
                             var certificateApplyTime = "<div class='label label-light'><b>证书申请时间:" + vipPersonal.certificateApplyTime + "</b></div><br>";
                             var certificateReceiveTime = "<div class='label label-light'><b>证书领取时间:" + vipPersonal.certificateReceiveTime + "</b></div><br>";
                             var certificateMaturityTime = "<div class='label label-light'><b>证书到期时间:" + vipPersonal.certificateMaturityTime + "</b></div><br>";
                             return certificateApplyTime + certificateReceiveTime + certificateMaturityTime;
                         }, "bSortable": false},
+                        {"mData": "certificateLevel", "bSortable": false},
+                        {"mData": "certificateType", "bSortable": false},
                         {"mData": "uploadWebsite", "bSortable": false},
                         {"mData": "certificateRemark", "bSortable": false},
                         {"mData": function(vipPersonal){
@@ -74,7 +75,10 @@
                         }
                     }
                 });
-                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="addVipPersonal" class="btn btn-xs btn-primary"><i class="icon-edit"></i><span class="no-text-shadow">新增</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="addVipPersonal" class="btn btn-default btn-sm"><i class="icon-edit"></i><span class="no-text-shadow">新增</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="templateDownload" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">模板下载</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="export" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">导出</span></a></label>');
+                $("#sample-table-2_length").append('&nbsp;&nbsp;&nbsp;&nbsp;<label><a href="javascript:void(0);" id="import" class="btn btn-default btn-sm"><i class="glyphicon glyphicon-cloud-download"></i><span class="no-text-shadow">导入</span></a></label>');
                 //重置
                 $("#reset").click(function () {
                     var searchClass = $(".searchClass");
@@ -86,6 +90,13 @@
                 $("#addVipPersonal").click(function(){
                     $("#personalId").val("");
                     $("#personalName").val("");
+                    $("#personalTel").val("");
+                    $("#personalWechat").val("");
+                    $("#personalEmail").val("");
+                    $("#personalResearchDirection").val("");
+                    $("#personalProfession").val("");
+                    $("#personalSchool").val("");
+                    $("#personalMember").val("");
                     $("#cardNum").val("");
                     $("#certificateCard").val("");
                     $("#certificateLevel").val("");
@@ -111,6 +122,15 @@
                 $("#searchTable").find("input,select").change(function () {
                     dataTable.fnDraw();
                 });
+                $("#templateDownload").click(function () {
+                    $("#templateDownForm").submit();
+                });
+                $("#export").click(function () {
+                    $("#exportForm").submit();
+                });
+                $("#import").click(function () {
+                    $("#fileUpload").click();
+                });
                 $("#addOrUpdateSubmitBtn").click(function(){
                     var personalName = $("#personalName").val();
                     if(personalName == ""){
@@ -193,6 +213,13 @@
                            $("#certificateMaturityTime").val(data.certificateMaturityTime);
                            $("#uploadWebsite").val(data.uploadWebsite);
                            $("#certificateRemark").val(data.certificateRemark);
+                           $("#personalTel").val(data.personalTel);
+                           $("#personalWechat").val(data.personalWechat);
+                           $("#personalEmail").val(data.personalEmail);
+                           $("#personalResearchDirection").val(data.personalResearchDirection);
+                           $("#personalProfession").val(data.personalProfession);
+                           $("#personalSchool").val(data.personalSchool);
+                           $("#personalMember").val(data.personalMember);
                            $("#personalModal").modal("show");
                        }
                        else{
@@ -260,6 +287,17 @@
                 dataTable.fnPageChange(--pageNum, true);
             }
 
+            function uploadFile() {
+                var file = $("#fileUpload");
+                var fileName = file[0].files[0].name;
+                var suffixName = fileName.substr(fileName.lastIndexOf("."))
+                if (suffixName != '.xls') {
+                    jAlert('只能为xls的文件！', '提示');
+                    return ;
+                }
+                $("#importForm").submit();
+            }
+
         </script>
     </head>
 
@@ -340,11 +378,12 @@
                                             <tr>
                                                 <th class="center">ID</th>
                                                 <th>姓名</th>
-                                                <th>身份证号</th>
+                                                <th>性别</th>
                                                 <th>证书编号</th>
+                                                <th>身份证号</th>
+                                                <th>证书时间</th>
                                                 <th>证书等级</th>
                                                 <th>证书类型</th>
-                                                <th>证书时间</th>
                                                 <th>证书上传官网</th>
                                                 <th>备注</th>
                                                 <th>操作</th>
@@ -382,6 +421,65 @@
                                                 </div>
                                             </div>
                                             <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">性别<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <select name="personalGender" id="personalGender">
+                                                        <option value="男">男</option>
+                                                        <option value="女">女</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">手机号码<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" name="personalTel" id="personalTel" class="form-control" maxlength="50"/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">微信<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" name="personalWechat" id="personalWechat" class="form-control" maxlength="50"/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">邮箱<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" name="personalEmail" id="personalEmail" class="form-control" maxlength="50"/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">研究方向<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" name="personalResearchDirection" id="personalResearchDirection" class="form-control" maxlength="50"/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">专业<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" name="personalProfession" id="personalProfession" class="form-control" maxlength="50"/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">毕业学校<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" name="personalSchool" id="personalSchool" class="form-control" maxlength="50"/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">单位名称<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" name="personalMember" id="personalMember" class="form-control" maxlength="50"/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
                                             <div class="form-group">
                                                 <label class="col-xs-2 control-label no-padding-right">证书等级<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
@@ -448,6 +546,13 @@
                         </div>
                     </form>
                 </div>
+                <form id="templateDownForm" action="<%=basePath%>page/vip/downloadPersonalImportTemplateToExcel.do"></form>
+                <form id="exportForm" action="<%=basePath%>page/vip/downloadPersonalExportToExcel.do"></form>
+                <div style="display: none;">
+                    <form id="importForm" action="<%=basePath%>page/vip/downloadPersonalImportToExcel.do" method="post" enctype="multipart/form-data">
+                        <input type="file" id="fileUpload" onchange="uploadFile();" name="fileUpload" />
+                    </form>
+                </div>
                 <!-- 设置工具 -->
                 <%@ include file="../htm/setting.jsp" %>
             </div>
diff --git a/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp b/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp
index 8b1da1d..c05ca20 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp
@@ -26,6 +26,10 @@
                     language: 'zh-CN',
                     format: "yyyy-mm-dd"
                 });
+                $('#referrerBirthday').datepicker({
+                   language: 'zh-CN',
+                   format: "mm-dd"
+               });
                 //分页
                 dataTable = $("#sample-table-2").dataTable({
                     "sPaginationType": "bootstrap",
@@ -38,14 +42,19 @@
                     "aoColumns": [
                         {"mData": "referrerId", "bSortable": false},
                         {"mData": "referrerName", "bSortable": false},
+                        {"mData": "referrerCard", "bSortable": false},
                         {"mData": function(vipReferrer) {
                                 return vipReferrer.referrerType.typeName;
                         },"bSortable": false },
+                        {"mData": "referrerBirthday", "bSortable": false},
+                        {"mData": "referrerTel", "bSortable": false},
+                        {"mData": "referrerEmail", "bSortable": false},
                         {"mData": "referrerAdmissionTime", "bSortable": false},
                         {"mData": "referrerRemark", "bSortable": false},
-                        {"mData": "referrerRemark", "bSortable": false},
-                        {"mData": "createUser", "bSortable": false},
-                        {"mData": "createTime", "bSortable": false},
+                        {"mData": function (vipReferrer) {
+                            return '<a class="btn btn-small btn-info" href="javascript:void(0);" onclick="searchMembers(\''+vipReferrer.referrerId+'\');"><i class="icon-info-sign icon-white"></i>查看</a> '
+                        }, "bSortable": false},
+                        {"mData": "referrerFee", "bSortable": false},
                         {"mData": function(vipReferrer){
                             return '<a onclick="editVipReferrer(\''+vipReferrer.referrerId+'\');" class="label label-primary"><i class="icon-edit"></i></a> '
                                 +'<a href="javascript:void(0);" onclick="deleteVipReferrer('+vipReferrer.referrerId+')" class="label label-danger"><span class="icon-trash"></span></a>';
@@ -82,6 +91,11 @@
                 $("#addVipReferrer").click(function(){
                     $("#referrerId").val("");
                     $("#referrerName").val("");
+                    $("#referrerCard").val("");
+                    $("#referrerTel").val("");
+                    $("#referrerEmail").val("");
+                    $("#referrerBirthday").val("");
+                    $("#referrerFee").val("");
                     $("#referrerAdmissionTime").val("");
                     $("#referrerRemark").val("");
                     $("#addOrUpdateSubmitBtn").attr("disabled",false);
@@ -131,6 +145,40 @@
                     }
                 });
             });
+            
+            function searchMembers(referrerId) {
+                $.ajax({
+                   "url": "<%=basePath%>page/vip/getMembersByReferrerId.do?rm="+Math.random(),
+                   "type": 'POST',
+                   "data": {"referrerId":referrerId},
+                   "dataType": "json",
+                   "success":function(data){
+                       if(data!=null){
+                           var memberContentHtml = "";
+                           $.each(data,function (key, value) {
+                               var _html = "<tr class='odd'>"+
+                                   "<td>"+ value.memberId +"</td>" +
+                                   "<td>"+ value.memberName+"</td>" +
+                                   "</tr>";
+
+                               memberContentHtml = memberContentHtml + _html;
+                           })
+                           $("#memberContent").html(memberContentHtml);
+                           $("#membersModal").modal("show");
+                       }
+                       else{
+                           jAlert('失败', '提示');
+                           //刷新当前页
+                           refreshTable();
+                       }
+                   },
+                   error:function(){
+                       //刷新当前页
+                       refreshTable();
+                       jAlert('错误', '提示');
+                   },
+               });
+            }
 
             function editVipReferrer(referrerId){
                 $.ajax({
@@ -142,11 +190,16 @@
                        if(data!=null){
                            $("#referrerId").val(data.referrerId);
                            $("#referrerName").val(data.referrerName);
+                           $("#referrerCard").val(data.referrerCard);
                            $("#referrerType option").each(function() {
                                if ($(this).val() == data.referrerType.typeId) {
                                    $(this).attr("selected",true);
                                }
                            });
+                           $("#referrerTel").val(data.referrerTel);
+                           $("#referrerEmail").val(data.referrerEmail);
+                           $("#referrerBirthday").val(data.referrerBirthday);
+                           $("#referrerFee").val(data.referrerFee);
                            $("#referrerAdmissionTime").val(data.referrerAdmissionTime);
                            $("#referrerRemark").val(data.referrerRemark);
                            $("#referrerModal").modal("show");
@@ -284,12 +337,15 @@
                                             <tr>
                                                 <th class="center">ID</th>
                                                 <th>推荐人名称</th>
+                                                <th>推荐人身份证号</th>
                                                 <th>推荐人类型</th>
+                                                <th>推荐人生日</th>
+                                                <th>推荐人手机号码</th>
+                                                <th>推荐人邮箱</th>
                                                 <th>推荐人入会时间</th>
                                                 <th>备注</th>
                                                 <th>单位列表</th>
-                                                <th>创建人</th>
-                                                <th>创建时间</th>
+                                                <th>推荐人费用</th>
                                                 <th>操作</th>
                                             </tr>
                                         </thead>
@@ -318,6 +374,13 @@
                                                 </div>
                                             </div>
                                             <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">推荐人身份证号<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" id='referrerCard' name="referrerCard" class="input-medium" maxlength='20'/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
                                             <div class="form-group">
                                                 <label class="col-xs-2 control-label no-padding-right">推荐人类型<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
@@ -330,6 +393,34 @@
                                                 </div>
                                             </div>
                                             <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">推荐人手机号码<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" id='referrerTel' name="referrerTel" class="input-medium" maxlength='20'/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">推荐人邮箱<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" id='referrerEmail' name="referrerEmail" class="input-medium" maxlength='20'/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">推荐人生日<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" id='referrerBirthday' name="referrerBirthday" class="input-medium" maxlength='20'/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
+                                            <div class="form-group">
+                                                <label class="col-xs-2 control-label no-padding-right">推荐人费用<span style="color:red;">*</span></label>
+                                                <div class="col-xs-8">
+                                                    <input type="text" id='referrerFee' name="referrerFee" class="input-medium" maxlength='20'/>
+                                                </div>
+                                            </div>
+                                            <div class="space-4"></div>
                                             <div class="form-group">
                                                 <label class="col-xs-2 control-label no-padding-right">入会时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
@@ -353,7 +444,32 @@
                             </div>
                         </div>
                     </form>
-                </div>
+                    <div class="modal fade" id="membersModal">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button type="button" class="closeBtn close">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                    <h4 class="modal-title">单位列表</h4>
+                                </div>
+                                <table id="sample-table-member" class="table table-striped table-bordered table-hover">
+                                    <thead>
+                                        <tr>
+                                            <th class="center">ID</th>
+                                            <th>会员名称</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody role="alert" id="memberContent" aria-live="polite" aria-relevant="all">
+
+                                    </tbody>
+                                </table>
+                                <div class="modal-footer">
+                                    <button type="button" class="closeBtn btn btn-default">关闭</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 <!-- 设置工具 -->
                 <%@ include file="../htm/setting.jsp" %>
             </div>