Explorar o código

Merge branch 'test' of jishutao/jitao-server into prod

liliang4869 %!s(int64=7) %!d(string=hai) anos
pai
achega
257d62d15c

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

@@ -40,4 +40,13 @@ 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);
+	
 }
 }

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

@@ -438,6 +438,12 @@ 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);
+	}
 	
 	
 	
 	
 	
 	

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

@@ -444,19 +444,9 @@ public class WebpageController extends BaseController {
 		//科技项目
 		//科技项目
 		//获得所有模块为5的科技项目id
 		//获得所有模块为5的科技项目id
 		JtBusinessCategory scienceProject1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
 		JtBusinessCategory scienceProject1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
-		List<JtBusinessCategory> scienceProject = jtBusinessService.getCategoryByModule(5);
-		List<JtBusinessProject> manageSysPro = new ArrayList<JtBusinessProject>();
-		for (JtBusinessCategory jtBusinessCategory : scienceProject) {
-			List<JtBusinessProject> list = jtBusinessService.getBusinessProjectByCategoryId(jtBusinessCategory.getId(), 12, 1);
-			manageSysPro.addAll(list);
-		}
-		if(null != manageSysPro){
-			if(manageSysPro.size()>12){
-				manageSysPro.subList(0, 12);
-			}
-			modelview.addObject("scienceProjectList", manageSysPro);
-			modelview.addObject("spc1", scienceProject1);
-		}
+		List<JtBusinessProject> manageSysPro = jtBusinessService.getKJListByIds(5,1,12);
+		modelview.addObject("scienceProjectList", manageSysPro);
+		modelview.addObject("spc1", scienceProject1);
 		/****************************以上是新修改的部分********************************************/
 		/****************************以上是新修改的部分********************************************/
 		// 咨询师
 		// 咨询师
 		List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);
 		List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);
@@ -1293,4 +1283,10 @@ public class WebpageController extends BaseController {
 		return res;
 		return res;
 	}
 	}
 	
 	
+	@RequestMapping(value = "/portal/service/safeguarding", method = RequestMethod.GET)
+	public ModelAndView portalServiceSafeguarding(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/service/safeguarding");
+		return modelview;
+	}
+	
 }
 }

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

@@ -84,7 +84,7 @@ 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(Integer module, Integer isHost, Integer size);
      
      
   
   
 }
 }

+ 16 - 0
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -839,4 +839,20 @@
   	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 = #{0} 
+    and p.audit_status = 2 and is_hot = #{1}
+    order by release_date desc
+	  	limit #{2}
+	
+	  </select>
 </mapper>
 </mapper>

+ 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>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html