Pārlūkot izejas kodu

成果、需求行业类型修改

liliang4869 7 gadi atpakaļ
vecāks
revīzija
d432f78d15

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -70,7 +70,7 @@ public interface AchievementService {
 
 	public List<AchievementObject> recentAchievements(int size,String url,String showLocation);
 	
-	public List<AchievementObject>getHotAchievements(int size,String url,String showLocation);
+	public List<AchievementObject>getHotAchievements(int size,String url,String showLocation); 
 	
 	public List<AchievementObject>getPatentList(int size,String url,String showLocation);
 	

+ 12 - 12
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1100,9 +1100,9 @@ order by
 	d.technical_picture_url as technicalPictureUrl
 from
 	achievement d
-left join aft.field_glossory fg on
+left join aft.industry_category fg on
 	fg.id = d.field_a
-left join aft.field_glossory fgg on
+left join aft.industry_category fgg on
 	fgg.id = d.field_b
 left join branch_information branchInfo on
 	instr( branchInfo.domain_name, #{1} )>0
@@ -1135,9 +1135,9 @@ left join branch_information branchInfo
 on INSTR(branchInfo.domain_name,#{1})>0
 left join achievement_publish ap
  on ap.achievement_id=a.id
- left join aft.field_glossory fg on
+ left join aft.industry_category fg on
 	fg.id = a.field_a
-left join aft.field_glossory fgg on
+left join aft.industry_category fgg on
 	fgg.id = a.field_b
 left join 
 (select  
@@ -1193,9 +1193,9 @@ from
 	achievement a
 left join branch_information bi on instr(bi.domain_name,#{1})>0
 left join achievement_publish ap on ap.achievement_id=a.id
-left join aft.field_glossory fg on
+left join aft.industry_category fg on
 	fg.id = a.field_a
-left join aft.field_glossory fgg on
+left join aft.industry_category fgg on
 	fgg.id = a.field_b
 where audit_status=2
 and bi.id =ap.publish_platform
@@ -1228,9 +1228,9 @@ select
 	introduction
 from
 	achievement a
-left join field_glossory fg on
+left join industry_category fg on
 	fg.id = a.field_a
-left join field_glossory fgg on
+left join industry_category fgg on
 	fgg.id = a.field_b
 where
 	a.id = #{0}
@@ -1269,9 +1269,9 @@ select
 	introduction
 from
 	achievement a
-left join field_glossory fg on
+left join industry_category fg on
 	fg.id = a.field_a
-left join field_glossory fgg on
+left join industry_category fgg on
 	fgg.id = a.field_b
 where
 audit_status=2
@@ -1379,9 +1379,9 @@ a.id,
 	a.audit_info as auditInfo
 from
 	achievement a
-left join field_glossory fg on
+left join industry_category fg on
 	fg.id = a.field_a
-left join field_glossory fgg on
+left join industry_category fgg on
 	fgg.id = a.field_b
 where
 	a.id = #{0}

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

@@ -989,8 +989,8 @@
  select d.name,employer_name as employerName,d.id ,data_category as dataCategory,release_date as releaseDate,demand_type as demandType,budget_cost as budgetCost 
  ,fg.name as industryCategory1,fgg.name as industryCategory2
  from demand d 
-     left join aft.field_glossory  fg  on fg.id=d.industry_category_a
-    left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
+     left join aft.industry_category  fg  on fg.id=d.industry_category_a
+    left join aft.industry_category fgg  on fgg.id=d.industry_category_b
   left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
  where audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id  and instr(dp.publish_page,#{2})>0
@@ -1024,8 +1024,8 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  fg.name as industryCategory1,fgg.name as industryCategory2,d.picture_url as pictureUrl,
  data_category as dataCategory,validity_period as validityPeriod
   from demand d 
-      left join aft.field_glossory  fg  on fg.id=d.industry_category_a
-    left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
+      left join aft.industry_category  fg  on fg.id=d.industry_category_a
+    left join aft.industry_category fgg  on fgg.id=d.industry_category_b
       left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
    where d.is_hot=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
@@ -1042,8 +1042,8 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   
    <select id="getProLearnStudyDemand" resultType="com.goafanti.demand.bo.DemandListBo">
     select d.name as name,picture_url as pictureUrl ,problem_des as problemDes,employer_name as employerName,d.id,fg.name as industryCategory1,data_category as dataCategory,fgg.name as industryCategory2 from demand d  
-    left join aft.field_glossory  fg  on fg.id=d.industry_category_a
-    left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
+    left join aft.industry_category  fg  on fg.id=d.industry_category_a
+    left join aft.industry_category fgg  on fgg.id=d.industry_category_b
            left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
  where d.demand_type=2 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
@@ -1070,8 +1070,8 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   select d.name,d.budget_cost as budgetCost,d.validity_period as validityPeriod,data_category as dataCategory,d.picture_url as pictureUrl,problem_des as problemDes,
   fg.name as industryCategory1,fgg.name as industryCategory2
    from demand d
-  left join aft.field_glossory  fg  on fg.id=d.industry_category_a
-    left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
+  left join aft.industry_category  fg  on fg.id=d.industry_category_a
+    left join aft.industry_category fgg  on fgg.id=d.industry_category_b
     where d.id=#{0} and d.data_category=#{1}
   </select>
   <select id="getBoutiqueDemandList" resultType="com.goafanti.demand.bo.DemandListBo">

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

@@ -284,8 +284,8 @@
 							<h3 th:text="${a.name}"></h3>
 							<p th:text="${a.introduction}"></p>
 							<div>
-								<div th:text="${a.fieldAS}"></div>
-								<div th:text="${a.fieldBS}"></div>
+								<div th:if="${a.fieldAS}!=null" th:text="${a.fieldAS}"></div>
+								<div th:if="${a.fieldBS}!=null" th:text="${a.fieldBS}"></div>
 							</div>
 						</div>
 					</div>
@@ -301,8 +301,8 @@
 							<h3 th:text="${d.name}">风力发电领域内高效率变化内高效率变化</h3>
 							<p th:text="${d.problemDes}">风力发电领域内高效率变化内高效率变化风力发电领域内高效率变化内高效率变化风力发电领域内高效率变化内高效率变化</p>
 							<div>
-								<div th:text="${d.industryCategory1}">环保</div>
-								<div th:text="${d.industryCategory2}">电力</div>
+								<div th:if="${d.industryCategory1}!=null" th:text="${d.industryCategory1}">环保</div>
+								<div th:if="${d.industryCategory2}!=null" th:text="${d.industryCategory2}">电力</div>
 							</div>
 						</div>
 					</div>

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

@@ -373,8 +373,8 @@
 						<div class="imgRight">
 							<h5 th:text="${plsdemand.employerName}"></h5>
 							<p th:text="${plsdemand.problemDes}"></p>
-							<span th:text="${plsdemand.industryCategory1}"></span>
-							 <span  th:text="${plsdemand.industryCategory2}"></span>
+							<span th:if="${plsdemand.industryCategory1}!=null" th:text="${plsdemand.industryCategory1}"></span>
+							 <span th:if="${plsdemand.industryCategory2}!=null" th:text="${plsdemand.industryCategory2}"></span>
 						</div>
 						</a>
 					</li>