Просмотр исходного кода

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

gitadmin лет назад: 7
Родитель
Сommit
f4b0bc39fa
22 измененных файлов с 636 добавлено и 131 удалено
  1. 205 0
      src/main/java/com/goafanti/achievement/bo/AchievementEntity.java
  2. 4 12
      src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java
  3. 2 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  4. 3 11
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  5. 1 1
      src/main/java/com/goafanti/app/controller/AppDiscoveryController.java
  6. 184 17
      src/main/java/com/goafanti/app/controller/AppUserController.java
  7. 4 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  8. 3 0
      src/main/java/com/goafanti/common/dao/AchievementMapper.java
  9. 2 1
      src/main/java/com/goafanti/common/dao/DemandMapper.java
  10. 22 9
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  11. 27 30
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  12. 140 0
      src/main/java/com/goafanti/demand/bo/AppDemandBo.java
  13. 3 2
      src/main/java/com/goafanti/demand/service/DemandService.java
  14. 8 23
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  15. 10 3
      src/main/java/com/goafanti/portal/bo/AchievementObject.java
  16. 12 15
      src/main/webapp/WEB-INF/views/common.html
  17. 1 1
      src/main/webapp/WEB-INF/views/portal/continueHigh.html
  18. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  19. 1 1
      src/main/webapp/WEB-INF/views/portal/militaryProject.html
  20. 1 1
      src/main/webapp/WEB-INF/views/portal/practicalPatent.html
  21. 1 1
      src/main/webapp/WEB-INF/views/portal/service/patent.html
  22. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html

+ 205 - 0
src/main/java/com/goafanti/achievement/bo/AchievementEntity.java

