Antiloveg 8 anni fa
parent
commit
e498f5c7d7

+ 2 - 1
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -987,10 +987,11 @@
   		a.release_date as releaseDate, a.owner_type as ownerType, ui.username,
   		oi.unit_name as unitName, a.field_a as fieldA, a.field_b as fieldB,
   		a.transfer_price as transferPrice, a.maturity, a.transfer_mode as transferMode,
-  		a.bargaining_mode as bargainingMode
+  		a.bargaining_mode as bargainingMode, u.lvl as level
   	from achievement a 
   	left join user_identity ui on ui.uid = a.owner_id
   	left join organization_identity oi on oi.uid = a.owner_id
+  	left join user u on u.id = a.owner_id
   	where a.deleted_sign = 0 
   	<if test="keyword != null">
   		and a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"

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

@@ -903,10 +903,11 @@
 	  		d.serial_number as serialNumber, d.data_category as dataCategory, d.industry_category_a as industryCategoryA,
 	  		d.industry_category_b as industryCategoryB, d.demand_type as demandType, d.budget_cost as budgetCost,
 	  		d.problem_des as problemDes, d.release_date as releaseDate, ui.username,
-	  		oi.unit_name as unitName
+	  		oi.unit_name as unitName, u.lvl as level
   		from demand d
   		left join user_identity ui on d.employer_id = ui.uid
   		left join organization_identity oi on d.employer_id = oi.uid
+  		left join user u on u.id = d.employer_id
   		where d.deleted_sign = 0 and d.status = 0
   		<if test="keyword != null">
   			and d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"

+ 55 - 48
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -10,84 +10,96 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class AchievementSearchListBo {
-	private String id;
-	
+	private String		id;
+
 	/**
 	 * 编号
 	 */
-	private Integer serialNumber;
-	
+	private Integer		serialNumber;
+
 	/**
 	 * 关键词
 	 */
-	private String keyword;
-	
+	private String		keyword;
+
 	/**
 	 * 成果
 	 */
-	private String name;
-	
+	private String		name;
+
 	/**
 	 * 数据类别 (0--成果, 1--技术, 2--项目)
 	 */
-	private Integer dataCategory;
-	
+	private Integer		dataCategory;
+
 	/**
 	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
 	 */
-	private Integer category;
-	
+	private Integer		category;
+
 	/**
 	 * 所有人名称(个人)
 	 */
-	private String username;
-	
+	private String		username;
+
 	/**
 	 * 所有人名称(组织)
 	 */
-	private String unitName;
-	
+	private String		unitName;
+
 	/**
 	 * 发布时间
 	 */
-	private Date releaseDate;
-	
+	private Date		releaseDate;
+
 	/**
 	 * 所有人类型(0--个人,1--组织)
 	 */
-	private Integer ownerType;
-	
+	private Integer		ownerType;
+
 	/**
 	 * 行业分类A
 	 */
-	private Integer fieldA;
-	
+	private Integer		fieldA;
+
 	/**
 	 * 行业分类B
 	 */
-	private Integer fieldB;
-	
+	private Integer		fieldB;
+
 	/**
 	 * 交易价格
 	 */
-	private BigDecimal transferPrice;
-	
+	private BigDecimal	transferPrice;
+
 	/**
 	 * 成熟度(1--正在研发, 2-- 已有样品, 3-- 通过小试, 4-- 通过中试, 5-- 可以量产)
 	 */
-	private Integer maturity;
-	
+	private Integer		maturity;
+
 	/**
 	 * 交易方式(转让方式(0--完全转让,1--许可转让,2--技术入股))
 	 */
-	private Integer transferMode;
-	
+	private Integer		transferMode;
+
 	/**
 	 * 议价方式(0--面议,1--定价)
 	 */
-	private Integer bargainingMode;
-	
-	
+	private Integer		bargainingMode;
+
+	/**
+	 * 用户等级
+	 */
+	private Integer		level;
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getBargainingMode() {
 		return bargainingMode;
@@ -120,7 +132,7 @@ public class AchievementSearchListBo {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -129,7 +141,7 @@ public class AchievementSearchListBo {
 	public void setDataCategory(Integer dataCategory) {
 		this.dataCategory = dataCategory;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getCategory() {
 		return category;
@@ -162,18 +174,16 @@ public class AchievementSearchListBo {
 	public void setReleaseDate(Date releaseDate) {
 		this.releaseDate = releaseDate;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getOwnerType() {
 		return ownerType;
 	}
-	
+
 	public void setOwnerType(Integer ownerType) {
 		this.ownerType = ownerType;
-	} 
-	
-	
-	
+	}
+
 	public String getKeyword() {
 		return keyword;
 	}
@@ -181,8 +191,7 @@ public class AchievementSearchListBo {
 	public void setKeyword(String keyword) {
 		this.keyword = keyword;
 	}
-	
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getFieldA() {
 		return fieldA;
@@ -191,7 +200,7 @@ public class AchievementSearchListBo {
 	public void setFieldA(Integer fieldA) {
 		this.fieldA = fieldA;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getFieldB() {
 		return fieldB;
@@ -208,7 +217,7 @@ public class AchievementSearchListBo {
 	public void setTransferPrice(BigDecimal transferPrice) {
 		this.transferPrice = transferPrice;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getMaturity() {
 		return maturity;
@@ -217,7 +226,7 @@ public class AchievementSearchListBo {
 	public void setMaturity(Integer maturity) {
 		this.maturity = maturity;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTransferMode() {
 		return transferMode;
@@ -238,7 +247,5 @@ public class AchievementSearchListBo {
 	public void setReleaseDateFormattedDate(String releaseDateFormattedDate) {
 
 	}
-	
-	
 
 }

+ 13 - 0
src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java

@@ -73,6 +73,19 @@ public class DemandSearchListBo {
 	 * 组织雇主名称
 	 */
 	private String unitName;
+	
+	/**
+	 * 用户等级
+	 */
+	private Integer level;
+	
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
 
 	public String getId() {
 		return id;