Преглед изворни кода

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
wanghui пре 7 година
родитељ
комит
746f88e9f5
18 измењених фајлова са 205 додато и 104 уклоњено
  1. 10 1
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  2. 92 10
      src/main/java/com/goafanti/achievement/controller/UserAchievementApiController.java
  3. 3 0
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  4. 6 0
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  5. 1 1
      src/main/java/com/goafanti/admin/controller/AdminAuditApiController.java
  6. 2 0
      src/main/java/com/goafanti/common/dao/AchievementKeywordMapper.java
  7. 4 1
      src/main/java/com/goafanti/common/dao/AchievementMapper.java
  8. 2 0
      src/main/java/com/goafanti/common/dao/AchievementPublishMapper.java
  9. 4 4
      src/main/java/com/goafanti/common/enums/AchievementAuditStatus.java
  10. 6 1
      src/main/java/com/goafanti/common/mapper/AchievementKeywordMapper.xml
  11. 35 28
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  12. 5 0
      src/main/java/com/goafanti/common/mapper/AchievementPublishMapper.xml
  13. 1 7
      src/main/java/com/goafanti/common/mapper/DemandFollowDetailMapper.xml
  14. 1 14
      src/main/java/com/goafanti/common/mapper/DemandFollowMapper.xml
  15. 0 36
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  16. 10 0
      src/main/java/com/goafanti/common/model/Achievement.java
  17. 2 1
      src/main/java/com/goafanti/portal/bo/AchievementObject.java
  18. 21 0
      src/main/java/com/goafanti/portal/bo/AchievementResultObject.java

+ 10 - 1
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -70,7 +70,7 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		cooperationMode;
 
-	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 4, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		transferMode;
 
@@ -124,7 +124,16 @@ public class InputAchievement {
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer isHot;
+	
+	private Integer serialNumber;
 
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
 
 	public Integer getIsHot() {
 		return isHot;

+ 92 - 10
src/main/java/com/goafanti/achievement/controller/UserAchievementApiController.java

@@ -2,14 +2,18 @@ package com.goafanti.achievement.controller;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import javax.xml.soap.Detail;
 
+import org.apache.ibatis.annotations.ResultMap;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,15 +29,21 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.constant.PageConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.dao.AchievementKeywordMapper;
+import com.goafanti.common.dao.AchievementPublishMapper;
 import com.goafanti.common.enums.AchievementAuditStatus;
 import com.goafanti.common.enums.AchievementFields;
 import com.goafanti.common.enums.AchievementOrderStatus;
 import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.enums.DemandAuditStatus;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.AchievementOrder;
 import com.goafanti.common.model.AftFile;
+import com.goafanti.common.model.Demand;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.portal.bo.AchievementObject;
+import com.goafanti.portal.bo.AchievementResultObject;
 
 @RestController
 @RequestMapping(value = "/api/user/achievement")
@@ -44,7 +54,10 @@ public class UserAchievementApiController extends CertifyApiController {
 	private AftFileService			aftFileService;
 	@Resource
 	private AchievementOrderService	achievementOrderService;
-
+	@Autowired
+	private AchievementKeywordMapper		achievementKeywordMapper;
+	@Autowired
+	private AchievementPublishMapper achievementPublishMapper;
 	/**
 	 * 成果需求匹配列表
 	 */
@@ -147,6 +160,23 @@ public class UserAchievementApiController extends CertifyApiController {
 		return res;
 	}
 
+	@RequestMapping(value = "/achievementDetail",method=RequestMethod.GET)
+	private Result Detail(String id) {
+		Result result=new Result();
+		if (StringUtils.isBlank(id)) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
+			return result;
+		}
+		
+		AchievementResultObject achievementObjects=achievementService.getAchievementDetailById(id);
+		List<String>keywords=achievementKeywordMapper.getKeywordsByAchievementId(id);
+		List<String> publishPages=achievementPublishMapper.getPublishPagesById(id);
+		achievementObjects.setKeywords(keywords);
+		achievementObjects.setPublishPages(publishPages);
+		result.setData(achievementObjects);
+//		AchievementResultObject achievementResultObject=new AchievementResultObject()
+		return result;
+	}
 	/**
 	 * 个人成果详情详情
 	 */
@@ -190,7 +220,7 @@ public class UserAchievementApiController extends CertifyApiController {
 		}
 
 		if (StringUtils.isBlank(ia.getId())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
 			return res;
 		}
 
@@ -221,7 +251,63 @@ public class UserAchievementApiController extends CertifyApiController {
 		res.setData(achievementService.updateAchievement(a, keywords, null,webPages,appPages));
 		return res;
 	}
-
+	/**
+	 * 刷新发布时间
+	 * @param id
+	 * @param auditStatus
+	 * @return
+	 */
+	@RequestMapping(value = "/refreshPublish", method = RequestMethod.POST)
+	public Result refreshPublish(String id,Integer auditStatus){
+		Result res = new Result();
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
+			return res;
+		}
+		if (null == auditStatus) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "成果状态错误", "成果状态"));
+			return res;
+		}
+		if (AchievementAuditStatus.AUDITED.getCode() != auditStatus) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法刷新发布,"));
+			return res;
+		}
+		Achievement a = new Achievement();
+		a.setId(id);
+		a.setReleaseDate(new Date());
+//		a.setAuditStatus(auditStatus);
+		achievementService.updateByPrimaryKeySelective(a);
+		return res;
+	}
+	
+	/**
+	 * 提交审核
+	 * @param id
+	 * @param auditStatus
+	 * @return
+	 */
+	@RequestMapping(value = "/commit", method = RequestMethod.POST)
+	public Result refreshAuditStatus(String id){
+		Result res = new Result();
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
+			return res;
+		}
+		AchievementResultObject achievementResultObject=achievementService.getAchievementDetailById(id);
+		if(achievementResultObject==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
+			return res;
+		}
+		if (AchievementAuditStatus.CREATE.getCode() != achievementResultObject.getAuditStatus()) {
+		res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核,"));
+		return res;
+	} 
+		Achievement a = new Achievement();
+		a.setId(id);
+		a.setAuditStatus(AchievementAuditStatus.SUBMIT.getCode());
+		achievementService.updateByPrimaryKeySelective(a);
+		return res;
+	}
 	/**
 	 * 下载文本文件
 	 */
