Преглед на файлове

Merge branch 'test' of
ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

Conflicts:
src/main/resources/props/config_local.properties

anderx преди 7 години
родител
ревизия
0f868c29c0

+ 17 - 0
src/main/java/com/goafanti/business/service/JtBusinessService.java

@@ -40,4 +40,21 @@ public interface JtBusinessService {
 	 */
 	 */
 	List<JtBusinessCategory> getCategoryByModule(Integer module);
 	List<JtBusinessCategory> getCategoryByModule(Integer module);
 	
 	
+	/**
+	 * 查看模块项目
+	 * @param module
+	 * @param isHost
+	 * @param size
+	 * @return
+	 */
+	List<JtBusinessProject> getKJListByIds(Integer module, Integer isHost, Integer size);
+	/**
+	 * 根据名字查看二级分类
+	 * @param name
+	 * @param isHost
+	 * @param size
+	 * @return
+	 */
+	List<JtBusinessProject> getModuleByName(String  name, Integer isHost, Integer size);
+	
 }
 }

+ 12 - 0
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -438,6 +438,18 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 	public List<JtBusinessCategory> getCategoryByModule(Integer module) {
 	public List<JtBusinessCategory> getCategoryByModule(Integer module) {
 		return jtBusinessCategoryMapper.getCategoryByModule(module);
 		return jtBusinessCategoryMapper.getCategoryByModule(module);
 	}
 	}
+
+	@Override
+	public List<JtBusinessProject> getKJListByIds(Integer module,
+			Integer isHost, Integer size) {
+		return jtBusinessProjectMapper.getKJListByIds( module,  isHost,  size);
+	}
+
+	@Override
+	public List<JtBusinessProject> getModuleByName(String name, Integer isHost,
+			Integer size) {
+		return jtBusinessProjectMapper.getModuleByName(name, isHost, size);
+	}
 	
 	
 	
 	
 	
 	

Файловите разлики са ограничени, защото са твърде много
+ 68 - 76
src/main/java/com/goafanti/common/controller/WebpageController.java


+ 2 - 1
src/main/java/com/goafanti/common/dao/JtBusinessProjectMapper.java

@@ -84,7 +84,8 @@ public interface JtBusinessProjectMapper {
   
   
 	JtBusinessProjectResult selectByPrimaryKeyWithModule(@Param("id")String id,@Param("uid")String uid);
 	JtBusinessProjectResult selectByPrimaryKeyWithModule(@Param("id")String id,@Param("uid")String uid);
   
   
-
+	List<JtBusinessProject> getKJListByIds(@Param("module")Integer module, @Param("isHot")Integer isHost, @Param("size")Integer size);
+	List<JtBusinessProject> getModuleByName(@Param("name")String name, @Param("isHot")Integer isHost, @Param("size")Integer size);
      
      
   
   
 }
 }

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

@@ -576,7 +576,7 @@
     from jt_business_project jtbp left join `user` u on jtbp.owner_id=u.id
     from jt_business_project jtbp left join `user` u on jtbp.owner_id=u.id
     left join jt_business_category jtbc on jtbc.id =  jtbp.category_id
     left join jt_business_category jtbc on jtbc.id =  jtbp.category_id
     left join (select project_id,count(*) as count from project_interest group by project_id) p on jtbp.id=p.project_id
     left join (select project_id,count(*) as count from project_interest group by project_id) p on jtbp.id=p.project_id
-    left join (select project_id from project_interest where uid= #{uid,jdbcType=VARCHAR} ) x on jtbp.id=x.project_id
+    left join (select project_id from project_interest <if test="uid != null"> where uid= #{uid,jdbcType=VARCHAR} </if>) x on jtbp.id=x.project_id
     where jtbp.id = #{id,jdbcType=VARCHAR}
     where jtbp.id = #{id,jdbcType=VARCHAR}
   </select>
   </select>
   
   
@@ -839,4 +839,39 @@
   	and b.module = 5 
   	and b.module = 5 
   	</if>
   	</if>
   </select>
   </select>
+  
+  <!-- 查看科技服务项目   -->
+  <select id="getKJListByIds" resultType="com.goafanti.common.model.JtBusinessProject">
+    select 
+	    p.id,
+	  	p.name,
+	  	p.introduce,
+	  	p.min_img_url as minImgUrl
+  	from jt_business_project p
+    left join jt_business_category c on p.category_id = c.id
+    where c.module = #{module} 
+    and p.audit_status = 2 
+    <if test="isHot">
+    and is_hot = #{isHot}
+    </if>
+    order by release_date desc
+	  	limit #{size}
+	  </select>
+	   
+	 <!-- 根据二级分类名称查 -->
+	 <select id="getModuleByName" resultType="com.goafanti.common.model.JtBusinessProject">
+	 select  b.id,
+	  	b.name,
+	  	b.introduce,
+	  	b.min_img_url as minImgUrl
+	from (select x.id from jt_business_category x inner join jt_business_category y on x.super_id = y.id where y.name=#{name})a 
+	left join jt_business_project b on a.id = b.category_id
+	where  
+	b.audit_status = 2 
+	<if test="isHot">
+    and is_hot = #{isHot}
+    </if>
+	order by b.release_date desc 
+	limit #{size}
+	 </select>
 </mapper>
 </mapper>

+ 2 - 0
src/main/resources/props/config_local.properties

@@ -55,12 +55,14 @@ app.name=AFT
 app.mobile.website=http://m.kedexinxi.com
 app.mobile.website=http://m.kedexinxi.com
 template.cacheable=false
 template.cacheable=false
 
 
+
 static.host=//sclient.jishutao.com/client/1.0.0
 static.host=//sclient.jishutao.com/client/1.0.0
 #static.host=//sclient.jishutao.com:8088/client/1.0.0
 #static.host=//sclient.jishutao.com:8088/client/1.0.0
 #static.host=//sclient.jishutao.com:80/client/1.0.0
 #static.host=//sclient.jishutao.com:80/client/1.0.0
 portal.host=//sportal.jishutao.com/portal/1.0.0
 portal.host=//sportal.jishutao.com/portal/1.0.0
 #portal.host=//sportal.jishutao.com:8088/portal/1.0.0
 #portal.host=//sportal.jishutao.com:8088/portal/1.0.0
 #portal.host=//sportal.jishutao.com:80/portal/1.0.0
 #portal.host=//sportal.jishutao.com:80/portal/1.0.0
+
 avatar.host=//sclient.jishutao.com
 avatar.host=//sclient.jishutao.com
 avatar.upload.host=//sclient.jishutao.com/upload
 avatar.upload.host=//sclient.jishutao.com/upload
 
 

+ 6 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -212,6 +212,12 @@
 	                        </ol>
 	                        </ol>
                         </div>
                         </div>
                     </li>                           
                     </li>                           
+                    <!-- <li th:class="${subM}=='safeguarding'?active:''" >
+                    <div>
+                        <a th:href="@{/portal/service/safeguarding}">知识产权维权</a>
+ 
+                       </div>
+                    </li> -->
  <!--                    <li th:class="${subM}=='protect'?active:''" >
  <!--                    <li th:class="${subM}=='protect'?active:''" >
                     <div>
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">知识产权维权</a>
                         <a th:href="@{/portal/service/serviceIndex}">知识产权维权</a>

Файловите разлики са ограничени, защото са твърде много
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html