summit activity

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivitySaveDTO.java

@@ -30,11 +30,11 @@ public class SummitActivitySaveDTO implements Serializable {
 
 
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
 
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
 
     @ApiModelProperty(value = "报名截止时间（不展示）")

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SummitActivity.java

@@ -53,14 +53,14 @@ public class SummitActivity implements Serializable {
      */
     @Column(name = "start_time")
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
     /**
      * 结束时间
      */
     @Column(name = "end_time")
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
     /**
      * 报名截止时间（不展示）

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityAdminVo.java

@@ -24,10 +24,10 @@ public class SummitActivityAdminVo implements Serializable {
     private String banner;
 
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
     @ApiModelProperty(value = "省")
     private String province;

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailVo.java

@@ -31,11 +31,11 @@ public class SummitActivityDetailVo implements Serializable {
 
 
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
 
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
 
     @ApiModelProperty(value = "报名截止时间（不展示）")

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityVo.java

@@ -32,11 +32,11 @@ public class SummitActivityVo implements Serializable {
 
 
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
 
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
 
     @ApiModelProperty(value = "省")

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -73,6 +73,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         if (StringUtils.isNotEmpty(summitActivityFindDTO.getTitle())){
             criteria.andLike("title",String.format("%%%s%%",summitActivityFindDTO.getTitle()));
         }
+        criteria.andEqualTo("isDel",0);
        /* if (Objects.nonNull(summitActivityFindDTO.getStartTime()) && Objects.nonNull(summitActivityFindDTO.getEndTime())){
             criteria.andBetween("")
         }*/
@@ -83,7 +84,18 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         }
 
         List<SummitActivityAdminVo> summitActivityAdminVos = new ArrayList<>();
-        return null;
+        SummitActivityAdminVo summitActivityAdminVo;
+        for (SummitActivity summitActivity : data) {
+            summitActivityAdminVo = new SummitActivityAdminVo();
+            BeanUtils.copyProperties(summitActivity,summitActivityAdminVo);
+            summitActivityAdminVos.add(summitActivityAdminVo);
+        }
+        activityAdminVoPageDataVO.setTotalCount(pageDataVO.getTotalCount());
+        activityAdminVoPageDataVO.setTotalPage(pageDataVO.getTotalPage());
+        activityAdminVoPageDataVO.setPageNum(pageDataVO.getPageNum());
+        activityAdminVoPageDataVO.setPageSize(pageDataVO.getPageSize());
+        activityAdminVoPageDataVO.setData(summitActivityAdminVos);
+        return activityAdminVoPageDataVO;
     }
 
     public void saveSummitActivity(SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO) {
@@ -134,4 +146,11 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         summitActivity.setId(id);
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
+
+    public SummitActivitySaveDTO selectSummitActivityById(Integer id) {
+        SummitActivitySaveDTO summitActivitySaveDTO = new SummitActivitySaveDTO();
+        SummitActivity summitActivity = mapper.selectByPrimaryKey(id);
+        BeanUtils.copyProperties(summitActivity,summitActivitySaveDTO);
+        return summitActivitySaveDTO;
+    }
 }
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/SummitActivityAdminController.java

@@ -33,6 +33,13 @@ public class SummitActivityAdminController {
           return ObjectRestResponse.succ(pageDataVO);
      }
 
+     @ApiOperation("编辑查询")
+     @GetMapping("/{id}")
+     public ObjectRestResponse<SummitActivitySaveDTO>  selectToEdit(@PathVariable(value = "id") Integer id){
+           SummitActivitySaveDTO summitActivitySaveDTO = summitActivityBiz.selectSummitActivityById(id);
+           return ObjectRestResponse.succ(summitActivitySaveDTO);
+     }
+
      @ApiOperation("保存或编辑")
      @PostMapping("/save")
      public ObjectRestResponse<Void>  saveSummitActivity(@RequestBody SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO){