Browse Source

科技成果审核、发布

Michael 8 years ago
parent
commit
0a341c454e

+ 26 - 0
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -57,6 +57,11 @@ public class AchievementListBo {
 	 * 发布时间
 	 */
 	private Date	releaseDate;
+	
+	/**
+	 * 发布时间
+	 */
+	private Integer	releaseStatus;
 
 	/**
 	 * 审核状态
@@ -67,6 +72,11 @@ public class AchievementListBo {
 	 * 技术经纪人
 	 */
 	private String	techBrokerId;
+	
+	/**
+	 * 技术经纪人IDD
+	 */
+	private String	techBrokerIdd;
 
 	/**
 	 * 认证所有人名称
@@ -141,6 +151,22 @@ public class AchievementListBo {
 	
 	private String buyIntention;
 	
+	public Integer getReleaseStatus() {
+		return releaseStatus;
+	}
+
+	public void setReleaseStatus(Integer releaseStatus) {
+		this.releaseStatus = releaseStatus;
+	}
+
+	public String getTechBrokerIdd() {
+		return techBrokerIdd;
+	}
+
+	public void setTechBrokerIdd(String techBrokerIdd) {
+		this.techBrokerIdd = techBrokerIdd;
+	}
+
 	public String getOrgId() {
 		return orgId;
 	}

+ 2 - 1
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -406,7 +406,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      * 成果撤消发布(下架)
      */
     @RequestMapping(value = "/offShelf", method = RequestMethod.POST)
-    public Result offShelf(String id) {
+    public Result offShelf(String id,Integer releaseStatus) {
         Result res = new Result();
         if (StringUtils.isBlank(id)) {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
@@ -417,6 +417,7 @@ public class AdminAchievementApiController extends CertifyApiController {
             res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
             return res;
         }
+        a.setReleaseStatus(releaseStatus);
         res.setData(achievementService.updateReleaseStatus(a));
         return res;
     }

+ 10 - 4
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -355,7 +355,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
 			a.setReleaseDate(now.getTime());
-			a.setReleaseStatus(DemandReleaseStatus.RELEASED.getCode());
+			a.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
 			a.setTechBrokerId(techBroderId);
 			if (StringUtils.isNotBlank(a.getKeyword())) {
 				String[] keywords = a.getKeyword().trim().split(",|,");
@@ -396,8 +396,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@Override
 	public int updateReleaseStatus(Achievement a) {
-		a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
-		a.setReleaseStatus(AchievementReleaseStatus.UNRELEASE.getCode());
+		a.setAuditStatus(AchievementAuditStatus.AUDITED.getCode());
+		/*a.setReleaseStatus(AchievementReleaseStatus.UNRELEASE.getCode());*/
+		if(a.getReleaseStatus()==1){
+			Calendar now = Calendar.getInstance();
+			now.set(Calendar.MILLISECOND, 0);
+			a.setReleaseDate(now.getTime());
+			System.out.println("*******************"+a.getReleaseDate());
+		}
 		achievementDemandMapper.deleteByAchievementId(a.getId());
 		achievementKeywordMapper.batchDeleteByAchievementId(a.getId());
 		achievementMapper.updateByPrimaryKeySelective(a);
@@ -411,7 +417,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 				achievementDemandCountMapper.updateByPrimaryKeySelective(adc);
 			}
 		}
-		return achievementMapper.updateReleaseDate(a.getId());
+		return achievementMapper.updateByPrimaryKeySelective(a);
 	}
 
 	@Override

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

@@ -856,7 +856,8 @@
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
   		a.owner_id as ownerId, a.org_id as orgId, a.contacts,a.create_time as createTime,
-  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
+  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique,ad.id techBrokerIdd,
+  		a.release_status as releaseStatus
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
 	</if>