Antiloveg 8 years ago
parent
commit
264a4ecc4b

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

@@ -210,7 +210,7 @@
 	  	 and l.lecture_time <![CDATA[ >= ]]> #{startL,jdbcType=TIMESTAMP}
 	  	</if>
 	  	<if test="endL != null">
-	  	 and l.lecture_time <![CDATA[ < ]]> #{endL,jdbcType=TIMESTAMP}
+	  	 and l.lecture_time <![CDATA[ <= ]]> #{endL,jdbcType=TIMESTAMP}
 	  	</if>
 	  	order by l.lecture_time desc
 	  	<if test="page_sql!=null">
@@ -238,7 +238,7 @@
 	  	 and l.lecture_time <![CDATA[ >= ]]> #{startL,jdbcType=TIMESTAMP}
 	  	</if>
 	  	<if test="endL != null">
-	  	 and l.lecture_time <![CDATA[ < ]]> #{endL,jdbcType=TIMESTAMP}
+	  	 and l.lecture_time <![CDATA[ <= ]]> #{endL,jdbcType=TIMESTAMP}
 	  	</if>
   </select>
   

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

@@ -875,7 +875,7 @@
   	left join user_career uc on uc.uid = u.id
   	left join achievement_demand_count adc on adc.uid = u.id
   	where 
-  		ui.celebrity = 1 or ui.expert = 1
+  		(ui.celebrity = 1 or ui.expert = 1)
   	<if test="number != null">
   		and u.number = #{number,jdbcType=INTEGER}
   	</if>
@@ -905,7 +905,7 @@
   	left join user_identity ui on ui.uid = u.id
   	left join user_career uc on uc.uid = u.id
   	where 
-  		ui.celebrity = 1 or ui.expert = 1
+  		(ui.celebrity = 1 or ui.expert = 1)
   	<if test="number != null">
   		and u.number = #{number,jdbcType=INTEGER}
   	</if>

+ 1 - 1
src/main/java/com/goafanti/lecture/service/impl/LectureServiceImpl.java

@@ -83,7 +83,7 @@ public class LectureServiceImpl extends BaseMybatisDao<LectureMapper> implements
 			params.put("startL", StringUtils.isBlank(startLectureTime) ? null
 					: DateUtils.parseDate(startLectureTime, AFTConstants.YYYYMMDDHHMMSS));
 			params.put("endL", StringUtils.isBlank(endLectureTime) ? null
-					: DateUtils.addDays(DateUtils.parseDate(endLectureTime, AFTConstants.YYYYMMDDHHMMSS), 1));
+					: DateUtils.parseDate(endLectureTime, AFTConstants.YYYYMMDDHHMMSS));
 		} catch (ParseException e) {
 		}
 

+ 1 - 1
src/main/java/com/goafanti/portal/controller/PortalBigShotController.java

@@ -27,7 +27,7 @@ public class PortalBigShotController {
 	private LectureService		lectureService;
 
 	/**
-	 * 科技明星展示
+	 * 
 	 */
 	// @RequestMapping(value = "/portal/scienceTechnology/bigShot", method =
 	// RequestMethod.GET)

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

@@ -56,15 +56,15 @@
 		</div>
 		<div class="star_list">
 			<ul>
-				<li>
+				<li th:each="star,iterStart:${starList}">
 					<div class="star_content_img">
 						<img th:src="${portalHost + '/img/star_img_1.png'}">
 						<a href="#">报名中</a>
 					</div>
 					<div class="star_content_info">
-						<h4>陈政清</h4>
-						<h5>湖南大学 土木工程学院</h5>
-						<h5>“985”工程首席科学家</h5>
+						<h4 th:text="${star.username}">陈政清</h4>
+						<h5 th:text="${star.workUnit}">湖南大学 土木工程学院</h5>
+						<h5 th:text="${star.professionalTitle}">“985”工程首席科学家</h5>
 						<p class="mt20"><label>技术:</label> <span class="red">4</span>项</p>
 						<p><label>粉丝:</label> <span class="red">456</span>人</p>
 					</div>