From 3a0e5502c3576de66c08ededb770db4e261d50a7 Mon Sep 17 00:00:00 2001 From: yiyan Date: Sun, 2 Sep 2018 22:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ifish/action/VipAction.java | 72 ++++++-- .../java/com/ifish/entity/VipCompany.java | 22 +++ .../java/com/ifish/entity/VipPersonal.java | 11 ++ .../ifish/excel/VipCompanyExportExcel.java | 48 +++--- .../excel/VipCompanyImportTemplateExcel.java | 53 +++--- .../com/ifish/excel/VipMemberExportExcel.java | 64 ++++--- .../excel/VipMemberImportTemplateExcel.java | 27 +-- .../ifish/excel/VipPersonalExportExcel.java | 74 ++++---- .../excel/VipPersonalImportTemplateExcel.java | 63 ++++--- .../com/ifish/serviceImpl/VipServiceImpl.java | 163 +++++++++--------- .../com/ifish/task/SmsBirthdayVipMember.java | 13 +- .../webapp/WEB-INF/view/vip/vipActivity.jsp | 109 ++++++++---- .../webapp/WEB-INF/view/vip/vipCompany.jsp | 2 +- .../webapp/WEB-INF/view/vip/vipMember.jsp | 139 ++++++++------- .../WEB-INF/view/vip/vipMemberUpdate.jsp | 2 +- .../webapp/WEB-INF/view/vip/vipPersonal.jsp | 2 +- .../webapp/WEB-INF/view/vip/vipReferrer.jsp | 2 +- 17 files changed, 509 insertions(+), 357 deletions(-) diff --git a/src/main/java/com/ifish/action/VipAction.java b/src/main/java/com/ifish/action/VipAction.java index cf8d8fe..f73f9e7 100644 --- a/src/main/java/com/ifish/action/VipAction.java +++ b/src/main/java/com/ifish/action/VipAction.java @@ -45,13 +45,13 @@ public class VipAction { @Autowired private VipService vipService; - @RequestMapping("/sendSms.do") @ResponseBody public Object vipSendSms(HttpServletRequest request) throws ClientException { final String noticeType = "SMS_139227937"; - final String noticeTypeCertif = "SMS_142150098"; - final String noticeTypeMember = "SMS_142145967"; + final String noticeTypeCertif = "SMS_143712160"; + final String noticeTypeMember = "SMS_143717029"; + final String noticeTypeStudent = "SMS_142146106"; String oneTel = request.getParameter("oneTel"); String smsType = request.getParameter("smsType"); //生日 @@ -73,6 +73,13 @@ public class VipAction { String smsAccountBankName = request.getParameter("smsAccountBankName"); String smsAccountCode = request.getParameter("smsAccountCode"); String smsMemberTel = request.getParameter("smsMemberTel"); + //学员培训通知 + String noticeText = request.getParameter("noticeText"); + String time = request.getParameter("time"); + String adress = request.getParameter("adress"); + String signTime = request.getParameter("signTime"); + String linkMan = request.getParameter("linkMan"); + String tel = request.getParameter("tel"); SendSmsResponse response = null; JSONObject param = new JSONObject(); @@ -95,13 +102,13 @@ public class VipAction { response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); log.info("活动通知单条短信发送-Result：" + response.getCode() + "-" + response.getMessage()); } else if (noticeTypeCertif.equals(smsType)) { - param.put("name",vipMember.getMemberLegal()); + param.put("name",vipMember.getMemberName()); param.put("date",smsCertifDate); param.put("tel",smsCertifTel); response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); log.info("证书到期单条短信发送-Result：" + response.getCode() + "-" + response.getMessage()); } else if (noticeTypeMember.equals(smsType)) { - param.put("name",vipMember.getMemberLegal()); + param.put("name",vipMember.getMemberName()); param.put("date",smsMemberDate); param.put("money",smsMoney); param.put("accountName",smsAccountName); @@ -110,6 +117,16 @@ public class VipAction { param.put("tel",smsMemberTel); response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); log.info("会员到期通知单条短信发送-Result：" + response.getCode() + "-" + response.getMessage()); + } else if (noticeTypeStudent.equals(smsType)) { + param.put("name",vipMember.getMemberLegal()); + param.put("noticeText",noticeText); + param.put("time",time); + param.put("adress",adress); + param.put("signTime",signTime); + param.put("linkMan",linkMan); + param.put("tel",tel); + response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); + log.info("学员培训通知单条短信发送-Result：" + response.getCode() + "-" + response.getMessage()); } vipSmsResult.setResultCode(response.getCode()); vipSmsResult.setResultMessage(response.getMessage()); @@ -155,6 +172,16 @@ public class VipAction { param.put("tel",smsMemberTel); response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); log.info("会员到期通知多条短信发送-Result：" + response.getCode() + "-" + response.getMessage()); + } else if (noticeTypeStudent.equals(smsType)) { + param.put("name",vipMember.getMemberLegal()); + param.put("noticeText",noticeText); + param.put("time",time); + param.put("adress",adress); + param.put("signTime",signTime); + param.put("linkMan",linkMan); + param.put("tel",tel); + response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); + log.info("学员培训通知多条短信发送-Result：" + response.getCode() + "-" + response.getMessage()); } vipSmsResult.setResultCode(response.getCode()); vipSmsResult.setResultMessage(response.getMessage()); @@ -507,7 +534,14 @@ public class VipAction { @RequestMapping("/downloadActivityImportToExcel.do") public ModelAndView downloadActivityImportToExcel(@RequestParam("fileUpload") MultipartFile fileUpload,HttpServletRequest request){ SecurityContextImpl securityContextImpl = (SecurityContextImpl) request.getSession().getAttribute("SPRING_SECURITY_CONTEXT"); + + final String noticeType = "SMS_139227937"; + final String noticeTypeCertif = "SMS_143712160"; + final String noticeTypeMember = "SMS_143717029"; + final String noticeTypeStudent = "SMS_142146106"; + String smsType = request.getParameter("smsType"); + //活动通知 String smsTitle = request.getParameter("smsTitle"); String smsTime = request.getParameter("smsTime"); String smsAddress = request.getParameter("smsAddress"); @@ -515,12 +549,30 @@ public class VipAction { String smsContact = request.getParameter("smsContact"); String smsContactTel = request.getParameter("smsContactTel"); + //学员培训通知 + String noticeText = request.getParameter("noticeText"); + String time = request.getParameter("time"); + String adress = request.getParameter("adress"); + String signTime = request.getParameter("signTime"); + String linkMan = request.getParameter("linkMan"); + String tel = request.getParameter("tel"); + 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); + + 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); + } else if (noticeTypeStudent.equals(smsType)) { + param.put("noticeText",noticeText); + param.put("time",time); + param.put("adress",adress); + param.put("signTime",signTime); + param.put("linkMan",linkMan); + param.put("tel",tel); + } try { this.vipService.filesSaveVipActivityNotice(fileUpload.getInputStream(), securityContextImpl.getAuthentication().getName(),param,smsType); diff --git a/src/main/java/com/ifish/entity/VipCompany.java b/src/main/java/com/ifish/entity/VipCompany.java index 71f0141..55a12cd 100644 --- a/src/main/java/com/ifish/entity/VipCompany.java +++ b/src/main/java/com/ifish/entity/VipCompany.java @@ -22,10 +22,16 @@ public class VipCompany implements Serializable{ @Column(name = "vip_company_id") private Integer companyId; + @Column(name = "vip_company_serial") + private String companySerial; + @OneToOne @JoinColumn(name = "vip_member") private VipMember vipMember; + @Column(name = "vip_certificate_name") + private String certificateName; + @Column(name = "vip_certificate_card") private String certificateCard; @@ -92,6 +98,14 @@ public class VipCompany implements Serializable{ this.companyId = companyId; } + public String getCompanySerial() { + return companySerial; + } + + public void setCompanySerial(String companySerial) { + this.companySerial = companySerial; + } + public VipMember getVipMember() { return vipMember; } @@ -100,6 +114,14 @@ public class VipCompany implements Serializable{ this.vipMember = vipMember; } + public String getCertificateName() { + return certificateName; + } + + public void setCertificateName(String certificateName) { + this.certificateName = certificateName; + } + public String getCertificateCard() { return certificateCard; } diff --git a/src/main/java/com/ifish/entity/VipPersonal.java b/src/main/java/com/ifish/entity/VipPersonal.java index 667b76c..a7478a5 100644 --- a/src/main/java/com/ifish/entity/VipPersonal.java +++ b/src/main/java/com/ifish/entity/VipPersonal.java @@ -23,6 +23,9 @@ public class VipPersonal implements Serializable{ @Column(name = "vip_personal_id") private Integer personalId; + @Column(name = "vip_personal_serial") + private String personalSerial; + @Column(name = "vip_personal_name") private String personalName; @@ -111,6 +114,14 @@ public class VipPersonal implements Serializable{ this.personalId = personalId; } + public String getPersonalSerial() { + return personalSerial; + } + + public void setPersonalSerial(String personalSerial) { + this.personalSerial = personalSerial; + } + public String getPersonalName() { return personalName; } diff --git a/src/main/java/com/ifish/excel/VipCompanyExportExcel.java b/src/main/java/com/ifish/excel/VipCompanyExportExcel.java index 9f3cc4d..97575d7 100644 --- a/src/main/java/com/ifish/excel/VipCompanyExportExcel.java +++ b/src/main/java/com/ifish/excel/VipCompanyExportExcel.java @@ -36,60 +36,64 @@ public class VipCompanyExportExcel extends AbstractExcelView{ 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,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("备注"); Calendar calendar = Calendar.getInstance(); List vipCompanys = (List) 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()); + getCell(sheet,i+1,0).setCellValue(vipCompany.getCompanySerial()); + getCell(sheet,i+1,1).setCellValue(vipCompany.getVipMember().getMemberName()); + getCell(sheet,i+1,2).setCellValue(vipCompany.getCertificateName()); + getCell(sheet,i+1,3).setCellValue(vipCompany.getCertificateCard()); + getCell(sheet,i+1,4).setCellValue(vipCompany.getCertificateLevel()); + getCell(sheet,i+1,5).setCellValue(vipCompany.getCertificateType()); if (vipCompany.getCertificateApplyTime() != null) { 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)); + getCell(sheet,i+1,6).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH)); } if (vipCompany.getCertificateMaturityTime() != null) { 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)); + getCell(sheet,i+1,7).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH)); } if (vipCompany.getOpenticketTime() != null) { 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)); + getCell(sheet,i+1,8).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH)); } if (vipCompany.getOutcardTime() != null) { 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)); + getCell(sheet,i+1,9).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH)); } if (vipCompany.getAnnualReviewTime() != null) { 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,10).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()); + getCell(sheet,i+1,11).setCellValue(vipCompany.getCost()); + getCell(sheet,i+1,12).setCellValue(vipCompany.getCertificateRemark()); } String filename = URLEncoder.encode("单位评价证信息导出.xls", "UTF-8"); diff --git a/src/main/java/com/ifish/excel/VipCompanyImportTemplateExcel.java b/src/main/java/com/ifish/excel/VipCompanyImportTemplateExcel.java index a109243..7cdefd0 100644 --- a/src/main/java/com/ifish/excel/VipCompanyImportTemplateExcel.java +++ b/src/main/java/com/ifish/excel/VipCompanyImportTemplateExcel.java @@ -35,44 +35,41 @@ public class VipCompanyImportTemplateExcel extends AbstractExcelView { 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 vipMembers = (List) 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); + 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("备注"); HSSFCellStyle cellStyle = workbook.createCellStyle(); HSSFDataFormat format = workbook.createDataFormat(); cellStyle.setDataFormat(format.getFormat("@")); + + HSSFCellStyle cellStyleDate = workbook.createCellStyle(); + cellStyleDate.setDataFormat(HSSFDataFormat.getBuiltinFormat("yyyy-mm-dd")); + 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(6,cellStyleDate); + sheet.setDefaultColumnStyle(7,cellStyleDate); + sheet.setDefaultColumnStyle(8,cellStyleDate); + sheet.setDefaultColumnStyle(9,cellStyleDate); + sheet.setDefaultColumnStyle(10,cellStyleDate); + sheet.setDefaultColumnStyle(11,cellStyle); + sheet.setDefaultColumnStyle(12,cellStyle); + String filename = URLEncoder.encode("单位评价证导入模板.xls", "UTF-8"); response.setContentType("application/vnd.ms-excel"); diff --git a/src/main/java/com/ifish/excel/VipMemberExportExcel.java b/src/main/java/com/ifish/excel/VipMemberExportExcel.java index f6ac7b2..ad1246c 100644 --- a/src/main/java/com/ifish/excel/VipMemberExportExcel.java +++ b/src/main/java/com/ifish/excel/VipMemberExportExcel.java @@ -47,7 +47,7 @@ public class VipMemberExportExcel extends AbstractExcelView{ getCell(sheet,0,9).setCellValue("联系人"); getCell(sheet,0,10).setCellValue("联系人电话"); getCell(sheet,0,11).setCellValue("联系情况"); - getCell(sheet,0,12).setCellValue("官网是否录入"); + getCell(sheet,0,12).setCellValue("官网"); getCell(sheet,0,13).setCellValue("手机"); getCell(sheet,0,14).setCellValue("QQ"); getCell(sheet,0,15).setCellValue("微信"); @@ -55,19 +55,21 @@ public class VipMemberExportExcel extends AbstractExcelView{ getCell(sheet,0,17).setCellValue("企业情况"); getCell(sheet,0,18).setCellValue("生日"); getCell(sheet,0,19).setCellValue("单位地址"); - getCell(sheet,0,20).setCellValue("企业网址"); - 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("资质情况"); - getCell(sheet,0,29).setCellValue("重要联系人"); - getCell(sheet,0,30).setCellValue("重要手机"); - getCell(sheet,0,31).setCellValue("经办联系人"); - getCell(sheet,0,32).setCellValue("经办手机"); + getCell(sheet,0,20).setCellValue("重要联系人"); + 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("是否有环保资质"); + getCell(sheet,0,29).setCellValue("等级"); + getCell(sheet,0,30).setCellValue("成立时间"); + getCell(sheet,0,31).setCellValue("通知书"); + getCell(sheet,0,32).setCellValue("注册资金"); + getCell(sheet,0,33).setCellValue("资质情况"); + Calendar calendar = Calendar.getInstance(); List vipMembers = (List) model.get("vipMembers"); for (int i = 0; i < vipMembers.size(); i++) { @@ -109,20 +111,28 @@ public class VipMemberExportExcel extends AbstractExcelView{ getCell(sheet,i+1,17).setCellValue(vipMember.getMemberSituation()); getCell(sheet,i+1,18).setCellValue(vipMember.getMemberBirthday()); getCell(sheet,i+1,19).setCellValue(vipMember.getMemberAddress()); - getCell(sheet,i+1,20).setCellValue(vipMember.getMemberUrl()); - getCell(sheet,i+1,21).setCellValue(vipMember.getMemberDemand()); - getCell(sheet,i+1,22).setCellValue(vipMember.getMemberItem()); - getCell(sheet,i+1,23).setCellValue(vipMember.getMemberFee()); - getCell(sheet,i+1,24).setCellValue(vipMember.getMemberQualification() != null ? vipMember.getMemberQualification().equals("0") ? "是" : "否" : ""); - getCell(sheet,i+1,25).setCellValue(vipMember.getMemberLevel()); + getCell(sheet,i+1,20).setCellValue(vipMember.getMemberImportantContact()); + getCell(sheet,i+1,21).setCellValue(vipMember.getMemberImportantTel()); + getCell(sheet,i+1,22).setCellValue(vipMember.getMemberHandlingContact()); + getCell(sheet,i+1,23).setCellValue(vipMember.getMemberHandlingTel()); + getCell(sheet,i+1,24).setCellValue(vipMember.getMemberUrl()); + getCell(sheet,i+1,25).setCellValue(vipMember.getMemberDemand()); + getCell(sheet,i+1,26).setCellValue(vipMember.getMemberItem()); + getCell(sheet,i+1,27).setCellValue(vipMember.getMemberFee()); + getCell(sheet,i+1,28).setCellValue(vipMember.getMemberQualification() != null ? vipMember.getMemberQualification().equals("0") ? "是" : "否" : ""); + getCell(sheet,i+1,29).setCellValue(vipMember.getMemberLevel()); + if (vipMember.getMemberEstablishedTime() != null) { + Date memberEstablishedTime = vipMember.getMemberEstablishedTime(); + calendar.setTime(memberEstablishedTime); + + getCell(sheet,i+1,30).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH)); + + } // getCell(sheet,i+1,25).setCellValue(vipMember != null ? vipMember.getMemberEstablishedTime() : null); - getCell(sheet,i+1,26).setCellValue(vipMember.getMemberNoticeBook()); - getCell(sheet,i+1,27).setCellValue(vipMember.getMemberRegisteredCapital()); - getCell(sheet,i+1,28).setCellValue(vipMember.getMemberQualificationInfo()); - getCell(sheet,i+1,29).setCellValue(vipMember.getMemberQualificationInfo()); - getCell(sheet,i+1,30).setCellValue(vipMember.getMemberQualificationInfo()); - getCell(sheet,i+1,31).setCellValue(vipMember.getMemberQualificationInfo()); - getCell(sheet,i+1,32).setCellValue(vipMember.getMemberQualificationInfo()); + getCell(sheet,i+1,31).setCellValue(vipMember.getMemberNoticeBook()); + getCell(sheet,i+1,32).setCellValue(vipMember.getMemberRegisteredCapital()); + getCell(sheet,i+1,33).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 02b27d8..4c38012 100644 --- a/src/main/java/com/ifish/excel/VipMemberImportTemplateExcel.java +++ b/src/main/java/com/ifish/excel/VipMemberImportTemplateExcel.java @@ -3,6 +3,7 @@ package com.ifish.excel; import com.ifish.entity.VipReferrer; import com.ifish.entity.VipType; import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.util.CellRangeAddressList; import org.springframework.web.servlet.view.document.AbstractExcelView; @@ -41,8 +42,8 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView { getCell(sheet,0,4).setCellValue("推荐人（只能选择或者为空）"); getCell(sheet,0,5).setCellValue("会员类型"); getCell(sheet,0,6).setCellValue("会员编号"); - getCell(sheet, 0, 7).setCellValue("入会时间格式：YYYY-MM-DD"); - getCell(sheet, 0, 8).setCellValue("到期时间格式：YYYY-MM-DD"); + 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("联系情况"); @@ -52,8 +53,7 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView { getCell(sheet,0,15).setCellValue("微信"); getCell(sheet,0,16).setCellValue("邮箱"); getCell(sheet,0,17).setCellValue("企业情况"); - getCell(sheet, 0, 18).setCellValue("生日格式：MM-DD"); - + getCell(sheet, 0, 18).setCellValue("生日"); getCell(sheet,0,19).setCellValue("单位地址"); getCell(sheet,0,20).setCellValue("重要联系人"); getCell(sheet,0,21).setCellValue("重要手机"); @@ -64,9 +64,8 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView { getCell(sheet,0,26).setCellValue("项目匹配"); getCell(sheet,0,27).setCellValue("会费"); getCell(sheet,0,28).setCellValue("是否有环保资质"); - getCell(sheet,0,29).setCellValue("等级"); - getCell(sheet,0,30).setCellValue("成立时间格式：YYYY-MM-DD"); + getCell(sheet,0,30).setCellValue("成立时间"); getCell(sheet,0,31).setCellValue("通知书"); getCell(sheet,0,32).setCellValue("注册资金"); getCell(sheet,0,33).setCellValue("资质情况"); @@ -105,6 +104,13 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView { HSSFCellStyle cellStyle = workbook.createCellStyle(); HSSFDataFormat format = workbook.createDataFormat(); cellStyle.setDataFormat(format.getFormat("@")); + + HSSFCellStyle cellStyleDate = workbook.createCellStyle(); + cellStyleDate.setDataFormat(HSSFDataFormat.getBuiltinFormat("yyyy-mm-dd")); + + HSSFCellStyle cellStyleDateBirthday = workbook.createCellStyle(); + cellStyleDateBirthday.setDataFormat(HSSFDataFormat.getBuiltinFormat("mm-dd")); + sheet.setDefaultColumnStyle(0,cellStyle); sheet.setDefaultColumnStyle(1,cellStyle); sheet.setDefaultColumnStyle(2,cellStyle); @@ -112,8 +118,8 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView { sheet.setDefaultColumnStyle(4,cellStyle); sheet.setDefaultColumnStyle(5,cellStyle); sheet.setDefaultColumnStyle(6,cellStyle); - sheet.setDefaultColumnStyle(7,cellStyle); - sheet.setDefaultColumnStyle(8,cellStyle); + sheet.setDefaultColumnStyle(7,cellStyleDate); + sheet.setDefaultColumnStyle(8,cellStyleDate); sheet.setDefaultColumnStyle(9,cellStyle); sheet.setDefaultColumnStyle(10,cellStyle); sheet.setDefaultColumnStyle(11,cellStyle); @@ -123,7 +129,7 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView { sheet.setDefaultColumnStyle(15,cellStyle); sheet.setDefaultColumnStyle(16,cellStyle); sheet.setDefaultColumnStyle(17,cellStyle); - sheet.setDefaultColumnStyle(18,cellStyle); + sheet.setDefaultColumnStyle(18,cellStyleDateBirthday); sheet.setDefaultColumnStyle(19,cellStyle); sheet.setDefaultColumnStyle(20,cellStyle); sheet.setDefaultColumnStyle(21,cellStyle); @@ -135,11 +141,12 @@ public class VipMemberImportTemplateExcel extends AbstractExcelView { sheet.setDefaultColumnStyle(27,cellStyle); sheet.setDefaultColumnStyle(28,cellStyle); sheet.setDefaultColumnStyle(29,cellStyle); - sheet.setDefaultColumnStyle(30,cellStyle); + sheet.setDefaultColumnStyle(30,cellStyleDate); sheet.setDefaultColumnStyle(31,cellStyle); sheet.setDefaultColumnStyle(32,cellStyle); sheet.setDefaultColumnStyle(33,cellStyle); + String filename = URLEncoder.encode("会员信息导入模板.xls", "UTF-8"); response.setContentType("application/vnd.ms-excel"); response.setHeader("Content-disposition", "attachment;filename=" + filename); diff --git a/src/main/java/com/ifish/excel/VipPersonalExportExcel.java b/src/main/java/com/ifish/excel/VipPersonalExportExcel.java index e431fb3..a66c6a2 100644 --- a/src/main/java/com/ifish/excel/VipPersonalExportExcel.java +++ b/src/main/java/com/ifish/excel/VipPersonalExportExcel.java @@ -36,65 +36,67 @@ public class VipPersonalExportExcel extends AbstractExcelView{ 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("备注"); + 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("单位名称"); + getCell(sheet,0,18).setCellValue("备注"); Calendar calendar = Calendar.getInstance(); List vipPersonals = (List) 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()); + getCell(sheet,i+1,0).setCellValue(vipPersonal.getPersonalSerial()); + getCell(sheet,i+1,1).setCellValue(vipPersonal.getPersonalName()); + getCell(sheet,i+1,2).setCellValue(vipPersonal.getCardNum()); + getCell(sheet,i+1,3).setCellValue(vipPersonal.getPersonalGender()); + getCell(sheet,i+1,4).setCellValue(vipPersonal.getCertificateLevel()); + getCell(sheet,i+1,5).setCellValue(vipPersonal.getCertificateType()); + getCell(sheet,i+1,6).setCellValue(vipPersonal.getCertificateCard()); if (vipPersonal.getCertificateApplyTime() != null) { 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)); + getCell(sheet,i+1,7).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH)); } if (vipPersonal.getCertificateReceiveTime() != null) { 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)); + getCell(sheet,i+1,8).setCellValue(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" + calendar.get(Calendar.DAY_OF_MONTH)); } if (vipPersonal.getCertificateMaturityTime() != null) { 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,9).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()); + getCell(sheet,i+1,10).setCellValue(vipPersonal.getUploadWebsite()); + getCell(sheet,i+1,11).setCellValue(vipPersonal.getPersonalTel()); + getCell(sheet,i+1,12).setCellValue(vipPersonal.getPersonalWechat()); + getCell(sheet,i+1,13).setCellValue(vipPersonal.getPersonalEmail()); + getCell(sheet,i+1,14).setCellValue(vipPersonal.getPersonalResearchDirection()); + getCell(sheet,i+1,15).setCellValue(vipPersonal.getPersonalProfession()); + getCell(sheet,i+1,16).setCellValue(vipPersonal.getPersonalSchool()); + getCell(sheet,i+1,17).setCellValue(vipPersonal.getPersonalMember()); + getCell(sheet,i+1,18).setCellValue(vipPersonal.getCertificateRemark()); } String filename = URLEncoder.encode("个人培训证信息导出.xls", "UTF-8"); diff --git a/src/main/java/com/ifish/excel/VipPersonalImportTemplateExcel.java b/src/main/java/com/ifish/excel/VipPersonalImportTemplateExcel.java index 2f5eaba..5d77a93 100644 --- a/src/main/java/com/ifish/excel/VipPersonalImportTemplateExcel.java +++ b/src/main/java/com/ifish/excel/VipPersonalImportTemplateExcel.java @@ -33,47 +33,41 @@ public class VipPersonalImportTemplateExcel extends AbstractExcelView { 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("备注"); + 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("单位名称"); + getCell(sheet,0,18).setCellValue("备注"); //性别 String[] qualifications = {"男","女"}; - CellRangeAddressList regions = new CellRangeAddressList(0, 65535, 2, 2); + CellRangeAddressList regions = new CellRangeAddressList(0, 65535, 3, 3); DVConstraint constraint = DVConstraint.createExplicitListConstraint(qualifications); HSSFDataValidation dataValidation = new HSSFDataValidation(regions, constraint); sheet.addValidationData(dataValidation); - //单位名称 - List vipMembers = (List) 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("@")); + + HSSFCellStyle cellStyleDate = workbook.createCellStyle(); + cellStyleDate.setDataFormat(HSSFDataFormat.getBuiltinFormat("yyyy-mm-dd")); + + sheet.setDefaultColumnStyle(0,cellStyle); sheet.setDefaultColumnStyle(1,cellStyle); sheet.setDefaultColumnStyle(2,cellStyle); @@ -81,9 +75,9 @@ public class VipPersonalImportTemplateExcel extends AbstractExcelView { 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(7,cellStyleDate); + sheet.setDefaultColumnStyle(8,cellStyleDate); + sheet.setDefaultColumnStyle(9,cellStyleDate); sheet.setDefaultColumnStyle(10,cellStyle); sheet.setDefaultColumnStyle(11,cellStyle); sheet.setDefaultColumnStyle(12,cellStyle); @@ -92,6 +86,7 @@ public class VipPersonalImportTemplateExcel extends AbstractExcelView { sheet.setDefaultColumnStyle(15,cellStyle); sheet.setDefaultColumnStyle(16,cellStyle); sheet.setDefaultColumnStyle(17,cellStyle); + sheet.setDefaultColumnStyle(18,cellStyle); String filename = URLEncoder.encode("个人培训证导入模板.xls", "UTF-8"); response.setContentType("application/vnd.ms-excel"); diff --git a/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java b/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java index 94202db..e1a733b 100644 --- a/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java @@ -10,10 +10,10 @@ import com.ifish.service.VipService; import com.ifish.util.IfishUtil; import com.ifish.util.SmsUtil; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.log4j.Logger; +import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.DateUtil; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -60,6 +60,8 @@ public class VipServiceImpl implements VipService{ @Autowired private VipActivityNoticeDao vipActivityNoticeDao; + private static final Logger log = Logger.getLogger(VipServiceImpl.class); + @Override public Pagination getVipTypeByPage(SearchFilter searchFilter) { //查询条件 @@ -199,9 +201,8 @@ public class VipServiceImpl implements VipService{ if (searchFilter.getsSearch4() != null && StringUtils.isNotBlank(searchFilter.getsSearch4())) { queryList.add(Restrictions.eq("certificateReceiveTime",IfishUtil.StrToDate(searchFilter.getsSearch4()))); } - orderList.add(Order.asc("certificateMaturityTime")); + orderList.add(Order.asc("personalId")); Pagination page = this.vipPersonalDao.findByCriteria(iDisplayStart, iDisplayLength, orderList, queryList.toArray(new Criterion[queryList.size()])); - return page; } @@ -264,10 +265,13 @@ public class VipServiceImpl implements VipService{ try { for (VipMember vipMember : list) { String memberBirthday = vipMember.getMemberBirthday(); - Date parse = sdf.parse(memberBirthday); - if (parse.getMonth() == nowDate.getMonth() && parse.getDate() == nowDate.getDate()) { - members.add(vipMember); + if (memberBirthday != null && !"".equals(memberBirthday)) { + Date parse = sdf.parse(memberBirthday); + if (parse.getMonth() == nowDate.getMonth() && parse.getDate() == nowDate.getDate()) { + members.add(vipMember); + } } + } } catch (ParseException e) { e.printStackTrace(); @@ -284,9 +288,11 @@ public class VipServiceImpl implements VipService{ try { for (VipReferrer vipReferrer : list) { String referrerBirthday = vipReferrer.getReferrerBirthday(); - Date parse = sdf.parse(referrerBirthday); - if (parse.getMonth() == nowDate.getMonth() && parse.getDate() == nowDate.getDate()) { - referrers.add(vipReferrer); + if (referrerBirthday != null && !"".equals(referrerBirthday)) { + Date parse = sdf.parse(referrerBirthday); + if (parse.getMonth() == nowDate.getMonth() && parse.getDate() == nowDate.getDate()) { + referrers.add(vipReferrer); + } } } } catch (ParseException e) { @@ -325,9 +331,8 @@ public class VipServiceImpl implements VipService{ if (searchFilter.getsSearch4() != null && StringUtils.isNotBlank(searchFilter.getsSearch4())) { queryList.add(Restrictions.eq("certificateApplyTime",IfishUtil.StrToDate(searchFilter.getsSearch4()))); } - orderList.add(Order.asc("certificateMaturityTime")); + orderList.add(Order.asc("companyId")); Pagination page = this.vipCompanyDao.findByCriteria(iDisplayStart, iDisplayLength, orderList, queryList.toArray(new Criterion[queryList.size()])); - return page; } @@ -464,7 +469,7 @@ public class VipServiceImpl implements VipService{ } - orderList.add(Order.asc("memberMaturityTime")); + orderList.add(Order.asc("memberId")); Pagination page = this.vipMemberDao.findByCriteria(iDisplayStart, iDisplayLength, orderList, queryList.toArray(new Criterion[queryList.size()])); return page; @@ -581,14 +586,15 @@ public class VipServiceImpl implements VipService{ if (StringUtils.isBlank(memberName)) { break; } + System.out.println(i); String memberCode = row.getCell(0) != null ? row.getCell(0).getStringCellValue() : null; String memberLegal = row.getCell(2) != null ? row.getCell(2).getStringCellValue() : null; String memberLegalCard = row.getCell(3) != null ? row.getCell(3).getStringCellValue() : null; String memberReferrer = row.getCell(4) != null ? row.getCell(4).getStringCellValue() : null; String memberType = row.getCell(5) != null ? row.getCell(5).getStringCellValue() : null; String memberCard = row.getCell(6) != null ? row.getCell(6).getStringCellValue() : null; - String memberAdmissionTime = row.getCell(7) != null ? row.getCell(7).getStringCellValue() : null; - String memberMaturityTime = row.getCell(8) != null ? row.getCell(8).getStringCellValue() : null; + Date memberAdmissionTime = (row.getCell(7) != null && StringUtils.isNotBlank(row.getCell(7).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(7).toString())) : null; + Date memberMaturityTime = (row.getCell(8) != null && StringUtils.isNotBlank(row.getCell(8).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(8).toString())) : null; String memberContact = row.getCell(9) != null ? row.getCell(9).getStringCellValue() : null; String memberContactTel = row.getCell(10) != null ? row.getCell(10).getStringCellValue() : null; String memberContactSituation = row.getCell(11) != null ? row.getCell(11).getStringCellValue() : null; @@ -598,8 +604,8 @@ public class VipServiceImpl implements VipService{ String memberWechat = row.getCell(15) != null ? row.getCell(15).getStringCellValue() : null; String memberEmail = row.getCell(16) != null ? row.getCell(16).getStringCellValue() : null; String memberSituation = row.getCell(17) != null ? row.getCell(17).getStringCellValue() : null; - String memberBirthday = row.getCell(18) != null ? row.getCell(18).getStringCellValue() : null; - String memberAddress = row.getCell(18) != null ? row.getCell(19).getStringCellValue() : null; + Date memberBirthday = (row.getCell(18) != null && StringUtils.isNotBlank(row.getCell(18).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(18).toString())) : null; + String memberAddress = row.getCell(19) != null ? row.getCell(19).getStringCellValue() : null; String memberImportantContact = row.getCell(20) != null ? row.getCell(20).getStringCellValue() : null; String memberImportantTel = row.getCell(21) != null ? row.getCell(21).getStringCellValue() : null; String memberHandlingContact = row.getCell(22) != null ? row.getCell(22).getStringCellValue() : null; @@ -610,7 +616,7 @@ public class VipServiceImpl implements VipService{ String memberFee = row.getCell(27) != null ? row.getCell(27).getStringCellValue() : null; String memberQualification = row.getCell(28) != null ? row.getCell(28).getStringCellValue().equals("是") ? "0" : "1" : null; String memberLevel = row.getCell(29) != null ? row.getCell(29).getStringCellValue() : null; - String memberEstablishedTime = row.getCell(30) != null ? row.getCell(30).getStringCellValue() : null; + Date memberEstablishedTime = (row.getCell(30) != null && StringUtils.isNotBlank(row.getCell(30).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(30).toString())) : null; String memberNoticeBook = row.getCell(31) != null ? row.getCell(31).getStringCellValue() : null; String memberRegisteredCapital = row.getCell(32) != null ? row.getCell(32).getStringCellValue() : null; String memberQualificationInfo = row.getCell(33) != null ? row.getCell(33).getStringCellValue() : null; @@ -629,6 +635,10 @@ public class VipServiceImpl implements VipService{ } } + String birthday = ""; + if (memberBirthday != null) { + birthday = ((memberBirthday.getMonth() + 1) < 10 ? "0" + (memberBirthday.getMonth() + 1) : (memberBirthday.getMonth() + 1)) + "-" + memberBirthday.getDate(); + } member = new VipMember(); member.setMemberReferrer(referrer); member.setMemberType(type); @@ -637,8 +647,8 @@ public class VipServiceImpl implements VipService{ member.setMemberLegal(memberLegal); member.setMemberLegalCard(memberLegalCard); member.setMemberCard(memberCard); - member.setMemberAdmissionTime(yyMMdd.parse(memberAdmissionTime)); - member.setMemberMaturityTime(yyMMdd.parse(memberMaturityTime)); + member.setMemberAdmissionTime(memberAdmissionTime); + member.setMemberMaturityTime(memberMaturityTime); member.setMemberContact(memberContact); member.setMemberContactTel(memberContactTel); member.setMemberContactSituation(memberContactSituation); @@ -648,7 +658,7 @@ public class VipServiceImpl implements VipService{ member.setMemberWechat(memberWechat); member.setMemberEmail(memberEmail); member.setMemberSituation(memberSituation); - member.setMemberBirthday(memberBirthday); + member.setMemberBirthday(birthday); member.setMemberAddress(memberAddress); member.setMemberImportantContact(memberImportantContact); member.setMemberImportantTel(memberImportantTel); @@ -661,7 +671,7 @@ public class VipServiceImpl implements VipService{ member.setMemberQualification(memberQualification); member.setMemberLevel(memberLevel); if (memberEstablishedTime != null) { - member.setMemberEstablishedTime(yyMMdd.parse(memberEstablishedTime)); + member.setMemberEstablishedTime(memberEstablishedTime); } member.setMemberNoticeBook(memberNoticeBook); member.setMemberRegisteredCapital(memberRegisteredCapital); @@ -699,48 +709,44 @@ public class VipServiceImpl implements VipService{ HSSFRow row = sheet.getRow(i); IfishUtil.setRowsType(row); - String memberName = row.getCell(0).getStringCellValue(); + String memberName = row.getCell(1).getStringCellValue(); if (StringUtils.isBlank(memberName)) { break; } - String certificateCard = row.getCell(1) != null ? row.getCell(1).getStringCellValue() : null; - String certificateLevel = row.getCell(2) != null ? row.getCell(2).getStringCellValue() : null; - String certificateType = row.getCell(3) != null ? row.getCell(3).getStringCellValue() : null; - String certificateApplyTime = row.getCell(4) != null ? row.getCell(4).getStringCellValue() : null; - String certificateMaturityTime = row.getCell(5) != null ? row.getCell(5).getStringCellValue() : null; - String openticketTime = row.getCell(6) != null ? row.getCell(6).getStringCellValue() : null; - String outcardTime = row.getCell(7) != null ? row.getCell(7).getStringCellValue() : null; - String annualReviewTime = row.getCell(8) != null ? row.getCell(8).getStringCellValue() : null; - String cost = row.getCell(9) != null ? row.getCell(9).getStringCellValue() : null; - String certificateRemark = row.getCell(10) != null ? row.getCell(10).getStringCellValue() : null; + String certificateCard = row.getCell(2) != null ? row.getCell(2).getStringCellValue() : null; + String certificateName = row.getCell(3) != null ? row.getCell(3).getStringCellValue() : null; + String certificateLevel = row.getCell(4) != null ? row.getCell(4).getStringCellValue() : null; + String certificateType = row.getCell(5) != null ? row.getCell(5).getStringCellValue() : null; + Date certificateApplyTime = (row.getCell(6) != null && StringUtils.isNotBlank(row.getCell(6).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(6).toString())) : null; + Date certificateMaturityTime = (row.getCell(7) != null && StringUtils.isNotBlank(row.getCell(7).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(7).toString())) : null; + Date openticketTime = (row.getCell(8) != null && StringUtils.isNotBlank(row.getCell(8).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(8).toString())) : null; + Date outcardTime = (row.getCell(9) != null && StringUtils.isNotBlank(row.getCell(9).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(9).toString())) : null; + Date annualReviewTime = (row.getCell(10) != null && StringUtils.isNotBlank(row.getCell(10).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(10).toString())) : null; + String cost = row.getCell(11) != null ? row.getCell(11).getStringCellValue() : null; + String certificateRemark = row.getCell(12) != null ? row.getCell(12).getStringCellValue() : null; List vipMembers = this.vipMemberDao.findByProperty(Restrictions.eq("memberName", memberName)); if (vipMembers.size() > 0) { vipMember = vipMembers.get(0); } + double cost1 = 0.0; + if (cost != null && !"".equals(cost)) { + cost1 = Double.parseDouble(cost); + } vipCompany = new VipCompany(); vipCompany.setVipMember(vipMember); + vipCompany.setCertificateName(certificateName); vipCompany.setCertificateCard(certificateCard); vipCompany.setCertificateLevel(certificateLevel); vipCompany.setCertificateType(certificateType); - if (certificateApplyTime != null && StringUtils.isNotBlank(certificateApplyTime)){ - vipCompany.setCertificateApplyTime(yyMMdd.parse(certificateApplyTime)); - } - if (certificateMaturityTime != null && StringUtils.isNotBlank(certificateMaturityTime)){ - vipCompany.setCertificateMaturityTime(yyMMdd.parse(certificateMaturityTime)); - } - if (openticketTime != null && StringUtils.isNotBlank(openticketTime)){ - vipCompany.setOpenticketTime(yyMMdd.parse(openticketTime)); - } - if (outcardTime != null && StringUtils.isNotBlank(outcardTime)){ - vipCompany.setOutcardTime(yyMMdd.parse(outcardTime)); - } - if (annualReviewTime != null && StringUtils.isNotBlank(annualReviewTime)){ - vipCompany.setAnnualReviewTime(yyMMdd.parse(annualReviewTime)); - } + vipCompany.setCertificateApplyTime(certificateApplyTime); + vipCompany.setCertificateMaturityTime(certificateMaturityTime); + vipCompany.setOpenticketTime(openticketTime); + vipCompany.setOutcardTime(outcardTime); + vipCompany.setAnnualReviewTime(annualReviewTime); - vipCompany.setCost(Double.parseDouble(cost)); + vipCompany.setCost(cost1); vipCompany.setCertificateRemark(certificateRemark); vipCompany.setCreateUser(userName); vipCompany.setCreateTime(new Date()); @@ -769,27 +775,27 @@ public class VipServiceImpl implements VipService{ HSSFRow row = sheet.getRow(i); IfishUtil.setRowsType(row); - String personalName = row.getCell(0).getStringCellValue(); + String personalName = row.getCell(1).getStringCellValue(); if (StringUtils.isBlank(personalName)) { break; } - String cardNum = row.getCell(1) != null ? row.getCell(1).getStringCellValue() : null; - String personalGender = row.getCell(2) != null ? row.getCell(2).getStringCellValue() : null; - String personalTel = row.getCell(3) != null ? row.getCell(3).getStringCellValue() : null; - String personalWechat = row.getCell(4) != null ? row.getCell(4).getStringCellValue() : null; - String personalEmail = row.getCell(5) != null ? row.getCell(5).getStringCellValue() : null; - String personalResearchDirection = row.getCell(6) != null ? row.getCell(6).getStringCellValue() : null; - String personalProfession = row.getCell(7) != null ? row.getCell(7).getStringCellValue() : null; - String personalSchool = row.getCell(8) != null ? row.getCell(8).getStringCellValue() : null; - String personalMember = row.getCell(9) != null ? row.getCell(9).getStringCellValue() : null; - String certificateLevel = row.getCell(10) != null ? row.getCell(10).getStringCellValue() : null; - String certificateType = row.getCell(11) != null ? row.getCell(11).getStringCellValue() : null; - String certificateCard = row.getCell(12) != null ? row.getCell(12).getStringCellValue() : null; - String certificateApplyTime = row.getCell(13) != null ? row.getCell(13).getStringCellValue() : null; - String certificateMaturityTime = row.getCell(14) != null ? row.getCell(14).getStringCellValue() : null; - String certificateReceiveTime = row.getCell(15) != null ? row.getCell(15).getStringCellValue() : null; - String uploadWebsite = row.getCell(16) != null ? row.getCell(16).getStringCellValue() : null; - String certificateRemark = row.getCell(17) != null ? row.getCell(17).getStringCellValue() : null; + String cardNum = row.getCell(2) != null ? row.getCell(2).getStringCellValue() : null; + String personalGender = row.getCell(3) != null ? row.getCell(3).getStringCellValue() : null; + String certificateLevel = row.getCell(4) != null ? row.getCell(4).getStringCellValue() : null; + String certificateType = row.getCell(5) != null ? row.getCell(5).getStringCellValue() : null; + String certificateCard = row.getCell(6) != null ? row.getCell(6).getStringCellValue() : null; + Date certificateApplyTime = (row.getCell(7) != null && StringUtils.isNotBlank(row.getCell(7).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(7).toString())) : null; + Date certificateMaturityTime = (row.getCell(8) != null && StringUtils.isNotBlank(row.getCell(8).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(8).toString())) : null; + Date certificateReceiveTime = (row.getCell(9) != null && StringUtils.isNotBlank(row.getCell(9).toString())) ? HSSFDateUtil.getJavaDate(Double.parseDouble(row.getCell(9).toString())) : null; + String personalWechat = row.getCell(10) != null ? row.getCell(10).getStringCellValue() : null; + String personalEmail = row.getCell(11) != null ? row.getCell(11).getStringCellValue() : null; + String personalResearchDirection = row.getCell(12) != null ? row.getCell(12).getStringCellValue() : null; + String personalProfession = row.getCell(13) != null ? row.getCell(13).getStringCellValue() : null; + String personalSchool = row.getCell(14) != null ? row.getCell(14).getStringCellValue() : null; + String personalMember = row.getCell(15) != null ? row.getCell(15).getStringCellValue() : null; + String personalTel = row.getCell(16) != null ? row.getCell(16).getStringCellValue() : null; + String uploadWebsite = row.getCell(17) != null ? row.getCell(17).getStringCellValue() : null; + String certificateRemark = row.getCell(18) != null ? row.getCell(18).getStringCellValue() : null; vipPersonal = new VipPersonal(); vipPersonal.setPersonalName(personalName); @@ -805,15 +811,9 @@ public class VipServiceImpl implements VipService{ vipPersonal.setCertificateLevel(certificateLevel); vipPersonal.setCertificateType(certificateType); vipPersonal.setCertificateCard(certificateCard); - if (certificateApplyTime != null && StringUtils.isNotBlank(certificateApplyTime)) { - vipPersonal.setCertificateApplyTime(yyMMdd.parse(certificateApplyTime)); - } - if (certificateMaturityTime != null && StringUtils.isNotBlank(certificateMaturityTime)) { - vipPersonal.setCertificateMaturityTime(yyMMdd.parse(certificateMaturityTime)); - } - if (certificateReceiveTime != null && StringUtils.isNotBlank(certificateReceiveTime)) { - vipPersonal.setCertificateReceiveTime(yyMMdd.parse(certificateReceiveTime)); - } + vipPersonal.setCertificateApplyTime(certificateApplyTime); + vipPersonal.setCertificateMaturityTime(certificateMaturityTime); + vipPersonal.setCertificateReceiveTime(certificateReceiveTime); vipPersonal.setUploadWebsite(uploadWebsite); vipPersonal.setCertificateRemark(certificateRemark); @@ -892,8 +892,9 @@ public class VipServiceImpl implements VipService{ vipSmsResult.setResultBussId(activityNotice.getActivityId()); vipSmsResult.setResultTel(activityContactTel); vipSmsResult.setResultTemplate(smsType); + param.put("name",activityContact); response = SmsUtil.sendSms(activityContactTel, smsType, param.toJSONString()); - System.out.println("短信发送-Result：" + response.getCode() + "-" + response.getMessage()); + log.info("短信发送-Result：" + response.getCode() + "-" + response.getMessage()); vipSmsResult.setResultCode(response.getCode()); vipSmsResult.setResultMessage(response.getMessage()); vipSmsResult.setResultRequestId(response.getRequestId()); @@ -902,12 +903,6 @@ public class VipServiceImpl implements VipService{ this.vipSmsResultDao.save(vipSmsResult); } - - - - - - } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/ifish/task/SmsBirthdayVipMember.java b/src/main/java/com/ifish/task/SmsBirthdayVipMember.java index 5faf16d..a65ba52 100644 --- a/src/main/java/com/ifish/task/SmsBirthdayVipMember.java +++ b/src/main/java/com/ifish/task/SmsBirthdayVipMember.java @@ -10,6 +10,7 @@ import com.ifish.entity.VipSmsResult; import com.ifish.service.VipService; import com.ifish.util.SmsUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.EnableScheduling; @@ -29,17 +30,20 @@ import java.util.Date; @Lazy(false) public class SmsBirthdayVipMember { + private static final Logger log = Logger.getLogger(SmsBirthdayVipMember.class); + @Autowired private VipService vipService; @Scheduled(cron= "0 0 10 * * ?") public void vipMemberBirthday() throws ClientException { - final String templateCode = "SMS_139227977"; + log.info("生日短信发送开始....."); + final String templateCode = "SMS_143717026"; final String tel = "0731-84476408"; JSONObject param = null; for (VipMember vipMember : this.vipService.getVipMemberTelByAll()) { param = new JSONObject(); - param.put("name",vipMember.getMemberName()); + param.put("name",vipMember.getMemberLegal()); param.put("tel",tel); VipSmsResult vipSmsResult = new VipSmsResult(); SendSmsResponse response = null; @@ -47,7 +51,7 @@ public class SmsBirthdayVipMember { vipSmsResult.setResultTel(vipMember.getMemberTel()); vipSmsResult.setResultTemplate(templateCode); response = SmsUtil.sendSms(vipMember.getMemberTel(), templateCode, param.toJSONString()); - System.out.println("会员生日提醒短信发送-Result：" + response.getCode() + "-" + response.getMessage()); + log.info("会员生日提醒短信发送-Result：" + response.getCode() + "-" + response.getMessage()); vipSmsResult.setResultCode(response.getCode()); vipSmsResult.setResultMessage(response.getMessage()); vipSmsResult.setResultRequestId(response.getRequestId()); @@ -66,7 +70,7 @@ public class SmsBirthdayVipMember { vipSmsResult.setResultTel(vipReferrer.getReferrerTel()); vipSmsResult.setResultTemplate(templateCode); response = SmsUtil.sendSms(vipReferrer.getReferrerTel(), templateCode, param.toJSONString()); - System.out.println("推荐人生日提醒短信发送-Result：" + response.getCode() + "-" + response.getMessage()); + log.info("推荐人生日提醒短信发送-Result：" + response.getCode() + "-" + response.getMessage()); vipSmsResult.setResultCode(response.getCode()); vipSmsResult.setResultMessage(response.getMessage()); vipSmsResult.setResultRequestId(response.getRequestId()); @@ -74,6 +78,7 @@ public class SmsBirthdayVipMember { vipSmsResult.setResultCreateTime(new Date()); this.vipService.saveSmsResult(vipSmsResult); } + log.info("生日短信发送结束....."); } diff --git a/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp index b199bab..7b4793b 100644 --- a/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp +++ b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp @@ -43,8 +43,8 @@ {"mData": "activityContactTel", "bSortable": false}, {"mData": "activityPhone", "bSortable": false}, {"mData": "activityEmail", "bSortable": false}, - {"mData": "activityWechat", "bSortable": false}, {"mData": "activityPosition", "bSortable": false}, + {"mData": "activityWechat", "bSortable": false}, {"mData": "activityImportDate", "bSortable": false} ], "oLanguage": { @@ -140,6 +140,12 @@ $("#importForm").submit(); } + function changeSmsContent() { + $("#smsType option").each(function () { + $("#" + $(this).val()).hide(); + }); + $("#" + $("#smsType option:selected").val()).show(); + } @@ -233,45 +239,86 @@
- +
-
-
- -
- +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ + +
-
-
- -
- + -
-
- -
- +
+
+ +
+ +
-
-
-
- -
- +
+
+ +
+ +
-
-
-
- -
- - +
+
+ +
+ +
+
+
+
+ +
+ + +
diff --git a/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp b/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp index b651e35..f8ed5d7 100644 --- a/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp +++ b/src/main/webapp/WEB-INF/view/vip/vipCompany.jsp @@ -41,7 +41,7 @@ "sAjaxSource": "<%=basePath%>page/vip/companyList.do", "fnServerData": returnServerData, "aoColumns": [ - {"mData": "companyId", "bSortable": false}, + {"mData": "companySerial", "bSortable": false}, {"mData": function(vipCompany){ return vipCompany.vipMember.memberName; }, "bSortable": false}, diff --git a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp index 4774007..01c55f8 100644 --- a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp +++ b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp @@ -50,8 +50,7 @@ {"mData": "memberCode","bSortable": false }, {"mData": "memberName","bSortable": false }, {"mData": "memberLegal","bSortable": false }, - {"mData": "memberLegalCard","bSortable": false }, - {"mData": "memberLevel","bSortable": false }, + {"mData": "memberTel","bSortable": false }, {"mData": "memberAdmissionTime", "bSortable": false}, {"mData": "memberMaturityTime", "bSortable": false}, {"mData": function (vipMember) { @@ -70,26 +69,10 @@ } }, "bSortable": false}, {"mData": "memberContactSituation", "bSortable": false}, - {"mData": "memberTel","bSortable": false }, - {"mData": "memberWechat","bSortable": false }, {"mData": "memberEmail","bSortable": false }, {"mData": "memberImportantContact","bSortable": false }, {"mData": "memberImportantTel","bSortable": false }, - {"mData": "memberHandlingContact","bSortable": false }, - {"mData": "memberHandlingTel","bSortable": false }, {"mData": "memberAddress", "bSortable": false}, - {"mData": "memberFee", "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": function(vipMember){ return ''+ ''+ @@ -388,36 +371,19 @@      全选 - 会员代号 + 单位代号 单位名称 法人代表 - 法人身份证号 - 等级 + 法人号码 入会时间 到期时间 会员类型 推荐人 联系情况 - 法人号码 - 微信 邮箱 重要联系人 重要手机 - 经办联系人 - 经办手机 单位地址 - 会费 - 注册资金 - 成立时间 - 生日 - 资质情况 - 官网 - 通知书 - 需求表 - 环保网 - 企业情况 - 联系人 - 联系电话 操作 @@ -455,42 +421,43 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -498,17 +465,55 @@
+ -