@@ -0,0 +1,205 @@
+package com.goafanti.achievement.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class AchievementEntity {
+    private String field1;//行业---字符串
+    private int isHot;//热门
+    private Date releaseDate;//发布时间
+    private int interestCount;//收藏数
+    private String id;//id
+    private int dataCategory;//成果类型
+    private String name;//成果名称
+    private int category;//知识产权分类
+    private String summary;//简介
+    private String introduction;//介绍
+    private String technicalPictureUrl;//图片
+    private int fieldA;//行业
+    private int maturity;//成熟度
+    private int innovation;//创新度
+    private int transferMode;//交易形式
+    private BigDecimal transferPrice;//价格
+    private int status;//状态
+    private int releaseStatus;//发布状态
+    private int auditStatus;//审核状态
+    private int boutique;//是否精品
+    private int interest;//是否感兴趣
+    private int orderCount;//订单数
+
+    public String getField1() {
+        return field1;
+    }
+
+    public void setField1(String field1) {
+        this.field1 = field1;
+    }
+
+    public int getIsHot() {
+        return isHot;
+    }
+
+    public void setIsHot(int isHot) {
+        this.isHot = isHot;
+    }
+
+    public Date getReleaseDate() {
+        return releaseDate;
+    }
+
+    public void setReleaseDate(Date releaseDate) {
+        this.releaseDate = releaseDate;
+    }
+
+    public int getInterestCount() {
+        return interestCount;
+    }
+
+    public void setInterestCount(int interestCount) {
+        this.interestCount = interestCount;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getDataCategory() {
+        return dataCategory;
+    }
+
+    public void setDataCategory(int dataCategory) {
+        this.dataCategory = dataCategory;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCategory() {
+        return category;
+    }
+
+    public void setCategory(int category) {
+        this.category = category;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public String getTechnicalPictureUrl() {
+        return technicalPictureUrl;
+    }
+
+    public void setTechnicalPictureUrl(String technicalPictureUrl) {
+        this.technicalPictureUrl = technicalPictureUrl;
+    }
+
+    public int getFieldA() {
+        return fieldA;
+    }
+
+    public void setFieldA(int fieldA) {
+        this.fieldA = fieldA;
+    }
+
+    public int getMaturity() {
+        return maturity;
+    }
+
+    public void setMaturity(int maturity) {
+        this.maturity = maturity;
+    }
+
+    public int getInnovation() {
+        return innovation;
+    }
+
+    public void setInnovation(int innovation) {
+        this.innovation = innovation;
+    }
+
+    public int getTransferMode() {
+        return transferMode;
+    }
+
+    public void setTransferMode(int transferMode) {
+        this.transferMode = transferMode;
+    }
+
+    public BigDecimal getTransferPrice() {
+        return transferPrice;
+    }
+
+    public void setTransferPrice(BigDecimal transferPrice) {
+        this.transferPrice = transferPrice;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getReleaseStatus() {
+        return releaseStatus;
+    }
+
+    public void setReleaseStatus(int releaseStatus) {
+        this.releaseStatus = releaseStatus;
+    }
+
+    public int getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(int auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public int getBoutique() {
+        return boutique;
+    }
+
+    public void setBoutique(int boutique) {
+        this.boutique = boutique;
+    }
+
+    public int getInterest() {
+        return interest;
+    }
+
+    public void setInterest(int interested) {
+        this.interest = interested;
+    }
+
+    public int getOrderCount() {
+        return orderCount;
+    }
+
+    public void setOrderCount(int orderCount) {
+        this.orderCount = orderCount;
+    }
+}

+ 4 - 12
src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java

@@ -10,7 +10,7 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	
 	private Integer area;
 	
-	private String  CountInterest;
+	private String  countInterest;
 	
 	private String field1;
 	
@@ -25,14 +25,7 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	
 	private String easemobName;
 	private String orderCount;
-	private String orderIntentionCount;      	
-	public String getOrderIntentionCount() {
-		return orderIntentionCount;
-	}
-
-	public void setOrderIntentionCount(String orderIntentionCount) {
-		this.orderIntentionCount = orderIntentionCount;
-	}
+	
 
 	public String getOrderCount() {
 		return orderCount;
@@ -103,12 +96,11 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	}
 
 	public String getCountInterest() {
-		if (StringUtils.isBlank(CountInterest)) CountInterest = "20";
-		return String.valueOf(Integer.valueOf(CountInterest)+20);
+		return countInterest;
 	}
 
 	public void setCountInterest(String countInterest) {
-		CountInterest = countInterest;
+		this.countInterest = countInterest;
 	}
 
 	public String getCityName() {

+ 2 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -2,6 +2,7 @@ package com.goafanti.achievement.service;
 
 import java.util.List;
 
+import com.goafanti.achievement.bo.AchievementEntity;
 import com.goafanti.achievement.bo.AchievementImportBo;
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
@@ -64,7 +65,7 @@ public interface AchievementService {
 
 	Pagination<AchievementPartnerListBo> listAppMyAchievement(Integer pNo, Integer pSize);
 
-	AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id);
+	AchievementEntity selectAppUserOwnerDetail(String id);
 
 	int saveAppAchievement(Achievement a, String[] keywords);
 

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.achievement.bo.AchievementEntity;
 import com.goafanti.achievement.bo.AchievementImportBo;
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
@@ -426,17 +427,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 
 	@Override
-	public AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id) {
-		AchievementUserOwnerDetailBo a=achievementMapper.selectUserOwnerDetail(id);
-		int i=achievementMapper.countInterest(a.getId());
-		a.setCountInterest(String.valueOf(i));
-		String uid=TokenManager.getUserId();
-		if(TokenManager.isLogin()&&achievementInterestMapper.checkUidAndDid(uid,id)>0){
-			a.setInterest("1");
-		}else {
-			a.setInterest("0");
-		}
-		return a;
+	public AchievementEntity selectAppUserOwnerDetail(String id) {
+		return achievementMapper.selectAppAchuevementDetail(id);
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppDiscoveryController.java

@@ -17,7 +17,7 @@ import com.goafanti.news.service.NewsService;
 import com.goafanti.user.service.UserIdentityService;
 
 @RestController
-@RequestMapping(path = "/app/discovery", method = RequestMethod.GET)
+@RequestMapping(path = "/open/discovery", method = RequestMethod.GET)
 public class AppDiscoveryController extends BaseApiController {
 	@Resource
 	private AchievementService	achievementService;

+ 184 - 17
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -15,6 +15,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSONObject;
@@ -25,10 +26,13 @@ import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.constant.PageConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.dao.JpushEasemobAccountMapper;
+import com.goafanti.common.enums.AchievementAuditStatus;
 import com.goafanti.common.enums.AchievementFields;
 import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.enums.DemandAuditStatus;
 import com.goafanti.common.enums.DemandFields;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.Demand;
@@ -42,6 +46,7 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.InputDemand;
 import com.goafanti.demand.service.DemandService;
@@ -52,6 +57,7 @@ import com.goafanti.message.bo.MessageListBo;
 import com.goafanti.message.service.MessageService;
 import com.goafanti.news.service.NewsService;
 import com.goafanti.order.service.JtOrderService;
+import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.user.service.UserCareerService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserInterestService;
@@ -277,24 +283,7 @@ public class AppUserController extends BaseApiController {
 	}
 	
 	
-	/**
-	 * 我的成果
-	 */
-	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
-	private Result achievementList(String pageNo, String pageSize) {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
 
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(achievementService.listAppMyAchievement(pNo, pSize));
-		return res;
-	}
 
 	/**
 	 * 我的需求
@@ -615,4 +604,182 @@ public class AppUserController extends BaseApiController {
 		return result;
 	}
 	
+	/*
+	 * APP我的成果列表
+	 **/
+	@RequestMapping(value="/appAchievementList",method = RequestMethod.GET)
+	public Result msyJtAchievementList(Integer auditStatus, String name,Integer dataCategory,  String startDate,
+			String endDate,  Integer pageNo, Integer pageSize) {
+		Result result=new Result();
+		if(null==pageNo||pageNo<0)pageNo=1;
+		if(null==pageSize||pageSize<0)pageSize=10;
+		Pagination<AchievementObject> p=achievementService.listMyAchievement(auditStatus, name, dataCategory,
+				 startDate, endDate, pageNo, pageSize);
+		result.data(p); 
+		return result;
+	}
+	/**
+	 * 修改成果
+	 */
+	@RequestMapping(value = "/updateAchievement", method = RequestMethod.POST)
+	public Result updateAchievement(@Valid InputAchievement ia, BindingResult bindingResult,
+			@RequestParam(name = "keywords[]", required = false) String[] keywords,
+			@RequestParam(name = "publishPages[]", required = false)  String[] publishPages) {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
+		if (StringUtils.isBlank(ia.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
+			return res;
+		}
+
+		if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
+				&& !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
+				&& !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
+			return res;
+		}
+		List<String> webPages = new ArrayList<String>();
+		List<String> appPages = new ArrayList<String>();
+		PageConstants.putAchievement(publishPages, webPages, appPages);
+		res = disposeInputAchievement(res, ia, keywords,publishPages);
+		if (!res.getError().isEmpty()) {
+			return res;
+		}
+		if(webPages.size()==0 && appPages.size() == 0){
+
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "页面参数错误","页面参数"));
+			return res;
+		}
+		if(TokenManager.getUserId() ==null) {
+			res.getError().add(buildError(ErrorConstants.NON_LOGIN, "", ""));return res;
+		}
+		Achievement a = new Achievement();
+		BeanUtils.copyProperties(ia, a);
+		a.setOwnerId(TokenManager.getUserId());
+		res.setData(achievementService.updateAchievement(a, keywords, null,webPages,appPages));
+		return res;
+	}
+	private Result disposeInputAchievement(Result res, InputAchievement ia, String[] keywords,String[] publishPages) {
+		if (StringUtils.isBlank(ia.getName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果名称", "成果名称"));
+			return res;
+		}
+
+		if (null == ia.getCategory()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到数据类别", "数据类别"));
+			return res;
+		}
+
+		if (StringUtils.isBlank(ia.getKeyword())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
+			return res;
+		}
+
+		if (null == keywords || keywords.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
+			return res;
+		}
+		
+	
+		for (int i = 0; i < keywords.length; i++) {
+			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "关键词长度"));
+				return res;
+			}
+		}
+		return res;
+	}
+	/**
+	 * 修改需求
+	 */
+	@RequestMapping(value = "/updateDemand", method = RequestMethod.POST)
+	public Result updateDemand(@Valid InputDemand demand, BindingResult bindingResult,
+			@RequestParam(name = "keywords[]", required = false) String[] keywords,
+			@RequestParam(name = "publishPages[]", required = false)  String[] publishPages,
+			String validityPeriodFormattedDate) {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					DemandFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		if (StringUtils.isBlank(demand.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
+			return res;
+		}
+		if (!DemandAuditStatus.CREATE.getCode().equals(demand.getAuditStatus())
+				&& !DemandAuditStatus.UNAUDITED.getCode().equals(demand.getAuditStatus())
+				&& !DemandAuditStatus.REVOKE.getCode().equals(demand.getAuditStatus())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
+			return res;
+		}
+		//demand.setAuditStatus(DemandAuditStatus.INAUDIT.getCode()); 两步操作,先保存后提交
+		res = disposeDemand(res, demand, keywords, publishPages);
+		if (!res.getError().isEmpty()) {
+			return res;
+		}
+		List<String> webPages = new ArrayList<String>();
+		List<String> appPages = new ArrayList<String>();
+		PageConstants.putDemand(publishPages, webPages, appPages);
+		if(webPages.size()==0 && appPages.size() == 0){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "页面参数错误"));
+			return res;
+		}
+		Demand d = new Demand();
+		BeanUtils.copyProperties(demand, d);
+		d.setEmployerId(TokenManager.getUserId());
+		res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords, webPages,appPages));
+		return res;
+	}
+	private Result disposeDemand(Result res, InputDemand demand, String[] keywords,String[] publishPages) {
+		if (StringUtils.isBlank(demand.getName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求名称", "需求名称"));
+			return res;
+		}
+
+		/*if (!DemandDataCategory.USERDEMAND.getCode().equals(demand.getDataCategory())
+				&& !DemandDataCategory.ORGDEMAND.getCode().equals(demand.getDataCategory())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "数据类型"));
+			return res;
+		}*/
+
+		if (StringUtils.isBlank(demand.getKeyword())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
+			return res;
+		}
+
+		if (null == keywords || keywords.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
+			return res;
+		}
+
+		if (null == demand.getIndustryCategoryA()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到行业类别", "行业类别"));
+			return res;
+		}
+
+		if (null == demand.getDemandType()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求类型", "需求类型"));
+			return res;
+		}
+
+		if (StringUtils.isBlank(demand.getProblemDes())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到问题说明", "问题说明"));
+			return res;
+		}
+
+		for (int i = 0; i < keywords.length; i++) {
+			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "关键词长度"));
+				return res;
+			}
+		}
+
+		return res;
+	}
 }

