소스 검색

技淘BUG修复

anderx 7 년 전
부모
커밋
78ea133282

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

@@ -323,7 +323,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/service/serviceIndex");
 		//政策
 //		List<PolicyEntity>policyEntities=achievementService.getIntellectualProperty(8);
-		List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_tech_service_index", 1, 8).getList();
+		List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_tech_service_index", 1, 8,null).getList();
 		modelview.addObject("policyList",policies); 
 		//新闻
 		List<News>news=(List<News>) newsService.portalNewsList(5, 1, null, null, null, null,2).getList();
@@ -643,12 +643,12 @@ public class WebpageController extends BaseController {
 			if(project.getMinImgUrl()!=null && project.getMinImgUrl().length()<=0)project.setMinImgUrl(null);
 		}
 		modelview.addObject("projects",jtBusinessProjects);
-		List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 2).getList();
+		List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 2,null).getList();
 		modelview.addObject("policys",policies);
-		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, "web_index").getList();
+		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, null).getList();
 		modelview.addObject("news",newsList);
 //		
-		List<News> subscriptions=(List<News>) newsService.listNews(0, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
+		List<News> subscriptions=(List<News>) newsService.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, null).getList();
 		modelview.addObject("subscription",subscriptions);
 		
 		if(subscriptions!=null && subscriptions.size()>0 && subscriptions.get(0).getSourceUrl()!=null && subscriptions.get(0).getSourceUrl().contains(".")) {
@@ -827,7 +827,7 @@ public class WebpageController extends BaseController {
 		modelview.addObject("practicalTechnology",practicalTechnology); 
 		
 //		List<PolicyEntity>intellectualPropertyPolicyList=achievementService.getIntellectualProperty(5);
-		List<PolicyResult> policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 5).getList();
+		List<PolicyResult> policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 5,null).getList();
 		modelview.addObject("policyList",policies);
 		return modelview;
 	}
@@ -914,19 +914,18 @@ public class WebpageController extends BaseController {
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/portal/technologyTrading/tradingIndex")
 	public ModelAndView patentTrading(HttpServletRequest request, ModelAndView modelAndView) {
-		String showLocation="web_demand_trading_index";
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelAndView.setViewName("/portal/technologyTrading/tradingIndex");
 		//成果
-		List<AchievementObject>achievementObjects=achievementService.getHotAchievements(4, url, showLocation);
+		List<AchievementObject>achievementObjects=achievementService.getHotAchievements(4, url, "web_achievement_trading_index");
 		modelAndView.addObject("achievement",achievementObjects);
 		
 		//需求
-		List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,showLocation);
+		List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,"web_demand_trading_index");
 		modelAndView.addObject("demand",demandListBos);
 		
 		//政策
-		List<Policy> policies=(List<Policy>) policyService.searchPolicy(null, 2, null, null, "web_index", 1, 5).getList();
+		List<Policy> policies=(List<Policy>) policyService.searchPolicy(null, 2, null, null, "web_index", 1, 5,null).getList();
 		modelAndView.addObject("policy",policies);
 		
 		//专家
@@ -1083,7 +1082,7 @@ public class WebpageController extends BaseController {
 					if (StringUtils.isNumeric(pageSize)) {
 						pSize = Integer.parseInt(pageSize);
 					}
-					res.setData(policyService.searchPolicy( keyword,2, null, null, "web_index", pNo, pSize));
+					res.setData(policyService.searchPolicy( keyword,2, null, null, "web_index", pNo, pSize,provinceId));
 					return res;
 				}
 }

+ 1 - 0
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -754,6 +754,7 @@
 			a.is_urgent as isUrgent
 		from demand a left join user b on a.employer_id = b.id 
 		where  a.info_sources=1
+		and a.deleted_sign=0
 		<if test="employerId != null">
 			and a.employer_id = #{employerId,jdbcType=VARCHAR}
 		</if>

+ 8 - 2
src/main/java/com/goafanti/common/mapper/PolicyMapper.xml

@@ -558,8 +558,8 @@
   dg.name as provinceS,
   dgg.name as cityS
   from policy p
-  left join district_glossory dg on dg.name =p.province
-  left join district_glossory dgg on dgg.name=p.city
+  left join district_glossory dg on dg.id =p.province
+  left join district_glossory dgg on dgg.id=p.city
   <if test="publishPage!=null">
   left join policy_publish pp on pp.policy_id=p.id
   </if>
@@ -579,6 +579,12 @@
   <if test="endDate !=null">
     and	p.release_date <![CDATA[ <= ]]> #{endDate,jdbcType=TIMESTAMP}
   </if>
