Kaynağa Gözat

产权申请\赚钱首页

limin 7 yıl önce
ebeveyn
işleme
bce406ef1a

+ 3 - 0
src/main/java/com/goafanti/business/controller/AdminJtBusinessController.java

@@ -104,6 +104,9 @@ public class AdminJtBusinessController extends CertifyApiController{
 		if(jtBusinessCategory.getName() == null) {
 			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "名称不可为空", "名称"));
 			return ;
+		}else if(jtBusinessCategory.getName().length()>16){
+			result.getError().add(buildError("品类名称长度不能超过16位", "品类名称长度不能超过16位"));
+			return ;
 		}
 		if(jtBusinessCategory.getLayer() == null) {
 			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "层级不可为空", "层级"));

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

@@ -226,6 +226,8 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 		category.setImgUrl(jtBusinessCategory.getImgUrl());
 		category.setName(jtBusinessCategory.getName());
 		category.setSummary(jtBusinessCategory.getSummary());
+		category.setPcIndex(jtBusinessCategory.getPcIndex());
+		category.setAppIndex(jtBusinessCategory.getAppIndex());
 		jtBusinessCategoryMapper.updateByPrimaryKeySelective(category);
 		//是否修改了模块类别
 		boolean moduleChange = null != jtBusinessCategory.getModule() ? !jtBusinessCategory.getModule().equals(jtBusinessCategory.getNextModule()) : false;

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

@@ -27,6 +27,7 @@ import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.JtBusinessCategoryMapper;
 import com.goafanti.common.dao.ProjectInterestMapper;
 import com.goafanti.common.enums.ConsultantType;
 import com.goafanti.common.model.AchievementInterest;
@@ -93,7 +94,10 @@ public class WebpageController extends BaseController {
 	private DemandInterestService demandInterestService;
 
 	@Resource
-	private ProjectInterestMapper projectInterestMapper;
+	private ProjectInterestMapper projectInterestMapper;
+	
+	@Resource
+	private JtBusinessCategoryMapper jtBusinessCategoryMapper; 
 
 	@RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
@@ -384,42 +388,57 @@ public class WebpageController extends BaseController {
 		}
 		*/
 		/*************以下是重新查询的数据********************************/
+		JtBusinessCategory category = new JtBusinessCategory();
+		category.setPcIndex(1);
+		category.setLayer(6);
+		category.setName("高新技术企业服务");
 		//高企服务
 		JtBusinessCategory gaoqi = jtBusinessService.getBusinessCategoryByLayerAndName(1, "高新技术企业服务");
 		if (gaoqi != null) {
-			List<JtBusinessProject> gaoqiList = jtBusinessService.getKJListByIds(2,null,6);
-			/*List<JtBusinessProject> gaoqiList = jtBusinessService.getBusinessProjectByCategoryId(gaoqi2.getId(), 6, null);*/
-			for (JtBusinessProject project : gaoqiList) {
-				if (project.getMinImgUrl() != null && project.getMinImgUrl().length() <= 0)
-					project.setMinImgUrl(null);
-				//去除数据中的标签
-				if(StringUtils.isNotBlank(project.getIntroduce())){
-					project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", "")); 
-				}
-			}
-			
+			List<JtBusinessCategory> gaoqiList = jtBusinessCategoryMapper.getCategoryByName(category);
 			modelview.addObject("gaoqiList", gaoqiList);
 			modelview.addObject("gqc1", gaoqi);
 		}
 		//企业资质认证
 		JtBusinessCategory qiyerenzheng = jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业资质认定");
+		category.setLayer(3);
+		category.setName("企业资质认定");
 		if (qiyerenzheng != null) {
-			List<JtBusinessProject> qyrzCategories = jtBusinessService.getModuleByName("企业资质认定", null, 12);
+			//List<JtBusinessProject> qyrzCategories = jtBusinessService.getModuleByName("企业资质认定", null, 12);
+			List<JtBusinessCategory> qyrzCategories = jtBusinessCategoryMapper.getCategoryByName(category);
 			modelview.addObject("qyrzCategories", qyrzCategories);
 			modelview.addObject("qyrzc1", qiyerenzheng);
 		}
 		//管理体系认证
 		JtBusinessCategory manageSys2 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "管理体系认证");
