Quellcode durchsuchen

资金用途处修改

liliang4869 vor 7 Jahren
Ursprung
Commit
b78c4e9386

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

@@ -2159,7 +2159,7 @@ select
  where d.demand_type=2  order by  release_date  desc
   </select>
    <select id="getFundCrowdDemand" resultType="com.goafanti.demand.bo.DemandListBo">
-  select name,picture_url as pictureUrl ,problem_des as problemDes ,id,crowd_cost as fundForCrowd from demand d  where d.demand_type=3  order by  release_date  desc
+  select name,picture_url as pictureUrl ,problem_des as problemDes ,id,crowd_cost as fundForCrowd,research_type as researchType from demand d  where d.demand_type=3  order by  release_date  desc
   </select>
   
    <select id="getPersonnelDemand" resultType="com.goafanti.demand.bo.DemandListBo">

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

@@ -239,7 +239,7 @@
 							<div>
 								 <span class="problemDes" th:text="${u2.problemDes}"></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?'人才:¥0元/月':${'人才:¥'+u2.fundForPersonnel+'元/月'}"></span>
 								 <span class="colorOrange" th:if="${u2.demandType}==3" th:text="${'期望资金:¥'+u2.fundForCrowd}+'万'"></span>
 							</div>
 						</div>
@@ -258,8 +258,9 @@
 										class="talents" th:case='4' th:text="地区产业需求"></span> <span
 										class="talents" th:case='5' th:text="技术人才需求"></span>
 									<span th:text="${u3.name}"></span>	
-									<span class="colorOrange" th:if="${u3.demandType}==3" th:text="${u3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
-									<span class="colorOrange" th:if="${u3.demandType}==5" th:text="${u3.fundForPersonnel}==null?'¥0.00元/月':${'¥'+u3.fundForPersonnel+'元/月'}"></span>
+										<span class="colorOrange" th:if="${u3.demandType}==3 and ${u3.researchType}==null">用途:未知</span>
+									<span class="colorOrange" th:if="${u3.demandType}==3 and ${u3.researchType}!=null" th:text="${u3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
+									<span class="colorOrange" th:if="${u3.demandType}==5" th:text="${u3.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+u3.fundForPersonnel+'元/月'}"></span>
 									<span class="colorOrange" th:if="${u3.demandType}==3" th:text="${'期望资金:¥'+u3.fundForCrowd+'万'}"></span>
 
 								</div>
@@ -312,7 +313,7 @@
 							<div>
 							
 								 <span class="problemDes" th:text="${h2.problemDes}"></span>	
-								 <span class="colorOrange" th:if="${h2.demandType}==5" th:text="${h2.fundForPersonnel}==null?'¥0.00元/月':${'¥'+h2.fundForPersonnel}+'元/月'"></span>
+								 <span class="colorOrange" th:if="${h2.demandType}==5" th:text="${h2.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+h2.fundForPersonnel}+'元/月'"></span>
 								 <span class="colorOrange" th:if="${h2.demandType}==3" th:text="${'期望资金:¥'+h2.fundForCrowd}+'万'"></span>
 						
 								<span class="colorTime">	<img th:src="${portalHost+'/img/newMenu/demand-5.jpg'}" alt=""></span>
@@ -335,9 +336,9 @@
 									  <span class="talents" th:case='4' th:text="地区产业需求"></span>
 									   <span class="talents" th:case='5' th:text="技术人才需求"></span>
 									<span th:text="${h3.name}"></span>	
-							
-									<span class="colorOrange" th:if="${h3.demandType}==3" th:text="${h3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
-											<span class="colorOrange" th:if="${h3.demandType}==5" th:text="${h3.fundForPersonnel}==null?'¥0.00元/月':${'¥'+h3.fundForPersonnel+'元/月'}"></span>
+							<span class="colorOrange" th:if="${h3.researchType}==null and ${h3.demand}==3">用途:未知</span>
+									<span class="colorOrange" th:if="${h3.demandType}==3 and ${h3.researchType}!=null" th:text="${h3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
+											<span class="colorOrange" th:if="${h3.demandType}==5" th:text="${h3.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+h3.fundForPersonnel+'元/月'}"></span>
 									<span class="colorOrange" th:if="${h3.demandType}==3" th:text="${'期望资金:¥'+h3.fundForCrowd+'万'}"></span>
 								</div>
 							</p>
@@ -458,7 +459,8 @@
 								</div>
 								<div class="float-right">
 									<p>资金用途</p>
-									<p th:text="${fundDemand.researchType}==0?'研发':'扩大再生产'"></p>
+									<p th:if="${fundDemand.researchType}==null">未知用途</p>
+									<p th:if="${fundDemand.researchType}!=null" th:text="${fundDemand.researchType}==0?'研发':'扩大再生产'"></p>
 								</div>
 							</div>
 							<a href="#">立即查看</a>