liliang4869 лет назад: 7
Родитель
Сommit
4b342b1517

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

@@ -1105,7 +1105,7 @@ left join aft.industry_category fg 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
+	instr( #{1},branchInfo.domain_name )>0
 left join achievement_publish dp on
 	dp.achievement_id = d.id
 	and dp.publish_platform = branchInfo.id
@@ -1132,7 +1132,7 @@ a.data_category as dataCategory,
 	a.introduction
 from achievement a
 left join branch_information branchInfo 
-on INSTR(branchInfo.domain_name,#{1})>0
+on INSTR(#{1},branchInfo.domain_name)>0
 left join achievement_publish ap
  on ap.achievement_id=a.id
  left join aft.industry_category fg on
@@ -1167,7 +1167,7 @@ select
 	release_date as releaseDate
 from
 	achievement a
-left join branch_information bi on instr(bi.domain_name,#{1})>0
+left join branch_information bi on instr(#{1},bi.domain_name)>0
 left join achievement_publish ap on ap.achievement_id=a.id
 where audit_status=2
 and bi.id =ap.publish_platform
@@ -1191,7 +1191,7 @@ select
 	fgg.name as fieldBS
 from
 	achievement a
-left join branch_information bi on instr(bi.domain_name,#{1})>0
+left join branch_information bi on instr(#{1},bi.domain_name)>0
 left join achievement_publish ap on ap.achievement_id=a.id
 left join aft.industry_category fg on
 	fg.id = a.field_a

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

@@ -1000,7 +1000,7 @@
  from demand d 
      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 branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>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
  order by  release_date  desc limit #{0}
@@ -1010,7 +1010,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
    <select id="selectCompanyDemand" resultType="com.goafanti.demand.bo.DemandListBo">
  select d.name,picture_url as pictureUrl,d.id ,data_category as dataCategory
  from demand d  
-   left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
+   left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
  where d.data_category=1 and info_sources=1 and d.audit_status=2  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date  desc limit #{0}
@@ -1021,7 +1021,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  select name,release_date as releaseDate,d.id,problem_des as problemDes,research_type as researchType,budget_cost as fundForPersonnel,crowd_cost as fundForCrowd,demand_type as demandType,
  data_category as dataCategory,validity_period as validityPeriod
   from demand d  
-    left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
+    left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
   where d.is_urgent=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
    order by  release_date  desc limit #{0}
@@ -1035,7 +1035,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   from demand d 
       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 branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>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
     order by  release_date  desc limit #{0}
@@ -1043,7 +1043,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   
    <select id="getAreaDemand" resultType="com.goafanti.demand.bo.DemandListBo">
 select name,picture_url as pictureUrl ,problem_des as problemDes , data_category as dataCategory,d.id from demand d 
-       left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
+       left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
   where d.demand_type=4 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
   order by  release_date  desc limit #{0}
@@ -1053,14 +1053,14 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
     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.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 branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>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
  order by  release_date  desc limit #{0}
   </select>
    <select id="getFundCrowdDemand" resultType="com.goafanti.demand.bo.DemandListBo">
   select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,crowd_cost as fundForCrowd,data_category as dataCategory,research_type as researchType from demand d  
-             left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
+             left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
   where d.demand_type=3 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
   order by  release_date 
@@ -1069,7 +1069,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   
    <select id="getPersonnelDemand" resultType="com.goafanti.demand.bo.DemandListBo">
   select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,data_category as dataCategory,budget_cost as fundForPersonnel from demand d  
- left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
+ left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
   where d.demand_type=5 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
   order by  release_date  desc limit #{0}
@@ -1086,7 +1086,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   <select id="getBoutiqueDemandList" resultType="com.goafanti.demand.bo.DemandListBo">
  select d.id,d.name,picture_url as picture_url,data_category as dataCategory,problem_des as problemDes
  from demand d
- left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
+ left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
 where d.boutique=1 and  dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
 order by release_date desc limit #{0}

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

@@ -147,7 +147,12 @@
                 </h4>
         </div>
         <div class="patent">
-           <a href=""><img th:src="${portalHost+'/img/newMenu/achievement_9.jpg'}" alt=""></a> 
+          <div class="imgPatent">
+
+            </div>
+            <a th:href="@{/portal/technologyTrading/achievementList}">
+               
+            </a>
         </div>
         <div class="patentList">
             <div class="row">