+ 4 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -678,6 +678,10 @@ public class PublicController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户"));
 			return res;
 		}
+		if (null!=user.getMobile()&&user.getMobile()!=mobile) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "手机号码"));
+			return res;
+		}
 		user.setPassword(newPwd);
 		user.setPassword(passwordUtil.getEncryptPwd(user));
 		userService.updateByPrimaryKeySelective(user);

+ 3 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.goafanti.achievement.bo.AchievementEntity;
 import com.goafanti.achievement.bo.AchievementInterestBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
@@ -74,5 +75,7 @@ public interface AchievementMapper {
 	
     /**	查询智者的科技成果**/
 	List<AchievementPartnerListBo>findPartnerAchievementListByPage(String uid);
+
+	AchievementEntity selectAppAchuevementDetail(String id);
 	
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.common.model.Demand;
+import com.goafanti.demand.bo.AppDemandBo;
 import com.goafanti.demand.bo.DemandDetailBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandRecommended;
@@ -42,7 +43,7 @@ public interface DemandMapper {
 	
 	DemandDetailBo selectDemandDetail(String id);
 
-	DemandListBo selectAppByPrimaryKey(String id);
+	AppDemandBo selectAppByPrimaryKey(@Param("id")String id, @Param("uid")String uid);
 
 	List<DemandRecommended> getAppHomeRecommended();
 

+ 22 - 9
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -751,7 +751,7 @@
 	</select>
   
   <select id="selectUserOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementUserOwnerDetailBo">
-	select  
+		select  
 		  	a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
 		  	a.name, a.keyword, a.category, 
 		  	a.summary, a.introduction, a.technical_picture_url as technicalPictureUrl, 
@@ -769,7 +769,7 @@
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
 			ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,j.easemob_name as easemobName,a.remark,
-			ifnull(t.x,0) as orderIntentionCount ,ifnull(t2.x,0) as orderCount,ifnull(mm.effective,0) hot,a.boutique,a.contacts,a.contact_mobile as contactMobile, 
+			ifnull(t2.x,0) as orderCount,a.boutique,a.contacts,a.contact_mobile as contactMobile, 
 			a.international_flag as internationalFlag
 	from achievement a
     left join user_identity ui on a.owner_id = ui.uid
@@ -777,15 +777,10 @@
   	left join field_glossory f2 on a.field_b=f2.id
     left join (select count(0) as x,tl.commodity_id from t_order tr
 				left join t_order_detail tl on tl.order_no=tr.order_no
-				where order_status != 4
-				group by  tl.commodity_id ) t on a.id=t.commodity_id 
-	left join (select count(0) as x,tl.commodity_id from t_order tr
-				left join t_order_detail tl on tl.order_no=tr.order_no
 				where tr.order_status != 4 and tr.order_status != 0
 				group by  tl.commodity_id) t2 on a.id=t2.commodity_id 
     left join jpush_easemob_account j on a.owner_id=j.uid
     left join user u on u.id = a.owner_id
-    left join marketing_management mm on a.id = mm.product_id
   where a.id =#{id,jdbcType=VARCHAR}
   </select>
   
@@ -1287,9 +1282,12 @@ order by release_date limit #{0}
   		a.release_date as releaseDate, 
   		a.audit_status as auditStatus,
   		a.boutique,
+  		if(isnull(c.interestCount),0,c.interestCount) as interestCount,
+  		if(isnull(d.achievement_id),0,1) as ifInterest,
   		b.identify_name as ownerName
   	from achievement a
-  	left join user b on a.owner_id = b.id 
+  	left join user b on a.owner_id = b.id left join (select achievement_id,count(*)as interestCount from achievement_interest group by achievement_id) c
+  	on a.id=c.achievement_id left join (select achievement_id from achievement_interest where uid='1' )d  on a.id=d.achievement_id
   	where a.deleted_sign = 0 and info_sources=1
 	<if test="ownerId != null">
   		and a.owner_id = #{ownerId,jdbcType=VARCHAR}
@@ -1324,7 +1322,8 @@ order by release_date limit #{0}
 	select 
   		count(0)
   	from achievement a
-  	left join user b on a.owner_id = b.id 
+  	left join user b on a.owner_id = b.id left join (select achievement_id,count(*)as interestCount from achievement_interest group by achievement_id) c
+  	on a.id=c.achievement_id left join (select achievement_id from achievement_interest where uid='1' )d  on a.id=d.achievement_id
   	where a.deleted_sign = 0 and info_sources=1
 	<if test="ownerId != null">
   		and a.owner_id = #{ownerId,jdbcType=VARCHAR}
@@ -1413,4 +1412,18 @@ where
   	left join achievement_interest ai on ai.achievement_id=a.id
   	where ai.uid=#{uid,jdbcType=VARCHAR}
   	</select>
+  	<select id="selectAppAchuevementDetail" resultType="com.goafanti.achievement.bo.AchievementEntity">
+  	select a.id,a.name,a.data_category,a.summary,a.introduction,a.transfer_mode as transferMode,a.status,a.transfer_price as transferPrice ,a.innovation,a.maturity,a.audit_status,a.technical_picture_url as technicalPictureUrl,
+  f.name as field1,a.release_status as releaseStatus,a.audit_status as auditStatus,a.boutique,a.field_a as fieldA,a.is_hot as isHot,a.release_date as releaseDate,if(isnull(b.count),0,b.count) as interestCount,
+  if(isnull(d.achievement_id),0,1) interest,ifnull(t.x,0) as orderCount
+  from achievement a left join field_glossory f on a.field_a=f.id
+  left join ( select count(0) as x,tl.commodity_id from t_order tr
+  	left join t_order_detail tl on tl.order_no=tr.order_no
+	where tr.order_status != 4 and tr.order_status != 0
+	group by  tl.commodity_id) t on a.id=t.commodity_id 
+  left join (select achievement_id,count(*) as count from achievement_interest group by achievement_id ) b 
+  on a.id=b.achievement_id left join (select achievement_id from achievement_interest where uid='1' )d  on a.id=d.achievement_id
+  where a.deleted_sign = 0 and a.info_sources=1
+  AND  a.id =#{id,jdbcType=VARCHAR}
+  	</select>
 </mapper>

+ 27 - 30
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -59,27 +59,25 @@
     from demand
     where id = #{id,jdbcType=VARCHAR}
   </select>
-  <select id="selectAppByPrimaryKey" resultType="com.goafanti.demand.bo.DemandListBo" parameterType="java.lang.String" >
-    	select 
-    d.id, d.serial_number AS serialNumber, d.data_category AS dataCategory, d.name, d.keyword, d.info_sources AS infoSources, d.industry_category_a AS industryCategoryA, 
-    d.industry_category_b AS industryCategoryB, d.industry_category_c AS industryCategoryC, d.demand_type AS demandType, d.problem_des AS problemDes, d.technical_requirements AS technicalRequirements, 
-    d.picture_url AS pictureUrl, d.text_file_url AS textFileUrl, d.video_url AS videoUrl, d.fixed_budget AS fixedBudget, d.fixed_cycle AS fixedCycle, d.people_number AS peopleNumber, 
-    d.fixed_scheme AS fixedScheme, d.cost_escrow AS costEscrow, d.budget_cost AS budgetCost, d.validity_period as validityPeriod, d.employer_id AS employerId, d.employer_name AS employerName, 
-    d.employer_address AS employerAddress, d.employer_contacts AS employerContacts, d.employer_contacts_mobile AS employerContactsMobile, d.employer_contacts_mailbox AS employerContactsMailbox, 
-    d.contacts, d.status, d.release_status AS releaseStatus, d.release_date AS releaseDate , d.create_time AS createTime, d.principal_id AS principalId, d.deleted_sign AS deletedSign,
-    d.audit_status AS auditStatus, d.tech_broker_id AS techBrokerId,d.boutique,d.urgent_money AS urgentMoney,d.urgent_days as urgentDays
-    ,ifnull(t.x,0) as orderIntentionCount,ifnull(t2.x,0) as orderCount,j.easemob_name as easemobName,d.contacts,d.contact_mobile as contactMobile
+  <select id="selectAppByPrimaryKey" resultType="com.goafanti.demand.bo.AppDemandBo" parameterType="java.lang.String" >
+    select 
+    d.id, d.serial_number AS serialNumber, d.data_category AS dataCategory, d.name, d.keyword,
+    d.info_sources AS infoSources, d.industry_category_a AS fieldA,d.industry_category_b AS fieldB,
+    f.name as field1,f2.name as field2,d.is_hot as isHot,d.release_date as releaseDate,d.demand_type as demandType,
+    d.name,d.problem_des as problemDes,d.picture_url as pictureUrl,d.release_status as releaseStatus,
+    d.audit_status as auditStatus,d.fixed_budget as fixedBudget,d.crowd_cost as crowdCost,
+    ifnull(i.y,0) as interestCount,if(isnull(a.demand_id),0,1) as interest,ifnull(t.x,0) as orderCount
     from demand d
-    left join jpush_easemob_account j on d.employer_id=j.uid
-    left join (select count(0) as x,tl.commodity_id from t_order tr
-				left join t_order_detail tl on tl.order_no=tr.order_no
-				where order_status != 4
-				group by  tl.commodity_id) t on d.id=t.commodity_id
     left join (select count(0) as x,tl.commodity_id from t_order tr
-				left join t_order_detail tl on tl.order_no=tr.order_no
-				where tr.order_status != 4 and tr.order_status != 0
-				group by  tl.commodity_id ) t2 on d.id=t2.commodity_id 
-    where d.id =  #{id,jdbcType=VARCHAR}
+		left join t_order_detail tl on tl.order_no=tr.order_no
+		group by  tl.commodity_id) t on d.id=t.commodity_id
+	left join (select count(0) as y,demand_id from demand_interest
+		group by demand_id ) i on d.id=i.demand_id
+	left join (select demand_id from demand_interest where uid=#{uid,jdbcType=VARCHAR}) a on d.id=a.demand_id
+	left join field_glossory f on d.industry_category_a=f.id
+  	left join field_glossory f2 on d.industry_category_b=f2.id
+	where d.deleted_sign=0 and d.info_sources=1			
+    and  d.id = #{id,jdbcType=VARCHAR}
 	</select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from demand
@@ -791,7 +789,8 @@
 		select
 			count(0)
 		from demand a left join user b on a.employer_id = b.id 
-		where a.info_sources=1
+		where  a.info_sources=1
+		and a.deleted_sign=0
 		<if test="employerId != null">
 			and a.employer_id = #{employerId,jdbcType=VARCHAR}
 		</if>
@@ -824,18 +823,16 @@
 	where demand_id = #{demandId,jdbcType=VARCHAR}
 	</select> 
 	
-  <select id="findAppMyDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
+  <select id="findAppMyDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.AppDemandBo">
   	select 
-	  d.id, d.boutique,d.name, d.audit_status as auditStatus,ifnull(t.x,0) as orderCount,
-	  d.release_date as releaseDate,d.create_time as createTime,ifnull(i.y,0) as countInterest
+	  d.id, d.boutique,d.name, d.audit_status as auditStatus,d.release_date as releaseDate,
+	  d.create_time as createTime,ifnull(i.y,0) as interestCount,
+	  if(isnull(a.demand_id),0,1) as interest
 	from  demand d 
-	left join (select count(0) as x,tl.commodity_id from t_order tr
-				left join t_order_detail tl on tl.order_no=tr.order_no
-				where tr.order_status != 4 and tr.order_status != 0
-				group by  tl.commodity_id ) t on d.id=t.commodity_id
 	left join (select count(0) as y,demand_id from demand_interest
-				group by demand_id ) i on d.id=i.demand_id	
-	where d.deleted_sign = 0 
+				group by demand_id ) i on d.id=i.demand_id
+	left join (select demand_id from demand_interest where uid=#{employerId, jdbcType=VARCHAR}) a on d.id=a.demand_id
+	where d.deleted_sign = 0 and d.info_sources=1
 	<if test="employerId != null">
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	</if>
@@ -846,7 +843,7 @@
   </select>
   
   <select id="findAppMyDemandCount" parameterType="String" resultType="java.lang.Integer">
-  	select count(1)
+  	select count(*)
 	from  demand d 
 	where d.deleted_sign = 0 
 	<if test="employerId != null">

+ 140 - 0
src/main/java/com/goafanti/demand/bo/AppDemandBo.java

@@ -0,0 +1,140 @@
+package com.goafanti.demand.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class AppDemandBo {
+	   private int fieldA;//行业
+	    private int fieldB;//行业二级
+	    private String field1;//行业---字符串
+	    private String field2;//二级行业 --字符串
+	    private int isHot;//热门
+	    private Date releaseDate;//发布时间
+	    private int interestCount;//收藏数
+	    private String id;//id
+	    private int demandType;// 需求类型(0-企业技术需求,1-技术设备类需求,2-产学研合作需求,3-研产资金需求,4-地区产业需求,5-技术人才型需求)
+	    private String name;//需求名称
+	    private String problemDes;//问题描述
+	    private String pictureUrl;//图片
+	    private int releaseStatus;//发布状态
+	    private int auditStatus;//审核状态
+	    private int interest;//是否感兴趣
+	    private int orderCount;//订单数
+	    private String keyword;//关键词
+	    private BigDecimal fixedBudget;//固定预算
+	    private BigDecimal crowdCost;//资金需求金额
+		public int getFieldA() {
+			return fieldA;
+		}
+		public void setFieldA(int fieldA) {
+			this.fieldA = fieldA;
+		}
+		public int getFieldB() {
+			return fieldB;
+		}
+		public void setFieldB(int fieldB) {
+			this.fieldB = fieldB;
+		}
+		public String getField1() {
+			return field1;
+		}
+		public void setField1(String field1) {
+			this.field1 = field1;
+		}
+		public String getField2() {
+			return field2;
+		}
+		public void setField2(String field2) {
+			this.field2 = field2;
+		}
+		public int getIsHot() {
+			return isHot;
+		}
+		public void setIsHot(int isHot) {
+			this.isHot = isHot;
+		}
+		public Date getReleaseDate() {
+			return releaseDate;
+		}
+		public void setReleaseDate(Date releaseDate) {
+			this.releaseDate = releaseDate;
+		}
+		public int getInterestCount() {
+			return interestCount;
+		}
+		public void setInterestCount(int interestCount) {
+			this.interestCount = interestCount;
+		}
+		public String getId() {
+			return id;
+		}
+		public void setId(String id) {
+			this.id = id;
+		}
+		public int getDemandType() {
+			return demandType;
+		}
+		public void setDemandType(int demandType) {
+			this.demandType = demandType;
+		}
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+		public String getProblemDes() {
+			return problemDes;
+		}
+		public void setProblemDes(String problemDes) {
+			this.problemDes = problemDes;
+		}
+		public String getPictureUrl() {
+			return pictureUrl;
+		}
+		public void setPictureUrl(String pictureUrl) {
+			this.pictureUrl = pictureUrl;
+		}
+		public int getReleaseStatus() {
+			return releaseStatus;
+		}
+		public void setReleaseStatus(int releaseStatus) {
+			this.releaseStatus = releaseStatus;
+		}
+		public int getAuditStatus() {
+			return auditStatus;
+		}
+		public void setAuditStatus(int auditStatus) {
+			this.auditStatus = auditStatus;
+		}
+		public int getInterest() {
+			return interest;
+		}
+		public void setInterest(int interest) {
+			this.interest = interest;
+		}
+		public int getOrderCount() {
+			return orderCount;
+		}
+		public void setOrderCount(int orderCount) {
+			this.orderCount = orderCount;
+		}
+		public String getKeyword() {
+			return keyword;
+		}
+		public void setKeyword(String keyword) {
+			this.keyword = keyword;
+		}
+		public BigDecimal getFixedBudget() {
+			return fixedBudget;
+		}
+		public void setFixedBudget(BigDecimal fixedBudget) {
+			this.fixedBudget = fixedBudget;
+		}
+		public BigDecimal getCrowdCost() {
+			return crowdCost;
+		}
+		public void setCrowdCost(BigDecimal crowdCost) {
+			this.crowdCost = crowdCost;
+		}
+}

+ 3 - 2
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.goafanti.common.model.Demand;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.demand.bo.AppDemandBo;
 import com.goafanti.demand.bo.DemandDetailBo;
 import com.goafanti.demand.bo.DemandImportBo;
 import com.goafanti.demand.bo.DemandListBo;
@@ -41,7 +42,7 @@ public interface DemandService {
 
 	int updateByPrimaryKeySelective(Demand d);
 	
-	DemandListBo selectAppDemandDetail( String id);
+	AppDemandBo selectAppDemandDetail( String id);
 	
 	Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,Integer industryCategoryA,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
@@ -49,7 +50,7 @@ public interface DemandService {
 
 	Pagination<ObjectInterestListBo> selectinterest(Integer type,Integer pageNo, Integer pageSize);
 
-	Pagination<DemandSearchListBo> listMyDemand(Integer pNo, Integer pSize);
+	Pagination<AppDemandBo> listMyDemand(Integer pNo, Integer pSize);
 
 	int saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 

+ 8 - 23
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -58,6 +58,7 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.demand.bo.AppDemandBo;
 import com.goafanti.demand.bo.DemandDetailBo;
 import com.goafanti.demand.bo.DemandImportBo;
 import com.goafanti.demand.bo.DemandListBo;
@@ -584,27 +585,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	}
 	
 	@Override
-	public DemandListBo selectAppDemandDetail(String id ) {
-		DemandListBo d=demandMapper.selectAppByPrimaryKey(id);
-		
-		if (null!=d.getIndustryCategoryA()) {
-			d.setIndustryCategory1(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryA()).getName());
-		}
-		if (null!=d.getIndustryCategoryB()) {
-			d.setIndustryCategory2(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
-		}
-		if (null!=d.getIndustryCategoryC()) {
-			d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryC()).getName()));
-		}
-		int i=demandMapper.countInterest(d.getId());
-		d.setCountInterest(String.valueOf(i));
+	public AppDemandBo selectAppDemandDetail(String id ) {
 		String uid=TokenManager.getUserId();
-		if(TokenManager.isLogin()&&demandInterestMapper.checkUidAndDid(uid,id)>0){
-			d.setInterest("1");//已关注
-		}else {
-			d.setInterest("0");//未关注
-		}
-		return d;
+		uid="0261d476-8336-4a0b-97d7-83c89e286852";
+		return demandMapper.selectAppByPrimaryKey(id,uid);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -680,9 +664,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return null;
 	}
 
+	
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandSearchListBo> listMyDemand(Integer pNo, Integer pSize) {
+	public Pagination<AppDemandBo> listMyDemand(Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -693,8 +678,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(TokenManager.getUserId())) {
 			params.put("employerId", TokenManager.getUserId());
 		}
-		//params.put("employerId", "46433140-0a90-471e-a32f-6bc89c562e3d");
-		return (Pagination<DemandSearchListBo>) findPage("findAppMyDemandListByPage", "findAppMyDemandCount", params, pNo, pSize);
+		params.put("employerId", "46433140-0a90-471e-a32f-6bc89c562e3d");
+		return (Pagination<AppDemandBo>) findPage("findAppMyDemandListByPage", "findAppMyDemandCount", params, pNo, pSize);
 	}
 
 

+ 10 - 3
src/main/java/com/goafanti/portal/bo/AchievementObject.java

@@ -19,7 +19,8 @@ public class AchievementObject extends InputAchievement {
 	private String	ownerTypeS;
 	private Integer isHot;
 	private Date releaseDate;
-	private int interestCount;
+	private String interestCount;
+	private String ifInterest;
 	private String dataCategoryS;
 	private String firstPicture;
 	private String city;
@@ -43,10 +44,10 @@ public class AchievementObject extends InputAchievement {
 	public void setFirstPicture(String firstPicture) {
 		this.firstPicture = firstPicture;
 	}
-	public int getInterestCount() {
+	public String getInterestCount() {
 		return interestCount;
 	}
-	public void setInterestCount(int interestCount) {
+	public void setInterestCount(String interestCount) {
 		this.interestCount = interestCount;
 	}
 	public Date getReleaseDate() {
@@ -146,6 +147,12 @@ public class AchievementObject extends InputAchievement {
 		super.setMaturity(maturity);
 		setMaturityS(Maturity.find(maturity.intValue()).getName());
 	}
+	public String getIfInterest() {
+		return ifInterest;
+	}
+	public void setIfInterest(String ifInterest) {
+		this.ifInterest = ifInterest;
+	}
 	
 
 	

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

@@ -5,18 +5,15 @@
 
 <head th:fragment="header(title, link)">
   <meta charset="UTF-8">
-<!--   <link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}" /> -->
-  <link rel="icon" type="image/png" th:href="${portalHost+'/img/ico_logo.png'}" sizes="16x16">
-
+  <link rel="shortcut icon " type="images/x-icon" th:href="${portalHost+ '/img/ico_logo.png'}">
   <meta name="Keywords" content="高新技术企业认定_双软评估_军工认证_知识产权贯标_知识产权转移_科德"/>
-	<meta name="Description" content="科德信息咨询有限公司17年来专注于国家高新技术企业认定,知识产权贯标,知识产权转移,双软评估,
-体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、
-成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构."/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <th:block th:replace="${link}" />
-    <title></title>
-    <script src="https://s13.cnzz.com/z_stat.php?id=1274328485&web_id=1274328485" language="JavaScript"></script>
+  <meta name="Description" content="科德信息咨询有限公司17年来专注于国家高新技术企业认定,知识产权贯标,知识产权转移,双软评估,
+	体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构."/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <th:block th:replace="${link}" />
+  <title></title>
+  <script src="https://s22.cnzz.com/z_stat.php?id=1274334487&web_id=1274334487" language="JavaScript"></script>
 </head>
 
 
@@ -121,7 +118,7 @@
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>
 					</p>
 				</li>
-				<li>
+				<!-- <li>
 					<div>知识产权维权</div>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit4.png'}" alt="">
@@ -141,7 +138,7 @@
 					<p>
 						<a th:href="@{/portal/service/patent#encyclopedias}">知产百科</a>
 					</p>
-				</li>
+				</li> -->
 				<!-- <li>
 					<div>智库咨询</div>
 					<span>
@@ -213,12 +210,12 @@
 	                        </ol>
                         </div>
                     </li>                           
-                    <li th:class="${subM}=='protect'?active:''" >
+ <!--                    <li th:class="${subM}=='protect'?active:''" >
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">知识产权维权</a>
  
                        </div>
-                    </li>
+                    </li> -->
 <!--                     <li th:class="${subM}=='thindTankIndex'?active:''"> -->
 <!--                     <div> -->
 <!--                         <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a> -->

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/continueHigh.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/militaryProject.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatent.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html