Bladeren bron

后台问题修改

liliang4869 7 jaren geleden
bovenliggende
commit
00e2f418ef

+ 1 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -408,7 +408,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 //			a.setReleaseDate(now.getTime());
 //		}
 		achievementDemandMapper.deleteByAchievementId(a.getId());
-		achievementKeywordMapper.batchDeleteByAchievementId(a.getId());
+//		achievementKeywordMapper.batchDeleteByAchievementId(a.getId());
 		achievementPublishMapper.deleteByAchievementId(a.getId());
 		int i=0;
 		i=achievementMapper.updateByPrimaryKeySelective(a);

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

@@ -351,7 +351,7 @@ public class WebpageController extends BaseController {
 	public ModelAndView demandList(HttpServletRequest request, ModelAndView modelview) {
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelview.setViewName("/portal/technologyTrading/demandList");
-		List<DemandListBo> boutiques=demandService.getBoutiqueDemandList(3, url, "");
+		List<DemandListBo> boutiques=demandService.getHotDemand(3, url, "");
 		modelview.addObject("boutiques",boutiques);
 		return modelview;
 	}

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

@@ -1154,7 +1154,7 @@ and branchInfo.id = ap.publish_platform
 and instr(ap.publish_page,#{2})>0
 and is_hot=1
 and info_sources=1
-order by ct desc limit #{0}
+order by a.release_date desc limit #{0}
 </select>
 
 <select id="getPatentList" resultType="com.goafanti.portal.bo.AchievementObject">
@@ -1250,6 +1250,7 @@ where
 	a.info_sources = 1
 	and audit_status=2
 	and a.boutique = 1
+	order by a.release_date desc
 limit #{0}
 </select>
 
@@ -1316,6 +1317,7 @@ order by release_date limit #{0}
 	<if test="endDate != null">
 	   and  a.release_date <![CDATA[ =< ]]> #{endDate,jdbcType=TIMESTAMP}
 	</if>
+	order by a.release_date desc
 	<if test="page_sql!=null">
 			${page_sql}
 	</if>

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

@@ -775,6 +775,7 @@
 		<if test="identifyName != null">
 			and b.identify_name like concat('%',#{identifyName,jdbcType=VARCHAR},'%')
 		</if>
+		order by a.release_date desc
 		<if test="page_sql!=null">
 			${page_sql}
 		</if>
@@ -998,7 +999,7 @@
   </select>
   <select id="selectRecentDemand" resultType="com.goafanti.demand.bo.DemandListBo">
  select d.name,employer_name as employerName,d.id ,data_category as dataCategory,release_date as releaseDate,demand_type as demandType,budget_cost as budgetCost 
- ,fg.name as industryCategory1,fgg.name as industryCategory2
+ ,fg.name as industryCategory1,fgg.name as industryCategory2,problem_des as problemDes
  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
@@ -1014,7 +1015,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  from demand d  
    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
+ where d.demand_type=0 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}
   </select>
   

File diff suppressed because it is too large
+ 549 - 549
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml


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

@@ -284,7 +284,7 @@
 		<if test="auditStatus!=null">
 		and a.audit_status=#{auditStatus,jdbcType=INTEGER}
 		</if>	
-		order by create_time desc
+		order by release_date desc
 		<if test="page_sql != null">
 			${page_sql}
 		</if>

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

@@ -106,7 +106,7 @@
   	<if test="hot != null">
   		and hot = #{hot,jdbcType=INTEGER}
   	</if>
-  	order by create_time desc
+  	order by release_time desc
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>

+ 3 - 3
src/main/webapp/WEB-INF/views/portal/index.html

@@ -277,8 +277,8 @@
 					<a th:each="policy:${policys}" th:href="@{/portal/news/newsDetail(id=${policy.id},type=0)}">
 						<div >
 							<div class="policy_date">
-							<h4 th:text="${#dates.format(policy.createTime,'MM-dd')}"></h4>
-							<p th:text="${#dates.format(policy.createTime,'yyyy')}"></p>
+							<h4 th:text="${#dates.format(policy.releaseDate,'MM-dd')}"></h4>
+							<p th:text="${#dates.format(policy.releaseDate,'yyyy')}"></p>
 							</div>
 							<div class="policy_line"></div>
 							<div class="policy_p_cont">
@@ -351,7 +351,7 @@
 				
 					<a  th:each="e:${experts}" th:href="@{/portal/subscriberDetail(uid=${e.uid},type=0)}" >
 						<div>
-							<img th:src="${e.headPortraitUrl}==null?${portalHost+'/img/indexNew14.jpg'}:${avatarUploadHost+headPortraitUrl}" alt="" />
+							<img th:src="${e.headPortraitUrl}==null?${portalHost+'/img/indexNew14.jpg'}:${avatarUploadHost+e.headPortraitUrl}" alt="" />
 							<div class="indexExpert_basc">
 								<h3 th:text="${e.username}">张三</h3>
 								<span>/</span>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


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

@@ -192,6 +192,7 @@
             </h4>
         </div>
         <div class="practical">
+        
             <div class="practicalLeft">
                 <ul>
                     
@@ -237,7 +238,9 @@
                     </ol>
                 </div>
             </div>
-           
+           <div class="practicalRight">
+                
+            </div>
         </div>
         <div class="studyT" id="transactionTitle">
             <h4>知识产权交易政策

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

@@ -102,7 +102,7 @@
 						<p>
 						
 							<p th:text="${recentDemandList.name}"></p>
-							<p class="colorWrite" th:text="${recentDemandList.employerName}"></p>
+							<p class="colorWrite" th:text="${#strings.abbreviate(recentDemandList.problemDes,18)}"></p>
 							<p>
 							<span class="colorRed" th:case='0' th:text="企业技术需求"></span> <span
 								class="colorRed" th:case='1' th:text="技术设备需求"></span> <span

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

@@ -47,11 +47,7 @@
 						<div class="inline_span">
 							<span>有效日期:</span> <span th:text="${demand.validityPeriod}?${#dates.format(demand.validityPeriod,'YYYY-MM-DD')}:永久"></span>
 						</div>
-						<div class="loves">  
-                       		<span class="box_love"></span><span class="dem_number" th:text="${demand.countInterest}"></span><span>我感兴趣</span>
-							<input type="hidden" th:val="${demand.id}" id="demand_id">                     
-							<input type="hidden" th:isInterester="${isInterester}" id="isInterester">                     
-                    	</div>
+						
 	                    <div class="detail_btn">
 	                       <a href="javascript:;" onclick="_MEIQIA('showPanel')">我要咨询</a>
 	                        <input type="hidden" th:val="${demand.id}" id="Id_" />