Explorar el Código

技淘BUG修复

anderx hace 7 años
padre
commit
64fc477cea

+ 3 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -903,8 +903,10 @@ public class WebpageController extends BaseController {
 		
 		//知产百科
 		List<News> news=(List<News>) newsService.listNews(98, null, null, null, null, null, null, 1, 4, 2+"", null, "web_tech_service_index").getList();
+		for (News n : news) {
+			n.setTitleImg(n.getTitleImg().substring(0, n.getTitleImg().indexOf(",")));
+		}
 		modelAndView.addObject("jtNews",news);
-		
 		return modelAndView;
 	}
 

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

@@ -1151,7 +1151,6 @@ and branchInfo.id = ap.publish_platform
 and instr(ap.publish_page,#{2})>0
 and is_hot=1
 and info_sources=1
-order by a.release_date desc limit #{0}
 </select>
 
 <select id="getPatentList" resultType="com.goafanti.portal.bo.AchievementObject">

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

@@ -418,7 +418,7 @@
       <if test="budgetCost != null" >
         budget_cost = #{budgetCost,jdbcType=DECIMAL},
       </if>
-      <if test="budgetCost ==0'" >
+      <if test="budgetCost == 0" >
         budget_cost = null,
       </if>
       <if test="validityPeriod != null" >

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

@@ -40,8 +40,8 @@
 							<img th:src= "${avatarUploadHost+achievementdetail.firstPicture}"alt=""  />
 						</div>
 						     <div class="collection">
-             <p><span th:class="${interested}==null?'heart':'heart active'"></span><span>收藏</span></p>
-        </div>
+             <p><span th:class="${isInterested}==null?'heart':'heart active'"></span><span>收藏</span></p>
+        </div>					
 					</div>
 					<div class="basic">
 						<div class="inline_span">

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

@@ -158,7 +158,7 @@
 								 <p class="problemDes" th:text="${u2.problemDes}"></p>	
 								 <span class="colorTime" th:if="${u2.validityPeriod}==null" th:text="无期限"></span>
 								 <span class="colorTime" th:if="${u2.validityPeriod}!=null" th:text="${#dates.format(u2.validityPeriod,'yyyy-MM-dd')+'到期'}"></span>
-								 <span class="colorOrange" th:if="${u2.demandType}==5" th:text="${u2.fundForPersonnel}==null?'人才:¥0元/月':${'人才:¥'+u2.fundForPersonnel+'元/月'}"></span>
+								 <span class="colorOrange" th:if="${u2.demandType}==5" th:text="${u2.fundForPersonnel}==null?'人才:面议':${'人才:¥'+u2.fundForPersonnel+'万'}"></span>
 								 <span class="colorOrange" th:if="${u2.demandType}==3" th:text="${u2.fundForCrowd}==null?'期望资金:面议':${'期望资金:¥'+u2.fundForCrowd}+'万'"></span>
 							</p>
 						</div>