Browse Source

Merge remote-tracking branch 'origin/master' into test

limin 7 years ago
parent
commit
e4164fafd3

+ 1 - 3
src/main/java/com/goafanti/business/bo/JtBusinessProjectResult.java

@@ -17,6 +17,7 @@ public class JtBusinessProjectResult extends JtBusinessProject {
 	private Integer interested;
 	
 	
+	
 	public String getOwnerName() {
 		return ownerName;
 	}
@@ -115,7 +116,4 @@ public void setCompanyId(String companyId) {
 	public void setInterested(Integer interested) {
 		this.interested = interested;
 	}
-
-	
-	
 }

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

@@ -5,14 +5,17 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
 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.servlet.ModelAndView;
+
 import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.app.bo.ExpertsListBo;
@@ -36,6 +39,7 @@ import com.goafanti.common.model.JtBusinessProject;
 import com.goafanti.common.model.News;
 import com.goafanti.common.model.Policy;
 import com.goafanti.common.model.User;
+import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.service.GlobalSearchService;
 import com.goafanti.common.utils.LimitLengthUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -498,7 +502,16 @@ public class WebpageController extends BaseController {
 			}
 		}
 		modelview.addObject("owner", owner);
-		modelview.addObject("pj", jtBusinessProject);
+		modelview.addObject("pj", jtBusinessProject);
+		
+		//判断是否是个人还是组织
+		if(null != jtBusinessProject.getType() && 0 == jtBusinessProject.getType()){//个人
+			UserIdentity uide =  userIdentityService.selectUserIdentityByUserId(jtBusinessProject.getOwnerId());
+			modelview.addObject("uide", uide);
+		}else if(null != jtBusinessProject.getType() && 1 == jtBusinessProject.getType()){//企业
+			String oide = organizationIdentityService.selectOrgIdentityBoByUserId(jtBusinessProject.getOwnerId()).getUid();
+			modelview.addObject("oide", oide);
+		}
 		//System.out.println(jtBusinessProject.toString());
 		if (jtBusinessProject != null) {
 			JtBusinessCategoryTree tree = jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
@@ -545,7 +558,15 @@ public class WebpageController extends BaseController {
 			}
 		}
 		modelview.addObject("owner", owner);
