Antiloveg 8 years ago
parent
commit
64b082279d

+ 3 - 3
src/main/java/com/goafanti/activity/bo/ActivityListBo.java

@@ -117,7 +117,7 @@ public class ActivityListBo {
 		if (this.startTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -129,7 +129,7 @@ public class ActivityListBo {
 		if (this.endTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -141,7 +141,7 @@ public class ActivityListBo {
 		if (this.enrollDeadline == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 5 - 5
src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java

@@ -42,9 +42,9 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 		Map<String, Object> params = new HashMap<>();
 
 		try {
-			params.put("sTime", StringUtils.isBlank(sTime) ? null : DateUtils.parseDate(sTime, AFTConstants.YYYYMMDD));
+			params.put("sTime", StringUtils.isBlank(sTime) ? null : DateUtils.parseDate(sTime, AFTConstants.YYYYMMDDHHMMSS));
 			params.put("eTime", StringUtils.isBlank(eTime) ? null
-					: DateUtils.addDays(DateUtils.parseDate(eTime, AFTConstants.YYYYMMDD), 1));
+					: DateUtils.addDays(DateUtils.parseDate(eTime, AFTConstants.YYYYMMDDHHMMSS), 1));
 		} catch (ParseException e) {
 		}
 
@@ -97,13 +97,13 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 			String enrollDeadlineFormattedDate) {
 		try {
 			if (StringUtils.isNotBlank(startTimeFormattedDate)) {
-				a.setStartTime(DateUtils.parseDate(startTimeFormattedDate, AFTConstants.YYYYMMDD));
+				a.setStartTime(DateUtils.parseDate(startTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (StringUtils.isNotBlank(endTimeFormattedDate)) {
-				a.setEndTime(DateUtils.parseDate(endTimeFormattedDate, AFTConstants.YYYYMMDD));
+				a.setEndTime(DateUtils.parseDate(endTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (StringUtils.isNotBlank(enrollDeadlineFormattedDate)) {
-				a.setEnrollDeadline(DateUtils.parseDate(enrollDeadlineFormattedDate, AFTConstants.YYYYMMDD));
+				a.setEnrollDeadline(DateUtils.parseDate(enrollDeadlineFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			}
 		} catch (ParseException e) {
 		}

+ 1 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -939,7 +939,7 @@ public class CognizanceApiController extends CertifyApiController {
 		}
 
 		OrgRatepay ratepay = orgRatepayService.selectByPrimaryKey(id);
-		if (ratepay == null || TokenManager.getUserId().equals(ratepay.getUid())) {
+		if (ratepay == null || !TokenManager.getUserId().equals(ratepay.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
 			return res;
 		}

+ 3 - 3
src/main/java/com/goafanti/common/model/Activity.java

@@ -235,7 +235,7 @@ public class Activity {
 		if (this.startTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -247,7 +247,7 @@ public class Activity {
 		if (this.endTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -259,7 +259,7 @@ public class Activity {
 		if (this.enrollDeadline == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}