邀请注册接口返回时间统计增加月份标识，企业查询注册更改为精确匹配

src/main/java/com/uas/platform/b2b/dao/EnterpriseDao.java

@@ -1,9 +1,7 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
-import javax.persistence.QueryHint;
-
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -12,8 +10,8 @@ import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.EnterpriseInfo;
+import javax.persistence.QueryHint;
+import java.util.List;
 
 @Repository
 public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>,JpaRepository<Enterprise, Long> {
@@ -96,4 +94,12 @@ public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>,JpaR
 	 */
 	List<Enterprise> findByEnBussinessCodeAndEnName(String enBussinessCode, String enName);
 
+	/**
+	 * 按企业名称精确查询企业信息
+	 *
+	 * @param name 企业名称
+	 * @return
+	 */
+	@Query("from Enterprise e where e.enName = :name")
+	List<Enterprise> findByName(@Param("name") String name);
 }

src/main/java/com/uas/platform/b2b/service/impl/EnquiryServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
  /**
@@ -38,9 +39,9 @@ public class EnquiryServiceImpl implements EnquiryService {
      * @return
      */
     @Override
-    public SPage<PurcInquiryItemInfo> fingByPageInfo(PageInfo pageInfo, SearchFilter searchFilter) throws Exception {
+    public SPage<PurcInquiryItemInfo> fingByPageInfo(PageInfo pageInfo, SearchFilter searchFilter, List<Long> distribute) throws Exception {
         searchFilter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
-        Page<PurcInquiryItemInfo> infos = InquiryUtils.getInfo(pageInfo, searchFilter);
+        Page<PurcInquiryItemInfo> infos = InquiryUtils.getInfo(pageInfo, searchFilter, distribute);
         return SPageUtils.covert(infos);
     }
 

src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -1,46 +1,23 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.servlet.http.HttpServletRequest;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.UserDetail;
 import com.uas.account.entity.UserSpace;
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.erp.model.*;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.support.*;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import org.json.JSONString;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.core.util.SearchKeyUtils;
+import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.erp.model.EnterpriseNameAndUU;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.CommBufferedLogger;
+import com.uas.platform.b2b.support.SendMailService;
+import com.uas.platform.b2b.support.SysConf;
+import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.SystemException;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
@@ -50,6 +27,21 @@ import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 /**
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
@@ -778,4 +770,15 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         sql = sql + "order by en_time asc) a) where rn >= " + rn + " and rn <= " + rownum;
 		return commonDao.query(sql, EnterpriseNameAndUU.class);
 	}
+
+	/**
+	 * 通过企业名称查询企业注册信息
+	 *
+	 * @param name 企业名称
+	 * @return
+	 */
+	@Override
+	public List<Enterprise> findByEnName(String name) {
+		return enterpriseDao.findByName(name);
+	}
 }

src/main/java/com/uas/platform/b2b/v2/model/Invitation.java

@@ -17,6 +17,11 @@ public class Invitation {
      */
     private String time;
 
+    /**
+     * 第几月
+     */
+    private Integer month;
+
     /**
      * 总数
      */
@@ -48,6 +53,14 @@ public class Invitation {
         this.time = time;
     }
 
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
     public Integer getCount() {
         return count;
     }

src/main/java/com/uas/platform/b2b/v2/service/impl/InviteRecordServiceImpl.java

@@ -53,7 +53,7 @@ public class InviteRecordServiceImpl implements InviteRecordService {
     @Override
     public List<EnterpriseBaseInfo> checkByName(String name) {
         List<EnterpriseBaseInfo> baseInfoList = new ArrayList<EnterpriseBaseInfo>();
-        List<Enterprise> enterprises = enterpriseService.findByName(name);
+        List<Enterprise> enterprises = enterpriseService.findByEnName(name);
         if (!CollectionUtils.isEmpty(enterprises)) {
             for (Enterprise e : enterprises) {
                 EnterpriseBaseInfo baseInfo = new EnterpriseBaseInfo(e);
@@ -119,9 +119,9 @@ public class InviteRecordServiceImpl implements InviteRecordService {
      */
     @Override
     public List<Invitation> getCountGroupByDate(Long userUU, Long enUU, String year) {
-        String sql = "select time, count, 0 as doneCount from v$invitation_all where time like '%" + year + "%' and useruu = " + userUU + "order by time asc";
+        String sql = "select time, count, 0 as doneCount,substr(time, -2) month from v$invitation_all where time like '%" + year + "%' and useruu = " + userUU + "order by time asc";
         List<Invitation> all = commonDao.query(sql, Invitation.class);
-        String sql1 = "select time, count doneCount from v$invitation where time like'%" + year + "%' and useruu = " + userUU + "and active = 1";
+        String sql1 = "select time, count doneCount,substr(time, -2) month from v$invitation where time like'%" + year + "%' and useruu = " + userUU + "and active = 1";
         List<Invitation> done = commonDao.query(sql1, Invitation.class);
         if (!CollectionUtils.isEmpty(all) && !CollectionUtils.isEmpty(done)) {
             for (Invitation a : all) {