Browse Source

"伙伴"主页--科技成果列表
"伙伴"主页--科技需求列表

Antiloveg 8 years ago
parent
commit
9d20a46bf7

+ 127 - 0
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -0,0 +1,127 @@
+package com.goafanti.achievement.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
+
+public class AchievementPartnerListBo {
+	private String	id;
+
+	/**
+	 * 编号
+	 */
+	private Integer	serialNumber;
+
+	/**
+	 * 数据类别 (0--成果, 1--技术, 2--项目)
+	 */
+	private Integer	dataCategory;
+
+	/**
+	 * 名称
+	 */
+	private String	name;
+
+	/**
+	 * 关键词
+	 */
+	private String	keyword;
+
+	/**
+	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
+	 */
+	private Integer	category;
+
+	/**
+	 * 所有人类型(0-个人,1-组织)
+	 */
+	private Integer	ownerType;
+
+	/**
+	 * 发布时间
+	 */
+	private Date	releaseDate;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getDataCategory() {
+		return dataCategory;
+	}
+
+	public void setDataCategory(Integer dataCategory) {
+		this.dataCategory = dataCategory;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getKeyword() {
+		return keyword;
+	}
+
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCategory() {
+		return category;
+	}
+
+	public void setCategory(Integer category) {
+		this.category = category;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getOwnerType() {
+		return ownerType;
+	}
+
+	public void setOwnerType(Integer ownerType) {
+		this.ownerType = ownerType;
+	}
+
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
+
+	public String getReleaseDateFormattedDate() {
+		if (this.releaseDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setReleaseDateFormattedDate(String releaseDateFormattedDate) {
+
+	}
+}

+ 3 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.goafanti.achievement.bo.AchievementImportBo;
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
+import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -55,5 +56,7 @@ public interface AchievementService {
 
 	int updateMatchDemand(Achievement a);
 
+	Pagination<AchievementPartnerListBo> listPartnerAchievement(String ownerId, Integer pNo, Integer pSize);
+
 
 }

+ 19 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.goafanti.achievement.bo.AchievementImportBo;
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
+import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.constant.AFTConstants;
@@ -458,4 +459,22 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return 0;
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<AchievementPartnerListBo> listPartnerAchievement(String ownerId, Integer pNo, Integer pSize) {
+		Map<String, Object> params = new HashMap<>();
+
+		params.put("ownerId", ownerId);
+
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<AchievementPartnerListBo>) findPage("findPartnerAchievementListByPage", "findPartnerAchievementCount",
+				params, pNo, pSize);
+	}
+
 }

+ 31 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1099,4 +1099,35 @@
   	and owner_id = #{uid,jdbcType=VARCHAR}
   </select>
   
+  <select id="findPartnerAchievementListByPage" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementPartnerListBo">
+  	SELECT
+		id,
+		serial_number AS serialNumber,
+		data_category AS dataCategory,
+		NAME,
+		keyword,
+		category,
+		owner_type as ownerType,
+		release_date AS releaseDate	
+	FROM
+		achievement
+	WHERE
+		audit_status = 3
+	AND release_status = 1
+	AND deleted_sign = 0
+	AND owner_id = #{ownerId,jdbcType=VARCHAR}
+  </select>
+  
+  <select id="findPartnerAchievementCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	SELECT
+		count(1)
+	FROM
+		achievement
+	WHERE
+		audit_status = 3
+	AND release_status = 1
+	AND deleted_sign = 0
+	AND owner_id = #{ownerId,jdbcType=VARCHAR}
+  </select>
+  
 </mapper>

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

@@ -993,4 +993,34 @@
   	and employer_id = #{uid,jdbcType=VARCHAR}
   </select>
   
+  <select id="findPartnerDemandListByPage" parameterType="java.lang.String" resultType="com.goafanti.demand.bo.DemandPartnerListBo">
+  	SELECT
+		id,
+		serial_number AS serialNumber,
+		data_category AS dataCategory,
+		NAME,
+		keyword,
+		release_date AS releaseDate,
+		demand_type AS demandType,
+		validity_period AS validityPeriod
+	FROM
+		demand
+	WHERE
+		audit_status = 3
+	AND release_status = 1
+	AND deleted_sign = 0
+	AND employer_id = #{employerId,jdbcType=VARCHAR}
+  </select>
+  
+  <select id="findPartnerDemandCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	SELECT
+		count(1)
+	FROM
+		demand
+	WHERE
+		audit_status = 3
+	AND release_status = 1
+	AND deleted_sign = 0
+	AND employer_id = #{employerId,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 136 - 0
src/main/java/com/goafanti/demand/bo/DemandPartnerListBo.java

@@ -0,0 +1,136 @@
+package com.goafanti.demand.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
+
+public class DemandPartnerListBo {
+	private String	id;
+
+	/**
+	 * 编号
+	 */
+	private Integer	serialNumber;
+
+	/**
+	 * 数据类别(0-个人需求,1-单位需求)
+	 */
+	private Integer	dataCategory;
+
+	/**
+	 * 名称
+	 */
+	private String	name;
+
+	/**
+	 * 关键词
+	 */
+	private String	keyword;
+
+	/**
+	 * 发布时间
+	 */
+	private Date	releaseDate;
+
+	/**
+	 * 需求类型
+	 */
+	private Integer	demandType;
+
+	private Date	validityPeriod;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getDataCategory() {
+		return dataCategory;
+	}
+
+	public void setDataCategory(Integer dataCategory) {
+		this.dataCategory = dataCategory;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getKeyword() {
+		return keyword;
+	}
+
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getDemandType() {
+		return demandType;
+	}
+
+	public void setDemandType(Integer demandType) {
+		this.demandType = demandType;
+	}
+
+	public Date getValidityPeriod() {
+		return validityPeriod;
+	}
+
+	public void setValidityPeriod(Date validityPeriod) {
+		this.validityPeriod = validityPeriod;
+	}
+
+	public String getValidityPeriodFormattedDate() {
+		if (this.validityPeriod == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getValidityPeriod(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setValidityPeriodFormattedDate(String validityPeriodFormattedDate) {
+
+	}
+
+	public String getReleaseDateFormattedDate() {
+		if (this.releaseDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setReleaseDateFormattedDate(String releaseDateFormattedDate) {
+
+	}
+
+}

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

@@ -10,6 +10,7 @@ import com.goafanti.demand.bo.DemandImportBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandManageDetailBo;
 import com.goafanti.demand.bo.DemandManageListBo;
+import com.goafanti.demand.bo.DemandPartnerListBo;
 import com.goafanti.portal.bo.DemandSearchDetailBo;
 import com.goafanti.portal.bo.DemandSearchListBo;
 
@@ -59,5 +60,7 @@ public interface DemandService {
 
 	int updateMatchAchievement(Demand d);
 
+	Pagination<DemandPartnerListBo> lisePartnerDemand(String employerId, Integer pNo, Integer pSize);
+
 
 }

+ 22 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -45,6 +45,7 @@ import com.goafanti.demand.bo.DemandImportBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandManageDetailBo;
 import com.goafanti.demand.bo.DemandManageListBo;
+import com.goafanti.demand.bo.DemandPartnerListBo;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.portal.bo.DemandSearchDetailBo;
 import com.goafanti.portal.bo.DemandSearchListBo;
@@ -81,7 +82,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			pNo = 1;
 		}
 
-		if (pSize == null || pSize < 0) {
+		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
 
@@ -116,7 +117,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			pNo = 1;
 		}
 
-		if (pSize == null || pSize < 0) {
+		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
 
@@ -572,5 +573,24 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return 0;
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<DemandPartnerListBo> lisePartnerDemand(String employerId, Integer pNo, Integer pSize) {
+		Map<String, Object> params = new HashMap<>();
+		
+		params.put("employerId", employerId);
+		
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		
+		return (Pagination<DemandPartnerListBo>) findPage("findPartnerDemandListByPage", "findPartnerDemandCount",
+				params, pNo, pSize);
+	}
+
 
 }

+ 49 - 6
src/main/java/com/goafanti/user/controller/UserPartnerApiController.java

@@ -6,11 +6,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.demand.service.DemandService;
 import com.goafanti.user.service.UserService;
 
 @RestController
@@ -18,6 +20,10 @@ import com.goafanti.user.service.UserService;
 public class UserPartnerApiController extends CertifyApiController {
 	@Resource
 	private UserService userService;
+	@Resource
+	private DemandService demandService;
+	@Resource
+	private AchievementService achievementService;
 
 	/**
 	 * "伙伴"主页详情
@@ -48,16 +54,53 @@ public class UserPartnerApiController extends CertifyApiController {
 		}
 		return res;
 	}
-
+	
+	/**
+	 * "伙伴"主页--科技需求列表
+	 */
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
-	public Result demandList() {
+	public Result demandList(String employerId, String pageNo, String pageSize) {
 		Result res = new Result();
+		if (StringUtils.isBlank(employerId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "employerId"));
+			return res;
+		}
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(demandService.lisePartnerDemand(employerId, pNo, pSize));
 		return res;
 	}
+	
+	
 
-	/*
-	 * public Result achievementList(){
-	 * 
-	 * }
+	/**
+	 * "伙伴"主页--科技成果列表
 	 */
+	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
+	public Result achievementList(String ownerId, String pageNo, String pageSize){
+		Result res = new Result();
+		if (StringUtils.isBlank(ownerId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "ownerId"));
+			return res;
+		}
+		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.listPartnerAchievement(ownerId, pNo, pSize));
+		return res;
+	}
+	 
 }