活动发起时间填写限制。

donate-console/src/main/java/com/uas/console/donate/service/impl/ActivityServiceImpl.java

@@ -114,8 +114,9 @@ public class ActivityServiceImpl implements ActivityService{
             Activity act = activityDao.save(activity);
             if (!CollectionUtils.isEmpty(activity.getAwards())) {
                 Set<Award> awards = new HashSet<>();
-                for (Award award : awards) {
+                for (Award award : activity.getAwards()) {
                     award.setActivity(act);
+                    awards.add(award);
                 }
                 awardDao.save(awards);
             }

donate-console/src/main/webapp/resources/view/activity/activity_launch.html

@@ -641,9 +641,9 @@
                                    ng-click="openDatePicker($event, activity, '$startTimeOpened')">
                             <span class="fl"  style="margin-left: 5px;">至</span>
                             <input type="text" ng-model="activity.endTime" readonly required
-                                   class="date-choose f1 form-control" placeholder="结束时间"
+                                   class="date-choose f1 form-control" placeholder="结束时间" title="请先选择活动开始时间"
                                    datepicker-popup="yyyy-MM-dd" is-open="activity.$endTimeOpened" min-date="activity.startTime"
-                                   ng-required="true"
+                                   ng-required="true" ng-disabled="activity.startTime == null"
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                    ng-click="openDatePicker($event, activity, '$endTimeOpened')">
@@ -656,18 +656,18 @@
                         <label class="control-label fl">兑奖时间</label>
                         <div class="active-time fl">
                             <input type="text" ng-model="activity.receiveStartTime" readonly style="float:left" required
-                                   class="date-choose f1 form-control" placeholder="开始兑奖时间"
+                                   class="date-choose f1 form-control" placeholder="开始兑奖时间" title="请先选择活动开始及结束时间"
                                    datepicker-popup="yyyy-MM-dd" is-open="activity.$receiveStartTimeOpened"
                                    ng-required="true" min-date="activity.startTime" max-date="activity.endTime"
-                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   current-text="今天" clear-text="清除" close-text="关闭" ng-disabled="activity.startTime == null || activity.endTime == null"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                    ng-click="openDatePicker($event, activity, '$receiveStartTimeOpened')">
                             <span class="fl" style="margin-left: 5px;">至</span>
                             <input type="text" ng-model="activity.receiveEndTime" readonly required
-                                   class="date-choose f1 form-control" placeholder="截止兑奖时间"
+                                   class="date-choose f1 form-control" placeholder="截止兑奖时间"  title="请先选择兑奖开始时间"
                                    datepicker-popup="yyyy-MM-dd" is-open="activity.$receiveEndTimeOpened"
                                    ng-required="true" min-date="activity.receiveStartTime" max-date="activity.endTime"
-                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   current-text="今天" clear-text="清除" close-text="关闭" ng-disabled="activity.receiveStartTime == null"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                    ng-click="openDatePicker($event, activity, '$receiveEndTimeOpened')">