Browse Source

科技需求--详情获取匹配科技成果列表

Antiloveg 8 years ago
parent
commit
e0fb50f545

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

@@ -0,0 +1,124 @@
+package com.goafanti.achievement.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+/**
+ * 成果需求匹配列表对象
+ */
+public class AchievementDemandListBo {
+	private String id;
+	
+	private String serialNumber;
+	
+	private String dataCategory;
+	
+	private String name;
+	
+	private String keyword;
+	
+	private String category;
+	
+	private Integer ownerType;
+	
+	private String username;
+	
+	private String unitName;
+	
+	private Date releaseDate;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(String serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getDataCategory() {
+		return dataCategory;
+	}
+
+	public void setDataCategory(String 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 String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public Integer getOwnerType() {
+		return ownerType;
+	}
+
+	public void setOwnerType(Integer ownerType) {
+		this.ownerType = ownerType;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	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) {
+
+	}
+
+}

+ 11 - 0
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -47,6 +47,17 @@ public class AdminDemandApiController extends CertifyApiController {
 	private AftFileService	aftFileService;
 	
 	
+	/**
+	 * 成果需求匹配列表
+	 */
+	@RequestMapping(value = "/achievementDemand", method = RequestMethod.GET)
+	public Result achievementDemand(String id){
+		Result res = new Result();
+		res.setData(demandService.selectAchievementDemandListByDemandId(id));
+		return res;
+	}
+	
+	
 
 	/**
 	 * 上传技术需求批量导入Excel模板

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

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import com.goafanti.achievement.bo.AchievementDemandListBo;
 import com.goafanti.common.model.AchievementDemand;
 
 public interface AchievementDemandMapper {
@@ -20,4 +21,6 @@ public interface AchievementDemandMapper {
 	int deleteByAchievementId(String id);
 
 	int batchDeleteByAchievementIds(List<String> id);
+
+	List<AchievementDemandListBo> selectAchievementDemandListByDemandId(String id);
 }

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

@@ -65,4 +65,20 @@
             #{item}
         </foreach>
   </delete>
+  
+  <select id="selectAchievementDemandListByDemandId" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementDemandListBo">
+  	select  	
+		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
+	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
+    LEFT JOIN organization_identity oi on oi.uid = a.owner_id
+		where ad.demand_id = #{id,jdbcType=VARCHAR}
+		and a.deleted_sign = 0  
+		and a.audit_status = 4 
+		and a.release_status = 1
+  </select>
 </mapper>

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

@@ -2,6 +2,7 @@ package com.goafanti.demand.service;
 
 import java.util.List;
 
+import com.goafanti.achievement.bo.AchievementDemandListBo;
 import com.goafanti.common.model.Demand;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.demand.bo.DemandListBo;
@@ -43,4 +44,6 @@ public interface DemandService {
 
 	void saveDemand(Demand d, String validityPeriodFormattedDate, String keywords[]);
 
+	List<AchievementDemandListBo> selectAchievementDemandListByDemandId(String id);
+
 }

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

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.achievement.bo.AchievementDemandListBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AchievementDemandMapper;
 import com.goafanti.common.dao.AchievementKeywordMapper;
@@ -291,6 +292,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		demandMapper.insert(d);
 		disposeDemandKeyword(keywords, d, false);
 	}
+	
+	@Override
+	public List<AchievementDemandListBo> selectAchievementDemandListByDemandId(String id) {
+		return achievementDemandMapper.selectAchievementDemandListByDemandId(id);
+	}
 
 	private Map<String, Object> disposeParams(Integer auditStatus, String province, Integer serialNumber, String name,
 			String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
@@ -461,4 +467,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			demandKeywordMapper.insertBatch(list);
 		}
 	}
+
+	
 }