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

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Michael пре 8 година
родитељ
комит
19f6f2cdd9

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

@@ -445,7 +445,7 @@ public class AchievementListBo {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 
 	}

+ 20 - 0
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -47,6 +47,11 @@ public class AchievementPartnerListBo {
 	 * 发布时间
 	 */
 	private Date		releaseDate;
+	
+	/**
+	 * 创建时间
+	 */
+	private Date		createTime;
 
 	/**
 	 * 应用领域1
@@ -285,6 +290,21 @@ public class AchievementPartnerListBo {
 	public void setOwnerPostalAddress(String ownerPostalAddress) {
 		this.ownerPostalAddress = ownerPostalAddress;
 	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
 	
 	
 	

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

@@ -871,7 +871,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			a.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
 			createAuditorNotice(a);
 		} else {
-			a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
+			a.setAuditStatus(AchievementAuditStatus.INAUDIT.getCode());
 		}
 		if (null!=TokenManager.getUserId()) {
 			a.setOwnerId(TokenManager.getUserId());

+ 25 - 18
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -374,6 +374,7 @@ public class AppUserController extends BaseApiController {
 		res.setData(demandService.selectDemandDetail( id));
 		return res;
 	}
+	
 	/**
      * 新增成果
      */
@@ -382,15 +383,18 @@ public class AppUserController extends BaseApiController {
     private Result appAddAchievement(@Valid InputAchievement ia, BindingResult bindingResult,
             String keyword1,String keyword2,String keyword3) {
         Result res = new Result();
-        String[] keywords ;
-        if (null==keyword3) {
-        	keywords=new String[]{keyword1,keyword2}; 
-        }else if (null==keyword2) {
-        	keywords=new String[]{keyword1};
-        }else {
-        	keywords=new String[]{keyword1,keyword2,keyword3};
+        List<String> keyword=new ArrayList<>();
+        if (!StringUtils.isBlank(keyword1)) {
+        	keyword.add(keyword1);
+		}
+        if (!StringUtils.isBlank(keyword2)) {
+        	keyword.add(keyword2);
 		}
-        System.out.println( StringUtils.join(keywords,","));
+        if (!StringUtils.isBlank(keyword3)) {
+        	keyword.add(keyword3);
+		}
+        String[] keywords=(String[])keyword.toArray(new String[keyword.size()]);
+        System.out.println(StringUtils.join(keywords,","));
         ia.setKeyword(StringUtils.join(keywords,","));
         if (bindingResult.hasErrors()) {
             res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -447,21 +451,23 @@ public class AppUserController extends BaseApiController {
 			String keyword1,String keyword2,String keyword3,
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
-		 String[] keywords ;
-	        if (null==keyword3) {
+		 /*String[] keywords ;
+	       if (StringUtils.isNotEmpty(keyword3)) {
 	        	keywords=new String[]{keyword1,keyword2}; 
-	        }else if (null==keyword2) {
+	        }else if (StringUtils.isNotEmpty(keyword2)) {
 	        	keywords=new String[]{keyword1};
 	        }else {
 	        	keywords=new String[]{keyword1,keyword2,keyword3};
 			}
-	        demand.setKeyword(StringUtils.join(keywords,","));
+	        if (null!=keywords) {
+	        	demand.setKeyword(StringUtils.join(keywords,","));
+			}*/
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					DemandFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		res = disposeDemand(res, demand, keywords);
+		res = disposeDemand(res, demand, null);
 		if (!res.getError().isEmpty()) {
 			return res;
 		}
@@ -473,7 +479,7 @@ public class AppUserController extends BaseApiController {
 		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
 			d.setUrgentMoney(demand.getUrgentMoney());
 		}
-		res.setData(demandService.saveAppUserDemand(d, validityPeriodFormattedDate, keywords));
+		res.setData(demandService.saveAppUserDemand(d, validityPeriodFormattedDate, null));
 		return res;
 	}
 	
@@ -483,7 +489,7 @@ public class AppUserController extends BaseApiController {
 			return res;
 		}
 
-		if (StringUtils.isBlank(demand.getKeyword())) {
+		/*if (StringUtils.isBlank(demand.getKeyword())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
 			return res;
 		}
@@ -491,7 +497,7 @@ public class AppUserController extends BaseApiController {
 		if (null == keywords || keywords.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
 			return res;
-		}
+		}*/
 
 		if (null == demand.getIndustryCategoryA()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到行业类别", "行业类别"));
@@ -507,13 +513,14 @@ public class AppUserController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到问题说明", "问题说明"));
 			return res;
 		}
+		
 
-		for (int i = 0; i < keywords.length; i++) {
+		/*for (int i = 0; i < keywords.length; i++) {
 			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "关键词长度"));
 				return res;
 			}
-		}
+		}*/
 
 		return res;
 	}

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

@@ -1766,7 +1766,7 @@
   	  
   select 
 	  a.id, a.boutique,a.name,a.category, a.audit_status as auditStatus,ifnull(t.x,0) as buyIntention,
-	  a.release_date as releaseDate,ifnull(i.y,0) as countInterest
+	  a.release_date as releaseDate,a.create_time as createTime,ifnull(i.y,0) as countInterest
 	from  achievement a 
 	left join (select count(0) as x, tl.commodity_id from t_order tr
 				left join t_order_detail tl on tr.order_no=tl.order_no
@@ -1778,6 +1778,7 @@
 	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
+  	order by a.create_time desc
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>

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

@@ -1535,10 +1535,9 @@
   </select>
   
   <select id="findAppMyDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
-  		
-	select 
+  	select 
 	  d.id, d.boutique,d.name, d.audit_status as auditStatus,ifnull(t.x,0) as orderCount,
-	  d.release_date as releaseDate,ifnull(i.y,0) as countInterest
+	  d.release_date as releaseDate,d.create_time as createTime,ifnull(i.y,0) as countInterest
 	from  demand d 
 	left join (select count(0) as x,tl.commodity_id from t_order tr
 				left join t_order_detail tl on tl.order_no=tr.order_no

+ 1 - 1
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -378,7 +378,7 @@ public class DemandListBo {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

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

@@ -985,17 +985,14 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		now.set(Calendar.MILLISECOND, 0);
 		d.setStatus(DemandStatus.UNRESOLVED.getCode());
 		d.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
-
 		d.setPrincipalId(TokenManager.getAdminId());
-		if (DemandAuditStatus.SUBMIT.getCode().equals(d.getAuditStatus())) {
-			d.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
-			createAuditorNotice(d);
-		} else {
-			d.setAuditStatus(DemandAuditStatus.CREATE.getCode());
+		d.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
+		createAuditorNotice(d);
+		if (null==d.getKeyword()) {
+			d.setKeyword("");
 		}
-
 		d.setCreateTime(now.getTime());
-		disposeDemandKeyword(keywords, d, false);
+		//disposeDemandKeyword(keywords, d, false);
 		return demandMapper.insert(d);
 	}