-		modelview.addObject("pj", jtBusinessProject);
+		modelview.addObject("pj", jtBusinessProject);
+		//判断是否是个人还是组织
+		if(0 == jtBusinessProject.getType()){//个人
+			UserIdentity uide =  userIdentityService.selectUserIdentityByUserId(jtBusinessProject.getOwnerId());
+			modelview.addObject("uide", uide);
+		}else if(1 == jtBusinessProject.getType()){//企业
+			String oide =  organizationIdentityService.selectOrgIdentityBoByUserId(jtBusinessProject.getOwnerId()).getUid();
+			modelview.addObject("oide", oide);
+		}
 		//System.out.println(jtBusinessProject.toString());
 		if (jtBusinessProject != null) {
 			JtBusinessCategoryTree tree = jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
@@ -985,7 +1006,7 @@ public class WebpageController extends BaseController {
 		modelview.addObject("hotAchievements", hotAchievements);
 
 		// 专利
-		List<AchievementObject> patentAchievements = achievementService.getPatentList(9, url, showLocation);
+		List<AchievementObject> patentAchievements = achievementService.getPatentList(6, url, showLocation);
 		modelview.addObject("patents", patentAchievements);
 		// 实用技术
 		List<AchievementObject> practicalTechnology = achievementService.getPracticalTechnologys(8, url, showLocation);

+ 3 - 1
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -602,6 +602,7 @@
         jtbp.activity_flag as activityFlag, u.nickname as ownerName,ifnull(p.count,0) as interestCount,if(isnull(x.project_id),0,1) as interested,jtbp.keyword,jtbp.summary,
     jtbp.introduce, jtbp.province, jtbp.city, jtbp.create_time as createTime, jtbp.min_img_url as minImgUrl, jtbp.max_img_url as maxImgUrl, jtbp.value, jtbp.apply_conditions as applyConditions, 
     jtbp.owner_id as ownerId, jtbp.is_hot as isHot, jtbp.audit_status as auditStatus, jtbp.audit_info as auditInfo, jtbp.release_date as releaseDate,jtbc.module as module,jtbp.advertisement
+    ,u.`type` as type
     from jt_business_project jtbp left join `user` u on jtbp.owner_id=u.id
     left join jt_business_category jtbc on jtbc.id =  jtbp.category_id
     left join (select project_id,count(*) as count from project_interest group by project_id) p on jtbp.id=p.project_id
@@ -653,7 +654,8 @@
 	  jtbp.summary,
 	  ifnull(dct.dealCount,0) as dealCount,
 	  ifnull(x.count,0) as interestCount,
-	  u.nickname as companyName,u.id as companyId
+	  u.nickname as companyName,u.id as companyId,
+	  u.`type` as type
   from jt_business_project jtbp
   left join user u on u.id=jtbp.owner_id
   left join (select project_id as id,count(*) as count from project_interest group by project_id)x on jtbp.id=x.id

+ 11 - 0
src/main/java/com/goafanti/common/model/JtBusinessProject.java

@@ -128,6 +128,7 @@ public class JtBusinessProject {
 	
 	private String summary;
 
+	private Integer type;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_project.id
 	 * @return  the value of jt_business_project.id
@@ -557,6 +558,16 @@ public class JtBusinessProject {
 	public void setKeyword(String keyword) {
 		this.keyword = keyword;
 	}
+	
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	
 
 	public String getSummary() {
 		return summary;

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

@@ -246,30 +246,6 @@
                          <a th:href="@{/portal/service/safeguarding}">维权</a>
                         </div>
                      </li>                         
-<!--                     <li th:class="${subM}=='thindTankIndex'?active:''"> -->
-<!--                     <div> -->
-<!--                         <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a> -->
-<!--                         <ol class="subnavigation"> -->
-<!--                             <li> -->
-<!--                                 <a th:href="@{/portal/thinkTank/policyList}">智政</a> -->
-<!--                             </li> -->
-<!--                             <li> -->
-<!--                                 <a th:href="@{/portal/thinkTank/index.html#zizone}">智者</a> -->
-<!--                             </li> -->
-<!--                         </ol> -->
-<!--                         </div> -->
-<!--                     </li> -->
-
-<!--                     <li th:class="${subM}=='aboutUs'?active:''"> -->
-<!--                     <div> -->
-<!--                         <a th:href="@{/portal/aboutUs}">关于公司</a> -->
-<!--                         <ol class="subnavigation" style="display: none;"> -->
-<!--                             <li> -->
-<!--                                 <a th:href="@{/portal/contactUs}">联系我们</a> -->
-<!--                             </li> -->
-<!--                         </ol> -->
-<!--                         </div> -->
-<!--                     </li> -->
                 </ul>
             </div>
             <!-- <div class="logo_photo">全国统一服务热线:400-8800-962</div> -->

File diff suppressed because it is too large
+ 7 - 7
src/main/webapp/WEB-INF/views/portal/adviser/adviserDetail.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/companyProfile.html


+ 11 - 9
src/main/webapp/WEB-INF/views/portal/index.html

@@ -174,9 +174,9 @@
 			</div>
 			<div class="hotProject_cont" >
 				<div th:each="p,pStatus:${projects}">
-					<img th:src="${p.maxImgUrl}==null?${portalHost+'/img/indedImg/inded11.png'}:${avatarUploadHost+p.maxImgUrl}" alt="">
+					<img th:src="${p.maxImgUrl}==null or ${p.maxImgUrl}==''?${portalHost+'/img/indedImg/inded11.png'}:${avatarUploadHost+p.maxImgUrl}" alt="">
 					<h3 th:text="${p.name}">高新认定</h3>
-					<p th:text="${p.advertisement}==null?'暂无简介':${#strings.abbreviate(p.advertisement,30)}"></p>
+					<p th:text="${p.advertisement}==null or ${p.advertisement}==''?'暂无简介':${#strings.abbreviate(p.advertisement,30)}"></p>
 					<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">立即办理</a>
 				</div>
 			</div>
@@ -201,8 +201,8 @@
 								<span th:text="${#dates.format(p.releaseDate,'yyyy')}">2018</span>
 							</div>
 							<div class="newTxt">
-								<h5 th:text="${p.title}"></h5>
-								<p th:text="${p.summary}"></p>
+								<h5 th:text="${#strings.abbreviate(p.title,18)}"></h5>
+								<p th:text="${#strings.abbreviate(p.summary,65)}"></p>
 							</div>
 						</a>
 					</li>
@@ -221,8 +221,8 @@
 								<span th:text="${#dates.format(n.releaseDate,'yyyy')}">2018</span>
 							</div>
 							<div class="newTxt">
-								<h5 th:text="${n.title}"></h5>
-								<p th:text="${n.summary}"></p>
+								<h5 th:text="${#strings.abbreviate(n.title,18)}">加奖金哦违法爱按金额积分经济积分经济积分经济if啊积分经济交往和居委会看看哇卡哇卡...</h5>
+								<p th:text="${#strings.abbreviate(n.summary,65)}">哈哈哈哈海鸥科技打飞机附近的啊我的㘝技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
 							</div>
 						</a>
 					</li>
@@ -250,12 +250,14 @@
 							<span th:text="${#dates.format(sc.releaseDate,'MM-dd')}">03-12</span>
 							<span th:text="${#dates.format(sc.releaseDate,'yyyy')}">2018</span>
 						</div>
-						<p th:text="${sc.title}"></p>
+						<p th:text="${#strings.abbreviate(sc.title,18)}"></p>
 					</a>
 				</li>
 			</ul>
 		</div>
-		
+		<a th:href="@{/portal/thinkTank/policyList?type=99}" class="more">MORE
+			<span></span>
+		</a>
 	</div>
 	<footer>
 			<div th:replace="common::copyright"></div>
@@ -267,4 +269,4 @@
 	</div>
 </body>
 
-</html>
+</html>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patenteDetails.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


+ 3 - 3
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -9,7 +9,7 @@
 </head>
 
 <body>
-   <div th:replace="common::nav('','trading')"></div>
+   <div th:replace="common::nav('','')"></div>
     <!-- search -->
     <div class="container">
         
@@ -192,11 +192,11 @@
                 <div class="col-sm-4">
                         <div class="demandAdviser">
                         <img th:src="${portalHost+'/img/newMenu/achievement_10.png'}" alt="">
-                        <a onclick="_MEIQIA('showPanel')"></a>
+                        <a onclick="openZoosUrl('chatwin');"></a>
                     </div>
                     <div class="demandDeclare">
                         <img th:src="${portalHost+'/img/newMenu/achievement_11.png'}" alt="">
-                        <a onclick="_MEIQIA('showPanel')"></a>
+                        <a onclick="openZoosUrl('chatwin');"></a>
                     </div>
 
                 </div>

+ 9 - 9
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -10,7 +10,7 @@
 
 <body>
 
-		<div th:replace="common::nav('','trading')"></div>
+		<div th:replace="common::nav('','')"></div>
 	<!-- search -->
 	<div class="container">
 		<div class="clearFix search">
@@ -307,10 +307,10 @@
 				企业技术需求 <a th:href="@{/portal/technologyTrading/demandList}">查看更多 > </a>
 			</h4>
 			<div class="row">
-				<div class="col-md-2">
+				<div class="colMd2">
 					<img th:src="${portalHost+'/img/newMenu/demand-8.png'}" alt="">
 				</div>
-				<div class="imgGroup col-md-10">
+				<div class="imgGroup colMd10">
 					<ul>
 
 						<li th:each="companyDemandList:${companyDemandList}">
@@ -366,9 +366,9 @@
 			</h4>
 		</div>
 		<div class="row studyTxt">
-			<div class="col-sm-10">
+			<div class="colSm10">
 				<ul class="row">
-					<li class="col-sm-4" th:each="plsdemand:${proLearnStudyDemandList}">
+					<li th:each="plsdemand:${proLearnStudyDemandList}">
 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${plsdemand.id},type=${plsdemand.dataCategory})}">
 						<div class="imgLeft">
 							<img th:if="${plsdemand.pictureUrl}==null" th:src="${portalHost+'/img/initPic/demandInit.jpg'}" alt="">
@@ -385,7 +385,7 @@
 				
 				</ul>
 			</div>
-			<div class="col-sm-2">
+			<div class="colSm2">
 				<img th:src="${portalHost+'/img/newMenu/demand-18.jpg'}" alt="">
 			</div>
 		</div>
@@ -430,13 +430,13 @@
 			</h4>
 		</div>
 		<div class="technology row">
-			<div class="col-sm-2">
+			<div class="colSm2">
 				<img th:src="${portalHost+'/img/newMenu/demand-21.jpg'}" alt="">
 			</div>
-			<div class="col-sm-10">
+			<div class="colSm10">
 				<ol class="row">
 				
-					<li class="col-sm-4" th:each="personnelDemand:${personnelDemandList}">
+					<li th:each="personnelDemand:${personnelDemandList}">
 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${personnelDemand.id},type=${personnelDemand.dataCategory})}">
 						<div>
 							<h4 >

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

@@ -80,7 +80,7 @@
    				<ul>
   					<li th:each="news:${newsList}">
   						<a th:href="@{/portal/news/newsDetail(id=${news.id})}">
-   						<p th:text="${news.title}"></p>
+   						<p th:text="${#strings.abbreviate(news.title,18)}"></p>
    						<time th:text="${news.createTimeFormattedDate}"></time>
   						</a>
   					</li>