Bläddra i källkod

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

anderx 7 år sedan
förälder
incheckning
58b46d6d24

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

@@ -33,5 +33,11 @@ public interface JtBusinessService {
 	Pagination<MyCollection> myCollectionProject(Integer pageNo, Integer pageSize);
 	List<makeMoneyCategoryListBo> makeMoneyCategoryList();
 	Pagination<MyCollection> recommendedApplication( Integer type,Integer pageNo, Integer pageSize);
+	/**
+	 * 获得某模块的所有业务数据
+	 * @param module
+	 * @return
+	 */
+	List<JtBusinessCategory> getCategoryByModule(Integer module);
 	
 }

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

@@ -427,6 +427,11 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 		if (null!=type)params.put("type", type); 
 		return (Pagination<MyCollection>) findPage("recommendedApplicationList", "recommendedApplicationCount", params, pageNo, pageSize);
 	}
+
+	@Override
+	public List<JtBusinessCategory> getCategoryByModule(Integer module) {
+		return jtBusinessCategoryMapper.getCategoryByModule(module);
+	}
 	
 	
 	

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 69 - 11
src/main/java/com/goafanti/common/controller/WebpageController.java


+ 2 - 0
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -95,4 +95,6 @@ public interface JtBusinessCategoryMapper {
     
     Integer updateNumberPrefix(JtBusinessCategory jtBusinessCategory);
     
+    List<JtBusinessCategory> getCategoryByModule(Integer module);
+    
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -512,4 +512,10 @@ and layer=#{0}
 		module = #{module,jdbcType=INTEGER}
 		where `number` like #{number, jdbcType=VARCHAR}
     </update>
+    
+    <!-- 获得所有指定模块的业务 -->
+    <select id="getCategoryByModule" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select id, name, summary, number, create_time, super_id, img_url, layer, sort, module
+    from jt_business_category where module = #{module,jdbcType=INTEGER} order by layer,sort
+    </select>
 </mapper>

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

@@ -83,23 +83,23 @@
 						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">
 					</span>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceHigh}">高企服务</a>
-						<a th:href="@{/portal/service/serviceIndex#serviceProject}">科技项目</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceHigh}">高新技术企业服务</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceProperty}">知识产权</a>
-						<a th:href="@{/portal/service/serviceIndex#serviceCustomer}">合作客户</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceAuthentication}">企业资质认定</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceAuthentication}">企业认证</a>
-						<a th:href="@{/portal/service/serviceIndex#serviceAbility}">服务能力</a>
+						<!-- <a th:href="@{/portal/service/serviceIndex#serviceProperty}">知识产权</a> -->
+						<a th:href="@{/portal/service/serviceIndex#serviceProject}">科技项目</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceCustomer}">合作客户</a>
 					</p>
 					<p>
 						<a th:href="@{/portal/service/serviceIndex#serviceAdministration}">管理体系</a>
-						<a th:href="@{/portal/service/serviceIndex#serviceProcess}">服务流程</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceAbility}">服务能力</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceBrand}">品牌通</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceProcess}">服务流程</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceBrand}">品牌通   </a>
 					</p>
 				</li>
 				<li>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html