Browse Source

匹配列表新增用户ID--"uid"

Antiloveg 8 years ago
parent
commit
045f7e99f2

+ 10 - 0
src/main/java/com/goafanti/achievement/bo/AchievementDemandListBo.java

@@ -30,6 +30,16 @@ public class AchievementDemandListBo {
 	private String unitName;
 	
 	private Date releaseDate;
+	
+	private String uid;
+	
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
 
 	public String getId() {
 		return id;

+ 9 - 0
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -38,6 +38,15 @@ public class AchievementApiController extends CertifyApiController {
 	private AftFileService		aftFileService;
 	
 	/**
+	 * 批量导入科技成果
+	 */
+	@RequestMapping(value = "/importAchievement", method = RequestMethod.POST)
+	public Result importAchievement(){
+		Result res = new Result();
+		return res;
+	}
+	
+	/**
 	 * 成果需求匹配列表
 	 */
 	@RequestMapping(value = "/achievementDemand", method = RequestMethod.GET)

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

@@ -71,7 +71,7 @@
 		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category,  a.owner_type as ownerType, 
   		ui.username as username, oi.unit_name as unitName,
-  		a.release_date as releaseDate
+  		a.release_date as releaseDate, a.owner_id as uid
 	from achievement a 
 	LEFT JOIN achievement_demand ad  on ad.achievement_id = a.id
 	LEFT JOIN user_identity ui on ui.uid = a.owner_id
@@ -87,7 +87,7 @@
   		d.id, d.serial_number as serialNumber, d.data_category as dataCategory,
   		d.name, d.keyword, d.demand_type as demandType, 
   		d.release_date as releaseDate, d.validity_period as validityPeriod, oi.unit_name as unitName,
-  		ui.username
+  		ui.username, d.employer_id as uid
   	from demand d
   	LEFT JOIN achievement_demand ad on ad.demand_id = d.id
   	LEFT JOIN user_identity ui on ui.uid = d.employer_id

+ 12 - 2
src/main/java/com/goafanti/demand/bo/DemandAchievementListBo.java

@@ -7,6 +7,7 @@ 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;
+
 /**
  * 需求成果匹配LISTBO
  */
@@ -31,7 +32,16 @@ public class DemandAchievementListBo {
 	private String	unitName;
 
 	private String	username;
+
+	private String	uid;
 	
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
 
 	public String getId() {
 		return id;
@@ -48,7 +58,7 @@ public class DemandAchievementListBo {
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -73,7 +83,7 @@ public class DemandAchievementListBo {
 	public void setKeyword(String keyword) {
 		this.keyword = keyword;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDemandType() {
 		return demandType;