swagger mysql

src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java

@@ -29,6 +29,9 @@ public class ActivityInstanceVO implements Serializable {
     @ApiModelProperty(value = "活动池信息", hidden = true)
     private ActivityScheduleVO scheduleVO;
 
+    @ApiModelProperty(value = "类型CODE", hidden = true)
+    private String categoryCode;
+
 
     @ApiModelProperty(value = "活动名称", required = true)
     @NotBlank(message = "请输入活动名称")

src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java

@@ -19,8 +19,14 @@ public class ActivityScheduleVO {
     @NotBlank(message = "请输入活动池名称")
     private String name;
 
+    @ApiModelProperty(value = "分类ID", required = true)
+    @NotBlank(message = "请输入分类ID")
+    private Integer categoryId;
+
+    @ApiModelProperty(value = "分类CODE", required = true)
+    private String categoryCode;
+
     @ApiModelProperty(value = "活动池图片", required = true)
-    @NotBlank(message = "请上传活动池图片")
     private String logo;
 
     @ApiModelProperty(value = "活动池描述")

src/main/java/com/kiisoo/ic/activity/entity/PmnActivityInstance.java

@@ -26,6 +26,8 @@ public class PmnActivityInstance {
     @ApiModelProperty(value = "内容")
     private String content;
 
+    private String categoryCode;
+
     @ApiModelProperty(value = "活动规划id")
     private Long scheduleId;
 

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java

@@ -100,11 +100,16 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
         }
         pmnActivityInstance.setEndTime(activityInstanceVO.getEndTime());
         pmnActivityInstance.setContent("");
+        pmnActivityInstance.setCategoryCode(activityInstanceVO.getCategoryCode());
         pmnActivityInstance.setName(activityInstanceVO.getName());
         pmnActivityInstance.setIsAddition(2L);
         if (pmnActivityInstance.getStatus() == null) {
+            if(pmnActivityInstance.getBeginTime().compareTo(new Date()) == -1) {
+                pmnActivityInstance.setStatus(2L);
+            }else {
                 pmnActivityInstance.setStatus(1L);
             }
+        }
         if (isTerminate) {
             pmnActivityInstance.setStatus(3L);
         }

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java

@@ -54,6 +54,8 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl<PmnActivitySched
         activitySchedule.setId(activityScheduleVO.getId());
         activitySchedule.setName(activityScheduleVO.getName());
         activitySchedule.setLogo(activityScheduleVO.getLogo());
+        activitySchedule.setCategoryId(activityScheduleVO.getCategoryId());
+        activitySchedule.setCategoryCode(activityScheduleVO.getCategoryCode());
         activitySchedule.setStatus(1);
         activitySchedule.setUpdateTime(new Date());
         boolean saveActivitySchedule = saveOrUpdate(activitySchedule);
@@ -123,6 +125,8 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl<PmnActivitySched
         activityScheduleVO.setLogo(activitySchedule.getLogo());
         activityScheduleVO.setName(activitySchedule.getName());
         activityScheduleVO.setDescription(activitySchedule.getDescription());
+        activityScheduleVO.setCategoryId(activitySchedule.getCategoryId());
+        activityScheduleVO.setCategoryCode(activitySchedule.getCategoryCode());
         PmnActivityPromotion activityPromotion = activityPromotionService.getOne(Wrappers.<PmnActivityPromotion>lambdaQuery().eq(PmnActivityPromotion::getScheduleId, activitySchedule.getId()));
         if(activityPromotion != null) {
             List<PmnActivityPromotionParam> activityPromotionParams = new ArrayList<>();

src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java

@@ -121,6 +121,9 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
             PromotionSrcVO vo = new PromotionSrcVO();
             BeanUtils.copyProperties(src, vo);
             ActivityInstanceVO instance = pmnActivityInstanceService.getVO(src.getInstanceId());
+            if(instance.getStatus() != 2) {
+                continue;
+            }
 //            if (
 //                    !((instance.getBeginTime().compareTo(new Date()) == -1 || instance.getBeginTime().compareTo(new Date()) == 0) &&
 //                            instance.getEndTime().compareTo(new Date()) == 1