新增邀请注册相关

src/main/java/com/uas/platform/b2bManage/controller/InviteController.java

@@ -13,11 +13,11 @@ import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -30,7 +30,7 @@ import java.util.Date;
  * @author hejq
  * @date 2018-07-10 16:17
  */
-@Controller
+@RestController
 @RequestMapping(value = "/invite")
 public class InviteController extends BaseController {
 
@@ -49,10 +49,9 @@ public class InviteController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ResponseBody
     public Page<Invite> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
         PageInfo info = new PageInfo(params);
-        Sort sort = new Sort(Sort.Direction.DESC, "inviteEnName");
+        Sort sort = new Sort(Sort.Direction.DESC, "inviteEnName", "inviteUserName");
         info.setSort(sort);
         if (!StringUtils.isEmpty(keyword)) {
             keyword = keyword.trim();
@@ -64,24 +63,25 @@ public class InviteController extends BaseController {
     /**
      * 导出邀请注册记录信息
      *
-     * @param params 分页参数
      * @param keyword 关键字
      * @param request request
      * @return
      */
     @RequestMapping(value = "/xls", method = RequestMethod.GET )
-    public ModelAndView exportInvites(PageParams params, String keyword, HttpServletRequest request) {
+    public ModelAndView exportInvites(String keyword, HttpServletRequest request) {
+        PageParams params = new PageParams();
         params.setPage(1);
-        params.setCount(1);
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        params.setCount(JxlsExcelView.MAX_SIZE);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分");
         ModelAndView modelAndView = new ModelAndView();
         Page<Invite> invites = findByPageInfo(params, keyword, request);
         modelAndView.addObject("time", dateFormat.format(new Date(System.currentTimeMillis())));
         modelAndView.addObject("user", SystemSession.getUser().getFullName());
-        modelAndView.addObject("count", invites.getTotalElements());
+        modelAndView.addObject("count",
+                invites.getTotalElements() > JxlsExcelView.MAX_SIZE ? JxlsExcelView.MAX_SIZE : invites.getTotalElements());
         modelAndView.addObject("data", invites.getContent());
         modelAndView.addObject("dateFormat", dateFormat);
-        modelAndView.setView(new JxlsExcelView("classpath*:jxls-tpl/Invite", "邀请注册记录"));
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/Invite", "邀请注册记录"));
         useLogService.appendLog(UseType.EXPROT_INVITE_DATA.code(), keyword, AgentUtils.getIp(request));
         return modelAndView;
     }

src/main/java/com/uas/platform/b2bManage/core/support/ApplicationContextRegister.java

@@ -5,11 +5,19 @@ import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 
 import com.uas.platform.b2bManage.core.util.ContextUtils;
+import org.springframework.context.ApplicationContextAware;
 
-public class ApplicationContextRegister {
+/**
+ * spring上下文
+ * 
+ * @author hejq
+ * @date 2018-07-11 14:05
+ */
+public class ApplicationContextRegister implements ApplicationContextAware {
 	private static Logger logger = Logger.getLogger(ApplicationContextRegister.class);
 
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+	@Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		ContextUtils.setApplicationContext(applicationContext);
 		logger.debug("ApplicationContext registed");
 	}

src/main/webapp/WEB-INF/views/normal/inviteList.html

@@ -109,7 +109,10 @@
 			<input id="inviteList-total" style="width: 100px; border:0;outline:0;background: #F7F7F8" readonly>
 		</div>
         <div class="input-group">
-            <input type="text" id="keyword" class="form-control" placeholder="请输入名称或UU号搜索"><span class="input-group-addon" id="p_search">搜索</span>
+            <input type="text" id="keyword" class="form-control" placeholder="请输入企业名称、邀请企业名称、邀请人、管理员搜索"><span class="input-group-addon" id="p_search">搜索</span>
+        </div>
+        <div class="edit"  style="float: left">
+            <button class="btn btn-success" id="export"><i class="fa fa-excel"></i>导出</button>
         </div>
     </div>
 	<table class="table table-striped table-hover" style="overflow: scroll">

src/main/webapp/resources/js/common/invite.js

@@ -88,6 +88,9 @@ function getinviteList(count, page, keyword) {
     })
 }
 
+$('#export').click(function () {
+   window.open("/invite/xls?keyword=" + $('#keyword').val());
+});
 /**
  * 建立表格数据
  *