+  <if test="provinceId !=null">
+   and p.province=#{province,jdbcType=INTEGER}
+  </if>
+  <if test="city !=null">
+   and p.city=#{city,jdbcType=VARCHAR}
+  </if>
   order by p.release_date desc
   <if test="page_sql!=null">
   ${page_sql}

+ 1 - 1
src/main/java/com/goafanti/news/controller/AdminPolicyApiController.java

@@ -190,7 +190,7 @@ public class AdminPolicyApiController extends BaseApiController {
 					Result result=new Result();
 					if(pageNo==null || pageNo<1)pageNo=1;
 					if(pageSize==null || pageSize<1)pageSize=10;
-					result.setData(policyService.searchPolicy(title,auditStatus,startReleaseDate,endReleaseDate,publishPage,pageNo,pageSize));
+					result.setData(policyService.searchPolicy(title,auditStatus,startReleaseDate,endReleaseDate,publishPage,pageNo,pageSize,null));
 					return result;
 				}
 				

+ 2 - 1
src/main/java/com/goafanti/news/service/PolicyService.java

@@ -127,7 +127,7 @@ return 	-1;
 }
 
 @SuppressWarnings("unchecked")
-public Pagination<PolicyResult>searchPolicy(String title,Integer auditStatus,String startReleaseDate,String endReleaseDate,String publishPage,Integer pageNo,Integer pageSize){
+public Pagination<PolicyResult>searchPolicy(String title,Integer auditStatus,String startReleaseDate,String endReleaseDate,String publishPage,Integer pageNo,Integer pageSize,Integer provinceId){
 	Map<String, Object> params = new HashMap<>();
 	if(title!=null)params.put("title", title);
 	if(auditStatus!=null &&auditStatus>=0 && auditStatus<=4)params.put("auditStatus", auditStatus);
@@ -136,6 +136,7 @@ public Pagination<PolicyResult>searchPolicy(String title,Integer auditStatus,Str
 	}
 	if(endReleaseDate!=null)params.put("endDate", endReleaseDate); 
 	if(publishPage!=null)params.put("publishPage", publishPage);
+	if(provinceId!=null)params.put("provinceId", provinceId);
 	return (Pagination<PolicyResult>) findPage("findPolicyByPageAndPublishPages","findPolicyCountByPageAndPublishPages",params, pageNo, pageSize); 
 }
 }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -36,7 +36,7 @@
 						<div class ="serviceDetailsImg" th:if="${achievementdetail.firstPicture} == null ">
 							<img th:src="${portalHost+'/img/initPic/achievementInit.jpg'}" alt=""/>
 						</div>
-						<div th:if="${achievementdetail.firstPicture} != null ">
+						<div class ="serviceDetailsImg" th:if="${achievementdetail.firstPicture} != null ">
 							<img th:src= "${avatarUploadHost+achievementdetail.firstPicture}"alt=""  />
 						</div>
 						     <div class="collection">

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

@@ -410,7 +410,7 @@
 						<div>
 							<h4 >
 							<span th:text="${personnelDemand.name}"></span>
-								 <span class="titleBorder">人才</span> <span class="money" th:text="${personnelDemand.fundForPersonnel}==null?'¥0.00元/月':${'¥'+personnelDemand.fundForPersonnel+'元/月'}"></span>
+								 <span class="titleBorder">人才</span> <span class="money" th:text="${personnelDemand.fundForPersonnel}==null?'面议':${'¥'+personnelDemand.fundForPersonnel+'万'}"></span>
 							</h4>
 							<p th:text="${personnelDemand.problemDes}"></p>
 							<span class="float-right">招募中</span>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -29,7 +29,7 @@
 						<div class="serviceDetailsImg" th:if="${demand.firstPic} == null " >
 							<img th:src="${portalHost+'/img/initPic/demandInit.jpg'}" alt=""/>
 						</div>
-						<div th:if="${demand.firstPic} != null " >
+						<div class ="serviceDetailsImg" th:if="${demand.firstPic} != null " >
 							<img th:src= "${avatarUploadHost+demand.firstPic}"alt="" />
 						</div>
 						<div class="collection">

+ 2 - 2
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -56,7 +56,7 @@
 		</div>
 	</div>
 	<div class="think_achieve">
-		<h3>技术成果</h3>
+		<!-- <h3>技术成果</h3>
 		<div class="achieve_cont" th:if="${showflg} == 1 ">
 			<a th:each="partnerAchievementList:${partnerAchievementList}">
 				<div>
@@ -64,7 +64,7 @@
 					<p th:text="${partnerAchievementList.introduction}"></p>
 				</div>
 			</a>
-		</div>
+		</div> -->
 		<div class="achieve_btn">
 			<a onclick="openZoosUrl('chatwin');">
 						<span class="glyphicon glyphicon-user"></span>