Quellcode durchsuchen

Merge remote-tracking branch 'origin/test'

limin vor 7 Jahren
Ursprung
Commit
f93440f051

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1395,7 +1395,7 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	/**
-	 * 顾问首
+	 * 搜索列表
 	 * @param modelview
 	 * @return
 	 */

+ 8 - 8
src/main/java/com/goafanti/common/enums/collectType.java

@@ -7,14 +7,14 @@ import org.apache.commons.lang3.StringUtils;
 
 public enum collectType {
 	
-	ACHIEVEMENT(0, "achievement"),//0成果,1需求,2专利,3政策,4项目,5专家,6顾问,7新闻
-	DMAND(1, "demand"),
-	PATENT(2,"jt_business_project"),
-	POLICY(3,"policy"),
-	PROJECT(4,"jt_business_project"),
-	EXPERT(5,"expert"),//expert
-	ADVISER(6,"adviser"),//adviser
-	NEWS(7,"news"),
+	ACHIEVEMENT(0, "achievement"),//成果
+	DMAND(1, "demand"),//1需求
+	PATENT(2,"patent"),//2专利
+	POLICY(3,"policy"),//3政策
+	PROJECT(4,"jt_business_project"),//4项目
+	EXPERT(5,"expert"),//5专家
+	ADVISER(6,"adviser"),//6顾问
+	NEWS(7,"news"),//7新闻
 	OTHER(8, "");
 	
 	private collectType(Integer code, String desc) {

+ 19 - 14
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -663,6 +663,8 @@
     <result column="authentication" jdbcType="INTEGER" property="authentication"/>
     <result column="head_portrait_url" jdbcType="VARCHAR" property="headPortraitUrl" />
     <result column="logo_url" jdbcType="VARCHAR" property="logoUrl" />
+    <result column="expert" jdbcType="INTEGER" property="expert" />
+    <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
   </resultMap>
   
@@ -697,21 +699,24 @@
   </select>
   
   <select id="selectUserBaseByUserId" parameterType="java.lang.String" resultMap="UserPageHomeBo">
-  	select 
-  		id,
-  		number,
-  		type,
-  		authentication,
-  		username,
-  		identify_name,
-  		nickname,
-  		create_time,
-  		authentication,
-  		status,email,
-  		head_portrait_url,
-  		mobile from user
+  	    select 
+  		a.id,
+  		a.number,
+  		a.type,
+  		a.authentication,
+  		a.username,
+  		a.identify_name,
+  		a.nickname,
+  		a.create_time,
+  		a.authentication,
+  		a.status,a.email,
+  		a.head_portrait_url,
+  		b.expert,
+  		b.audit_status,
+  		a.mobile from user a
+  	left join user_identity b on a.id=b.uid 
    	where 
-   		id = #{uid,jdbcType = VARCHAR}
+   		a.id = #{uid,jdbcType = VARCHAR}
   </select>
   
   <select id="selectUserDownLoadBoByUserId" parameterType="java.lang.String" resultMap="UserDownLoadBo">

+ 16 - 0
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -25,6 +25,10 @@ public class UserPageHomeBo extends UserBaseBo{
      * 知识产权数量
      */
     private Integer	intellectualPropertyNum;
+    
+    private Integer expert;
+    
+    private Integer auditStatus;
 	public Integer getPatentNum() {
 		return patentNum;
 	}
@@ -61,4 +65,16 @@ public class UserPageHomeBo extends UserBaseBo{
 	public void setIntellectualPropertyNum(Integer intellectualPropertyNum) {
 		this.intellectualPropertyNum = intellectualPropertyNum;
 	}
+	public Integer getExpert() {
+		return expert;
+	}
+	public void setExpert(Integer expert) {
+		this.expert = expert;
+	}
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
+	}
 }

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -528,7 +528,7 @@
 				s.parentNode.insertBefore(hm, s);
 			})();
 		</script>
-		<script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script>
+		 <script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script> 
 		<script th:inline="javascript">
 			/*<![CDATA[*/
 			window.globalConfig = {};

+ 1 - 0
src/main/webapp/WEB-INF/views/portal/adviser.html

@@ -60,4 +60,5 @@
 	<script type="text/javascript" th:src="${portalHost+'/newMenu/adviser.js'}"></script>
 	</div>
 	</body>
+	
 </html>

+ 22 - 0
src/main/webapp/WEB-INF/views/portal/search.html

@@ -19,6 +19,27 @@
 		<div class="cont">
 			
 		</div>
+		<div class="pagination_box">
+                    <nav aria-label="Page navigation" class="clearfix">
+                        <ul class="pagination">
+                            <li class="pagePre">
+                                <a href="#" aria-label="Previous">
+                                    <span aria-hidden="true">首页</span>
+                                </a>
+                            </li>
+                            <li class="pageNumber"><a href="#" value="1">1</a></li>
+                            <li class="pageNext">
+                                <a href="#" aria-label="Next">
+                                    <span aria-hidden="true">末页</span>
+                                </a>
+                            </li>
+                        </ul>
+                        <div class="inp">
+                            <input type="text" class=""><button class="btn btn-default">跳转</button>
+                        </div>
+                        <span class="totalCount">共0条数据</span>
+                    </nav>
+                </div>
 		<footer>
         <div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>
@@ -29,3 +50,4 @@
 	</div>
 	</body>
 </html>
+