+		category.setLayer(14);
+		category.setName("管理体系认证");
 		if (manageSys2 != null) {
-			List<JtBusinessProject> qyrzCategories = jtBusinessService.getModuleByName("管理体系认证", null, 18);
+			List<JtBusinessCategory> qyrzCategories = jtBusinessCategoryMapper.getCategoryByName(category);
+			//List<JtBusinessProject> qyrzCategories = jtBusinessService.getModuleByName("管理体系认证", null, 18);
 			modelview.addObject("manageSystemList", qyrzCategories);
 			modelview.addObject("managerSysc1", manageSys2);
 		}
 		
+		//军工认证
+		JtBusinessCategory jungong1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "军工认证");
+		category.setLayer(3);
+		category.setName("军工认证");
+		if (manageSys2 != null) {
+			List<JtBusinessCategory> jungongList = jtBusinessCategoryMapper.getCategoryByName(category);
+			modelview.addObject("jungongList", jungongList);
+			modelview.addObject("jungong1", jungong1);
+		}
+		
+		
 		//科技项目
 		//获得所有模块为5的科技项目id
 		JtBusinessCategory scienceProject1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
-		List<JtBusinessProject> manageSysPro = jtBusinessService.getKJListByIds(5,1,12);
+		category.setLayer(2);//第3级分类
+		category.setModule(5);
+		category.setPcIndex(1);//pc首页显示
+		category.setSort(12);//个数
+		List<JtBusinessCategory> manageSysPro = jtBusinessCategoryMapper.getCategoryByModel(category);
 		modelview.addObject("scienceProjectList", manageSysPro);
 		modelview.addObject("spc1", scienceProject1);
 		