@@ -325,20 +411,16 @@ public class UserAchievementApiController extends CertifyApiController {
 		}
 
 		if (StringUtils.isBlank(ia.getKeyword())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词1"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
 			return res;
 		}
 
 		if (null == keywords || keywords.length < 1) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词2"));
-			return res;
-		}
-
-		if (null == ia.getCooperationMode()) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
+			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, "", "关键词长度"));

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

@@ -14,6 +14,7 @@ import com.goafanti.demand.bo.DemandAchievementListBo;
 import com.goafanti.portal.bo.AchievementDetailBo;
 import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
+import com.goafanti.portal.bo.AchievementResultObject;
 
 public interface AchievementService {
 
@@ -81,6 +82,8 @@ public interface AchievementService {
 	
 	AchievementObject getAchievementDetail(String id,Integer type);
 	
+	AchievementResultObject getAchievementDetailById(String id);
+	
 	List<AchievementObject>getBoutiquePatent(int size);
 	
 	List<AchievementObject>guessYouLike(int size);

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

@@ -756,6 +756,12 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.guessYouLike(size);
 	}
 
+	@Override
+	public AchievementResultObject getAchievementDetailById(String id) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getAchievementDetailById(id);
+	}
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<AchievementListBo> listAchievement(String name, String ownerName, Integer category,

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminAuditApiController.java

@@ -143,7 +143,7 @@ public class AdminAuditApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!AchievementAuditStatus.INAUDIT.getCode().equals(a.getAuditStatus())) {
+		if (!AchievementAuditStatus.SUBMIT.getCode().equals(a.getAuditStatus())) {
 			res.getError().add(buildError("", "当前成果状态无法审核!"));
 			return res;
 		}

+ 2 - 0
src/main/java/com/goafanti/common/dao/AchievementKeywordMapper.java

@@ -27,4 +27,6 @@ public interface AchievementKeywordMapper {
 	void batchDeleteByAchievementId(String achievementiId);
 
 	int batchDeleteByAchievementIds(List<String> id);
+	
+	List<String >getKeywordsByAchievementId(String id);
 }

+ 4 - 1
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -14,6 +14,7 @@ import com.goafanti.common.model.Achievement;
 import com.goafanti.portal.bo.AchievementDetailBo;
 import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
+import com.goafanti.portal.bo.AchievementResultObject;
 
 public interface AchievementMapper {
 	int deleteByPrimaryKey(String id);
@@ -65,7 +66,9 @@ public interface AchievementMapper {
 	AchievementObject getAchievementDetail(String id,Integer type);
 	
 	List<AchievementObject>getBoutiquePatent(int size);
-	
+	    
 	List<AchievementObject>guessYouLike(int size);
 	
+	AchievementResultObject getAchievementDetailById(String id);
+	
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/AchievementPublishMapper.java

@@ -97,4 +97,6 @@ public interface AchievementPublishMapper {
 	int checkExisting(AchievementPublish a);
 	
 	int batchDeleteByAchievementId(String id) ;
+	
+	List<String>getPublishPagesById(String id);
 }

+ 4 - 4
src/main/java/com/goafanti/common/enums/AchievementAuditStatus.java

@@ -7,11 +7,11 @@ import org.apache.commons.lang3.StringUtils;
 
 public enum AchievementAuditStatus {
 	
-	CREATE(0, "未提交审核草稿"),
+	CREATE(0, "草稿"),
 	SUBMIT(1, "提交审核"),
-	INAUDIT(2, "审核中"),
-	AUDITED(3,"审核通过"),
-	UNAUDITED(4,"审核未通过"),
+	AUDITED(2,"审核通过"),
+	UNAUDITED(3,"审核通过"),
+	REVOKE(4,"撤销发布"),
 	OTHER(5, "其他");
 
 	private AchievementAuditStatus(Integer code, String desc) {

+ 6 - 1
src/main/java/com/goafanti/common/mapper/AchievementKeywordMapper.xml

@@ -111,5 +111,10 @@
   	from 
   	achievement_keyword where achievement_id = #{id,jdbcType=VARCHAR}
   </select>
-  
+  <select id="getKeywordsByAchievementId" parameterType="java.lang.String" resultType="java.lang.String">
+  select
+  keyword
+  from achievement_keyword ak
+  where ak.achievement_id = #{id}
+  </select>
 </mapper>

+ 35 - 28
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -103,7 +103,7 @@
     #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
       #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER},
-       #{internationalFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER}),#{isHot,jdbcType=INTEGER}
+       #{internationalFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER},#{isHot,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Achievement">
     insert into achievement
@@ -567,48 +567,21 @@
       field_b = #{fieldB,jdbcType=INTEGER},
       field_c = #{fieldC,jdbcType=INTEGER},
       maturity = #{maturity,jdbcType=INTEGER},
-      maturity_picture_url = #{maturityPictureUrl,jdbcType=LONGVARCHAR},
-      maturity_text_file_url = #{maturityTextFileUrl,jdbcType=VARCHAR},
-      maturity_video_url = #{maturityVideoUrl,jdbcType=VARCHAR},
       innovation = #{innovation,jdbcType=INTEGER},
       owner_id = #{ownerId,jdbcType=VARCHAR},
-      owner_name = #{ownerName,jdbcType=VARCHAR},
-      owner_type = #{ownerType,jdbcType=INTEGER},
-      owner_id_number = #{ownerIdNumber,jdbcType=VARCHAR},
-      owner_mobile = #{ownerMobile,jdbcType=VARCHAR},
-      owner_email = #{ownerEmail,jdbcType=VARCHAR},
       owner_postal_address = #{ownerPostalAddress,jdbcType=VARCHAR},
-      cooperation_mode = #{cooperationMode,jdbcType=INTEGER},
       transfer_mode = #{transferMode,jdbcType=INTEGER},
       bargaining_mode = #{bargainingMode,jdbcType=INTEGER},
       transfer_price = #{transferPrice,jdbcType=DECIMAL},
-      technical_scene = #{technicalScene,jdbcType=VARCHAR},
-      breakthrough = #{breakthrough,jdbcType=VARCHAR},
       patent_case = #{patentCase,jdbcType=VARCHAR},
-      awards = #{awards,jdbcType=VARCHAR},
       team_des = #{teamDes,jdbcType=VARCHAR},
       parameter = #{parameter,jdbcType=VARCHAR},
-      tech_plan_url = #{techPlanUrl,jdbcType=VARCHAR},
-      business_plan_url = #{businessPlanUrl,jdbcType=VARCHAR},
-      org_id = #{orgId,jdbcType=VARCHAR},
-      org_name = #{orgName,jdbcType=VARCHAR},
-      org_address = #{orgAddress,jdbcType=VARCHAR},
-      org_email = #{orgEmail,jdbcType=VARCHAR},
-      org_contacts = #{orgContacts,jdbcType=VARCHAR},
-      org_contacts_mobile = #{orgContactsMobile,jdbcType=VARCHAR},
-      contacts = #{contacts,jdbcType=INTEGER},
-      manager_id = #{managerId,jdbcType=VARCHAR},
-      salesman_id = #{salesmanId,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
       release_status = #{releaseStatus,jdbcType=INTEGER},
       release_date = #{releaseDate,jdbcType=TIMESTAMP},
       deleted_sign = #{deletedSign,jdbcType=INTEGER},
       audit_status = #{auditStatus,jdbcType=INTEGER},
-      tech_broker_id = #{techBrokerId,jdbcType=VARCHAR},
       country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
       international_flag = #{internationalFlag,jdbcType=INTEGER},
-      jmrh_flag = #{jmrhFlag,jdbcType=INTEGER},
       boutique = #{boutique,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -1312,4 +1285,38 @@ order by release_date limit #{0}
 	   and  a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 </select>
+<select id="getAchievementDetailById" resultType="com.goafanti.portal.bo.AchievementResultObject" >
+select
+a.id,
+	a.name as name,
+	a.transfer_mode as transferMode,
+	a.technical_picture_url as technicalPictureUrl,
+	a.maturity,
+	a.category,
+	a.data_category as dataCategory,
+	a.owner_postal_address as city,
+	fg.name as fieldAS,
+	fgg.name as fieldBS,
+	a.release_date as releaseDate,
+	a.introduction,
+	a.patent_case as patentCase,
+	a.parameter,
+	a.team_des as teamDes,
+	a.field_a as fieldA,
+	a.field_b as fieldB,
+	a.innovation,
+	a.transfer_mode as transferMode,
+	a.bargaining_mode as bargainingMode,
+	a.boutique,
+	a.is_hot as isHot,
+	a.audit_status as auditStatus
+from
+	achievement a
+left join field_glossory fg on
+	fg.id = a.field_a
+left join field_glossory fgg on
+	fgg.id = a.field_b
+where
+	a.id = #{0}
+</select>
 </mapper>

+ 5 - 0
src/main/java/com/goafanti/common/mapper/AchievementPublishMapper.xml

@@ -439,4 +439,9 @@ where 1=1
 	  <delete id="batchDeleteByAchievementId" parameterType="java.lang.String">
 	 	delete from achievement_publish where achievement_id = #{id,jdbcType=VARCHAR}
 	 </delete>
+	 
+	 <select id="getPublishPagesById" resultType="java.lang.String">
+	 select publish_page from achievement_publish ap
+	 where ap.achievement_id = #{id}
+	 </select>
 </mapper>

+ 1 - 7
src/main/java/com/goafanti/common/mapper/DemandFollowDetailMapper.xml

@@ -283,11 +283,5 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <select id="selectDemandFollowDetail" parameterType="String" resultType="com.goafanti.demand.bo.DemandFollowDetailListBo">
-    select 
-     id, demand_follow_id as demandFollowId, remarks, result,create_time as createTime
-    from demand_follow_detail
-    where demand_follow_id= #{id,jdbcType=VARCHAR}
-    order by create_time desc  
-  </select>
+
 </mapper>

+ 1 - 14
src/main/java/com/goafanti/common/mapper/DemandFollowMapper.xml

@@ -349,20 +349,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  <select id="findDemandFollowListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandFollowListBo">
-      select df.id ,df.demand_id as demandId,df.organization,df.contacts,df.contact_mobile contactMobile,df.remark,
-  df.`result`,df.last_follow_time as lastFollowTime,d.name,d.employer_name as employerName,df.sources,
-  d.employer_contacts_mobile as employerContactsMobile,d.employer_contacts_mailbox as employerContactsMailbox,
-  d.create_time as createTime, a.name as adminName ,df.sources
-    from  demand_follow df
-    left join demand d on df.demand_id=d.id
-    left join admin a on d.tech_broker_id=a.id 
-    where df.demand_id=#{id,jdbcType=VARCHAR}
-    order by d.serial_number desc
-  	<if test="page_sql!=null">
-		${page_sql}
-	</if>
-  </select>
+
   
   <select id="findDemandFollowCount" parameterType="String" resultType="java.lang.Integer">
    select count(0)

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

@@ -663,42 +663,6 @@
     </foreach>
   </insert>
   
-  <select id="selectDemandDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.DemandSearchDetailBo"> 
-  	select 
-  		d.id, 
-  		d.employer_name as employerName,
-  		d.serial_number as serialNumber, 
-  		d.keyword, 
-  		d.data_category as dataCategory, 
-  		d.name, 
-  		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, 
-  		d.technical_requirements as technicalRequirements,
-  		d.picture_url as pictureUrl, 
-  		d.text_file_url as textFileUrl, 
-  		d.video_url as videoUrl,
-  		d.fixed_cycle as fixedCycle, 
-  		d.people_number as peopleNumber, 
-  		d.fixed_scheme as fixedScheme,
-  		d.cost_escrow as costEscrow, 
-  		d.validity_period as validityPeriod, 
-  		ui.username,
-  		oi.unit_name as unitName, 
-  		di.id as demandInterestId, 
-  		do.id as demandOrderId, 
-  		do.status as orderStatus
-  	from demand d
-  	left join user_identity ui on ui.uid = d.employer_id
-  	left join organization_identity oi on oi.uid = d.employer_id
-  	left join demand_interest di on di.demand_id = d.id and di.uid = #{0}
-  	left join demand_order do on do.demand_id = d.id and do.uid = #{0} and do.status <![CDATA[ <> ]]> 6
-  	where d.id = #{1}
-  </select>
-  
   <select id="findUserPortalDemandDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.DemandPortalDetailBo">
   	SELECT
 		d.id,

+ 10 - 0
src/main/java/com/goafanti/common/model/Achievement.java

@@ -294,6 +294,16 @@ public class Achievement {
 	 * @mbg.generated  Fri Jun 15 10:39:21 CST 2018
 	 */
 	private Integer infoSources;
+	private String introduction;
+	
+
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column achievement.id

+ 2 - 1
src/main/java/com/goafanti/portal/bo/AchievementObject.java

@@ -23,9 +23,10 @@ public class AchievementObject extends InputAchievement {
 	private String dataCategoryS;
 	private String firstPicture;
 	private String city;
-	
+
 	public String getCity() {
 		return city;
+		
 	}
 	public void setCity(String city) {
 		this.city = city;

+ 21 - 0
src/main/java/com/goafanti/portal/bo/AchievementResultObject.java

@@ -0,0 +1,21 @@
+package com.goafanti.portal.bo;
+
+import java.util.List;
+
+public class AchievementResultObject extends AchievementObject{
+private List<String>publishPages;
+private List<String>keywords;
+public List<String> getPublishPages() {
+	return publishPages;
+}
+public void setPublishPages(List<String> publishPages) {
+	this.publishPages = publishPages;
+}
+public List<String> getKeywords() {
+	return keywords;
+}
+public void setKeywords(List<String> keywords) {
+	this.keywords = keywords;
+}
+
+}