springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11326,7 +11326,8 @@ * @return */ @GetMapping("/VolunteerType/volunteerTypeGetList") public R volunteerTypeGetList(); public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize); /** * 新增 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerActivityApi.java
@@ -9,6 +9,10 @@ import javax.annotation.Resource; import java.util.Date; /** * 志愿者活动 */ @Slf4j @RestController @RequestMapping("/Volunteer") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerTypeApi.java
@@ -29,9 +29,10 @@ * @return */ @GetMapping("/volunteerTypeGetList") public R volunteerTypeGetList() public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { return communityService.volunteerTypeGetList(); return communityService.volunteerTypeGetList(pageNum,pageSize); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerTypeApi.java
@@ -23,9 +23,10 @@ * @return */ @GetMapping("/volunteerTypeGetList") public R volunteerTypeGetList() public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { return volunteerTypeService.volunteerTypeGetList(); return volunteerTypeService.volunteerTypeGetList(pageNum,pageSize); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerTypeDao.java
@@ -21,7 +21,7 @@ * @param * @return */ List<VolunteerType> volunteerTypeGetList(); IPage<VolunteerType> volunteerTypeGetList(Page page); /** * 新增 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerActivity.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.entity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -58,26 +59,31 @@ * 发布时间 */ @ApiModelProperty(value = "发布时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date issueTime; /** * 报名开始时间 */ @ApiModelProperty(value = "报名开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date applyBeginTime; /** * 报名结束时间 */ @ApiModelProperty(value = "报名结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date applyEndTime; /** * 活动开始时间 */ @ApiModelProperty(value = "活动开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actityBeginTime; /** * 活动结束时间 */ @ApiModelProperty(value = "活动结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actityEndTime; /** * 志愿者上限（0无限 大于0 就是限制） @@ -118,12 +124,14 @@ * 创建时间 */ @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date creationTime; /** * 更新时间 */ @ApiModelProperty(value = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; /** * 社区id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerType.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.entity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -40,11 +41,13 @@ * 更新时间 */ @ApiModelProperty(value = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; /** * 社区id */ @ApiModelProperty(value = "社区id") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String communityId;
@@ -1,5 +1,7 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.VolunteerTypeVO; @@ -12,8 +14,7 @@ * @param * @return */ R volunteerTypeGetList(); R volunteerTypeGetList(int pageNum,int pageSize); /** * 新增 * @param springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerTypeServiceImpl.java
@@ -1,9 +1,12 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.VolunteerTypeVO; import com.panzhihua.service_community.dao.VolunteerTypeDao; import com.panzhihua.service_community.entity.VolunteerActivity; import com.panzhihua.service_community.entity.VolunteerType; import com.panzhihua.service_community.service.VolunteerTypeService; import lombok.extern.slf4j.Slf4j; @@ -15,10 +18,13 @@ public class VolunteerTypeServiceImpl extends ServiceImpl<VolunteerTypeDao, VolunteerType> implements VolunteerTypeService { @Override public R volunteerTypeGetList() { return R.ok(baseMapper.volunteerTypeGetList()); public R volunteerTypeGetList(int pageNum,int pageSize) { Page page = new Page<VolunteerActivity>(pageNum,pageSize); return R.ok(baseMapper.volunteerTypeGetList(page)); } @Override public R insertvolunteerType(VolunteerTypeVO volunteerTypeVO) {