@@ -1025,7 +1044,7 @@ public class WebpageController extends BaseController {
 		modelAndView.addObject("recent", recents);
 
 		// 专利服务-商标服务-版权服务
-		for (JtBusinessCategoryBo c : categoryBos) {
+		/*for (JtBusinessCategoryBo c : categoryBos) {
 			if ("专利服务".equals(c.getTopLevel())) {
 				List<JtBusinessProjectResult> res = (List<JtBusinessProjectResult>) jtBusinessService
 						.getProjects(null,c.getTopLevelId(), null, null, 3, 1, 1, 2, 1, null, 0, 0, null).getList();
@@ -1043,8 +1062,36 @@ public class WebpageController extends BaseController {
 				modelAndView.addObject("copyrightTopId", c.getTopLevelId());
 			}
 
-		}
-
+		}*/
+		/*******************************************修改首页专利商标版权************************************************/
+		JtBusinessCategory category = new JtBusinessCategory();
+		category.setPcIndex(1);
+		category.setLayer(3);
+		category.setName("专利服务");
+		//专利 3
+		List<JtBusinessCategory> zl = jtBusinessCategoryMapper.getCategoryByName(category);
+		if(null != zl && zl.size() > 0){
+			modelAndView.addObject("patentService", zl);
+			modelAndView.addObject("patentTopId", zl.get(0).getSuperId());
+		}
+		//商标4
+		category.setLayer(4);
+		category.setName("商标服务");
+		List<JtBusinessCategory> sb = jtBusinessCategoryMapper.getCategoryByName(category);
+		if(null != sb && sb.size() > 0){
+			modelAndView.addObject("branchService", sb);
+			modelAndView.addObject("branchTopId", sb.get(0).getSuperId());
+		}
+		//版权3
+		category.setLayer(3);
+		category.setName("版权服务");
+		List<JtBusinessCategory> bq = jtBusinessCategoryMapper.getCategoryByName(category);
+		if(null != bq && bq.size() > 0){
+			modelAndView.addObject("copyrightService", bq);
+			modelAndView.addObject("copyrightTopId", bq.get(0).getSuperId());
+		}
+		/*********************************结束**************************************/
+		
 		// 知产百科
 		List<News> news = (List<News>) newsService
 				.listNews(98, null, null, null, null, null, null, 1, 4, 2 + "", null, "web_tech_service_index")

+ 7 - 4
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -1,13 +1,13 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.business.bo.JtBusinessCategoryBo;
 import com.goafanti.business.bo.JtBusinessCategoryTree;
 import com.goafanti.common.model.JtBusinessCategory;
 import com.goafanti.common.model.JtBusinessCategoryExample;
-import com.goafanti.common.model.JtBusinessProject;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
 public interface JtBusinessCategoryMapper {
     /**
@@ -98,5 +98,8 @@ public interface JtBusinessCategoryMapper {
     List<JtBusinessCategory> getCategoryByModule(Integer module);
 
 	JtBusinessCategory selectFirstLevel(String id, Integer module, Integer layer,@Param("type")Integer type);
+	
+	List<JtBusinessCategory> getCategoryByName(JtBusinessCategory category);
+	List<JtBusinessCategory> getCategoryByModel(JtBusinessCategory category);
     
 }

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

@@ -17,6 +17,8 @@
     <result column="layer" jdbcType="INTEGER" property="layer" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="module" jdbcType="INTEGER" property="module" />
+    <result column="pc_index" jdbcType="INTEGER" property="pcIndex" />
+    <result column="app_index" jdbcType="INTEGER" property="appIndex" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -92,7 +94,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
-    id, name, summary, number, create_time, super_id, img_url, layer, sort, module
+    id, name, summary, number, create_time, super_id, img_url, layer, sort, module, pc_index, app_index
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultMap="BaseResultMap">
     <!--
@@ -153,11 +155,11 @@
     insert into jt_business_category (id, name, summary, 
       number, create_time, super_id, 
       img_url, layer, sort, 
-      module)
+      module, pc_index, app_index)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{summary,jdbcType=VARCHAR}, 
       #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{superId,jdbcType=VARCHAR}, 
       #{imgUrl,jdbcType=VARCHAR}, #{layer,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
-      #{module,jdbcType=INTEGER})
+      #{module,jdbcType=INTEGER}, #{pcIndex,jdbcType=INTEGER}, #{appIndex,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.JtBusinessCategory">
     <!--
@@ -197,6 +199,12 @@
       <if test="module != null">
         module,
       </if>
+      <if test="pcIndex != null">
+        pc_index,
+      </if>
+      <if test="appIndex != null">
+        app_index,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -229,6 +237,12 @@
       <if test="module != null">
         #{module,jdbcType=INTEGER},
       </if>
+      <if test="pcIndex != null">
+        #{pcIndex,jdbcType=INTEGER},
+      </if>
+      <if test="appIndex != null">
+        #{appIndex,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultType="java.lang.Long">
@@ -280,6 +294,12 @@
       <if test="record.module != null">
         module = #{record.module,jdbcType=INTEGER},
       </if>
+      <if test="record.pcIndex != null">
+        pc_index = #{record.pcIndex,jdbcType=INTEGER},
+      </if>
+      <if test="record.appIndex != null">
+        app_index = #{record.appIndex,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -301,7 +321,9 @@
       img_url = #{record.imgUrl,jdbcType=VARCHAR},
       layer = #{record.layer,jdbcType=INTEGER},
       sort = #{record.sort,jdbcType=INTEGER},
-      module = #{record.module,jdbcType=INTEGER}
+      module = #{record.module,jdbcType=INTEGER},
+      pc_index = #{record.pcIndex,jdbcType=INTEGER},
+      app_index = #{record.appIndex,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -341,6 +363,12 @@
       <if test="module != null">
         module = #{module,jdbcType=INTEGER},
       </if>
+      <if test="pcIndex != null">
+        pc_index = #{pcIndex,jdbcType=INTEGER},
+      </if>
+      <if test="appIndex != null">
+        app_index = #{appIndex,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -359,7 +387,9 @@
       img_url = #{imgUrl,jdbcType=VARCHAR},
       layer = #{layer,jdbcType=INTEGER},
       sort = #{sort,jdbcType=INTEGER},
-      module = #{module,jdbcType=INTEGER}
+      module = #{module,jdbcType=INTEGER},
+      pc_index = #{pcIndex,jdbcType=INTEGER},
+      app_index = #{appIndex,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -454,7 +484,7 @@ and layer=#{0}
   </update>
   
     <select id="getCategoryListByCondition" resultType="com.goafanti.common.model.JtBusinessCategoryResult">
-   select bc1.id,bc1.sort,bc1.number,bc1.name,bc1.super_id as superId,bc1.layer,bc2.name as superName,bc1.module as module
+   select bc1.id,bc1.sort,bc1.number,bc1.name,bc1.super_id as superId,bc1.layer,bc2.name as superName,bc1.module as module, bc1.app_index, bc1.pc_index
     from jt_business_category bc1
     left join jt_business_category bc2 on bc2.id=bc1.super_id
     where 
@@ -534,4 +564,47 @@ and layer=#{0}
 	limit 1
   </select>
   
+  <!-- 根据名称获得自己的子分类 -->
+  <select id="getCategoryByName" parameterType="com.goafanti.common.model.JtBusinessCategory" resultMap="BaseResultMap">
+   select 
+    c2.id, c2.name, c2.summary, c2.number, c2.create_time, c2.super_id, 
+    c2.img_url, c2.layer, c2.sort, c2.module 
+    from jt_business_category c1
+    inner join jt_business_category c2 on c1.id = c2.super_id
+    where 1=1
+    <if test="name != null">
+     and c1.name = #{name,jdbcType=VARCHAR} 
+    </if>
+    <if test="pcIndex != null">
+     and c2.pc_index = #{pcIndex,jdbcType=INTEGER} 
+    </if>
+    <if test="appIndex != null">
+     and c2.app_index = #{appIndex,jdbcType=INTEGER} 
+    </if>
+    order by sort
+    <if test="number != null">
+    limit #{layer,jdbcType=INTEGER} 
+    </if>
+  </select>
+  <!-- 根据模块获得指定的层级的分类 -->
+  <select id="getCategoryByModel" parameterType="com.goafanti.common.model.JtBusinessCategory" resultMap="BaseResultMap">
+  	select * from jt_business_category 
+	where 1 = 1
+	<if test="module != null">
+	and module = #{module,jdbcType=INTEGER} 
+	</if>
+	<if test="layer != null">
+	and layer = #{layer,jdbcType=INTEGER} 
+	</if>
+	<if test="pcIndex != null">
+	and pc_index = #{pcIndex,jdbcType=INTEGER} 
+	</if>
+	<if test="appIndex != null">
+	and app_index = #{appIndex,jdbcType=INTEGER} 
+	</if>
+	order by sort
+	<if test="number != null">
+    limit #{sort,jdbcType=INTEGER} 
+    </if>
+  </select>
 </mapper>

+ 19 - 0
src/main/java/com/goafanti/common/model/JtBusinessCategory.java

@@ -253,4 +253,23 @@ public class JtBusinessCategory {
 	public void setNextModule(Integer nextModule) {
 		this.nextModule = nextModule;
 	}
+	
+    private Integer pcIndex;// 模块发布到pc首页
+    private Integer appIndex;// 模块发布到app首页
+
+	public Integer getPcIndex() {
+		return pcIndex;
+	}
+
+	public void setPcIndex(Integer pcIndex) {
+		this.pcIndex = pcIndex;
+	}
+
+	public Integer getAppIndex() {
+		return appIndex;
+	}
+
+	public void setAppIndex(Integer appIndex) {
+		this.appIndex = appIndex;
+	}
 }

+ 0 - 2
src/main/java/com/goafanti/common/model/JtBusinessProject.java

@@ -546,6 +546,4 @@ public class JtBusinessProject {
 	public void setTag(String tag) {
 		this.tag = tag;
 	}
-   
-    
 }

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

@@ -113,6 +113,9 @@
 					<p>
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexPolicy}">知识产权交易政策</a>
 					</p>
+					<p>
+						<a th:href="@{/portal/technologyTrading/tradingIndex#assessOnline}">在线评估</a>
+					</p>
 					<!-- <p>
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>
 					</p> -->

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html