增加按注册时间查询企业信息的接口

src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.erp.model.EnterpriseNameAndUU;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.AccessTokenService;
 import com.uas.platform.b2b.service.EnterpriseService;
@@ -13,6 +14,7 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -465,4 +467,16 @@ public class PublicQueryController {
 		}
 		return null;
 	}
+
+	/**
+	 * 通过注册时间查询注册企业的UU号
+	 *
+	 * @param registerdate 注册时间
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/nameAndEnUU", method = RequestMethod.GET)
+    @ResponseBody
+	public List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate) throws UnsupportedEncodingException {
+		return enterpriseService.getMembersByRegisterDate(registerdate);
+	}
 }

src/main/java/com/uas/platform/b2b/erp/model/EnterpriseNameAndUU.java

@@ -0,0 +1,57 @@
+package com.uas.platform.b2b.erp.model;
+
+/**
+ * ERP访问获取的企业的相关信息
+ *
+ * Created by hejq on 2018-03-02.
+ */
+public class EnterpriseNameAndUU {
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * uu
+     */
+    private Long uu;
+
+    /**
+     * 注册时间
+     */
+    private String registerdate;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getUu() {
+        return uu;
+    }
+
+    public void setUu(Long uu) {
+        this.uu = uu;
+    }
+
+    public String getRegisterdate() {
+        return registerdate;
+    }
+
+    public void setRegisterdate(String registerdate) {
+        this.registerdate = registerdate;
+    }
+
+    @Override
+    public String toString() {
+        return "Enterprise{" +
+                "name='" + name + '\'' +
+                ", uu=" + uu +
+                ", registerdate='" + registerdate + '\'' +
+                '}';
+    }
+}

src/main/java/com/uas/platform/b2b/service/EnterpriseService.java

@@ -5,7 +5,9 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.uas.platform.b2b.erp.model.EnterpriseNameAndUU;
 import com.uas.platform.b2b.model.PurchaseApBillOutInfo;
+import org.json.JSONString;
 import org.springframework.data.domain.Page;
 
 import com.uas.platform.b2b.model.Enterprise;
@@ -211,4 +213,12 @@ public interface EnterpriseService {
 	public PurchaseApBillOutInfo saveApBillOutInfo(PurchaseApBillOutInfo apBillOutInfo);
 
     public PurchaseApBillOutInfo getApBillOutInfo(Long enuu);
+
+	/**
+	 * 通过注册时间查询企业注册信息
+	 *
+	 * @param registerdate 注册时间
+	 * @return
+	 */
+	List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate);
 }

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

@@ -19,9 +19,12 @@ 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;
@@ -749,4 +752,19 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         return purchaseApBillOutInfoDao.findByUu(enuu);
     }
 
+	/**
+	 * 通过注册时间查询企业注册信息
+	 *
+	 * @param registerdate 注册时间
+	 * @return
+	 */
+	@Override
+	public List<EnterpriseNameAndUU> getMembersByRegisterDate(String registerdate) {
+		String sql = "select en_name name, en_uu uu, to_char(en_time, 'yyyy-mm-dd') registerdate from sec$enterprises";
+		if (null != registerdate) {
+			sql = sql + " where to_char(en_time, 'yyyy-mm-dd') <= '" + registerdate + "'";
+		}
+		sql = sql + " order by en_time asc";
+		return commonDao.query(sql, EnterpriseNameAndUU.class);
+	}
 }