Explorar el Código

成果、需求、专家显示页面更改

anderx hace 8 años
padre
commit
cdbe0c1233

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

@@ -1326,7 +1326,7 @@
   	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
   	and ap.publish_client=0
-	and ap.publish_page='W01'
+	and ap.publish_page='W02'
 	and ap.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
@@ -1368,8 +1368,13 @@
   <select id="findSearchAchievementCount" parameterType="String" resultType="java.lang.Integer">
   	select 
   		count(1)
-  	from achievement a
+  	from achievement a 
+  	right join achievement_publish ap on a.id=ap.achievement_id
+  	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
+  	and ap.publish_client=0
+	and ap.publish_page='W02'
+	and ap.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>

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

@@ -1048,11 +1048,15 @@
 	  		d.serial_number as serialNumber, d.data_category as dataCategory, d.industry_category_a as industryCategoryA,
 	  		d.industry_category_b as industryCategoryB, d.demand_type as demandType, d.budget_cost as budgetCost,
 	  		d.problem_des as problemDes, d.release_date as releaseDate, d.employer_name as employerName,d.boutique,
-	  	 u.lvl as level
+	  	 	u.lvl as level,dp.publish_page,dp.publish_platform,dp.publish_client,dp.if_top,dp.top_number,dp.show_number
   		from demand d
+  		right join demand_publish dp on d.id=dp.demand_id
   		left join user u on u.id = d.employer_id
   		where d.deleted_sign = 0 and d.status = 0
-  		<if test="keyword != null">
+  		and dp.publish_client=0
+		and dp.publish_page='W02'
+		and dp.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+		<if test="keyword != null">
   			and d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   		</if>
   		<if test="industryCategoryA != null">
@@ -1077,10 +1081,10 @@
   		and d.release_status = 1
   		and d.audit_status = 3
   		<if test="dateSort == 0">
-  			order by d.release_date asc
+  			order by dp.if_top,dp.top_number,dp.show_number,d.release_date asc
   		</if>
   		<if test="dateSort == 1">
-  			order by d.release_date desc
+  			order by dp.if_top asc,dp.top_number asc,dp.show_number asc,d.release_date desc
   		</if>
   	<if test="page_sql!=null">
 		${page_sql}
@@ -1091,7 +1095,12 @@
   	select 
   		count(1)
   	from demand d
-  	where d.deleted_sign = 0 and d.status = 0
+  		right join demand_publish dp on d.id=dp.demand_id
+  		left join user u on u.id = d.employer_id
+  		where d.deleted_sign = 0 and d.status = 0
+  		and dp.publish_client=0
+		and dp.publish_page='W02'
+		and dp.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
   	<if test="keyword != null">
   			and d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   		</if>

+ 7 - 3
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -914,15 +914,20 @@
 			uc.engaged_field as engagedField,
 			uc.work_unit as workUnit,
 			ui.professional_title as position,
-			ui.international
+			ui.international,
+			ep.publish_page,ep.publish_platform,ep.publish_client,ep.if_top,ep.top_number,ep.show_number
 		FROM
 			<![CDATA[ user ]]> u
+		right join expert_publish ep on u.id=ep.expert_id
 		LEFT JOIN user_identity ui ON ui.uid = u.id
 		LEFT JOIN user_career uc ON uc.uid = u.id
 		<!-- LEFT JOIN user_info info ON info.uid = u.id -->
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
 			u.type = 0 and ui.expert = 1
+			and ep.publish_client=0
+		and ep.publish_page='W02'
+		and ep.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
 		<if test="null != level and level==1 ">
 			AND u.lvl <![CDATA[ >= ]]> 1 
 		</if>
@@ -947,8 +952,7 @@
 		<if test="name != null">
 			AND ui.username like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')
 		</if>
-	ORDER BY 
-		u.number
+	order by ep.if_top,ep.top_number,ep.show_number,u.number asc
 	<if test="page_sql!=null">
 		${page_sql}
 	</if>