Merge remote-tracking branch 'origin/master'

sync-server/src/main/java/com/zq/sync/controller/VolunteerController.java

+package com.zq.sync.controller;
+
+import com.zq.common.utils.AssertUtils;
+import com.zq.common.vo.ResultVo;
+import com.zq.sync.service.VolunteerService;
+import com.zq.sync.vo.GroupProSearchVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "志愿服务相关接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping(value = "/sync/volunteer")
+public class VolunteerController {
+    private final VolunteerService volunteerService;
+
+    /**
+     * 志愿者
+     * @return
+     */
+    @GetMapping(value = "/zyz")
+    public ResultVo volunteer() {
+        volunteerService.volunteer();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 志愿队伍
+     * @return
+     */
+    @GetMapping(value = "/zyteam")
+    public ResultVo zyteam() {
+        volunteerService.zyteam();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 志愿项目
+     * @return
+     */
+    @GetMapping(value = "/zyproject")
+    public ResultVo zyproject() {
+        volunteerService.zyproject();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 志愿时长
+     * @return
+     */
+    @GetMapping(value = "/zytime")
+    public ResultVo zytime() {
+        volunteerService.zytime();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     *  志愿者与队伍关系
+     *  @return
+     */
+    @GetMapping(value = "/zycontact")
+    public ResultVo zycontact() {
+        volunteerService.zycontact();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 分页查寻加入团体的志愿者
+     * @return
+     */
+    @GetMapping(value = "/searchByJoin")
+    public ResultVo searchByJoin() {
+        volunteerService.searchByJoin();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据团体id查询团体的志愿项目
+     * @return
+     */
+    @ApiOperation("根据团体id查询团体的志愿项目")
+    @PostMapping(value = "/searchById")
+    public ResultVo searchById(@RequestBody GroupProSearchVo vo) {
+        AssertUtils.hasText(vo.getGroupId(), "缺团体id");
+        AssertUtils.hasText(vo.getPage(), "缺分页页数");
+        AssertUtils.hasText(vo.getRow(), "缺分页行数");
+
+        return ResultVo.success(volunteerService.searchById(vo));
+    }
+
+    /**
+     * 根据身份证查询志愿
+     * @return
+     */
+    @GetMapping(value = "/searchByIDcard")
+    public ResultVo searchByIDcard() {
+        volunteerService.searchByIDcard();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据手机号查询志愿
+     * @return
+     */
+    @GetMapping(value = "/searchByPhone")
+    public ResultVo searchByPhone() {
+        volunteerService.searchByPhone();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据志愿者id查询项目
+     * @return
+     */
+    @GetMapping(value = "/searchProById")
+    public ResultVo searchProById() {
+        volunteerService.searchProById();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据志愿者id查询时长记录
+     * @return
+     */
+    @GetMapping(value = "/searchTimeRecordById")
+    public ResultVo searchTimeRecordById() {
+        volunteerService.searchTimeRecordById();
+        return ResultVo.success("成功");
+    }
+
+    /**
+     * 根据志愿者来源与时间查询志愿者
+     * @return
+     */
+    @GetMapping(value = "/searchBySourceTime")
+    public ResultVo searchBySourceTime() {
+        volunteerService.searchBySourceTime();
+        return ResultVo.success("成功");
+    }
+}

sync-server/src/main/java/com/zq/sync/dao/GroupProSearchDao.java

+package com.zq.sync.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.common.constant.DBName;
+import com.zq.sync.entity.GroupProject;
+import org.springframework.stereotype.Repository;
+
+@DS(DBName.OZT) //数据库名
+@Repository
+public interface GroupProSearchDao extends BaseMapper<GroupProject> {
+}

sync-server/src/main/java/com/zq/sync/entity/GroupProject.java

+package com.zq.sync.entity;
+
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 团体志愿项目表(Groupproject)实体类
+ *
+ * @author makejava
+ * @since 2021-12-16 17:42:58
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GroupProject {
+
+    /**
+     * 项目名称
+     */
+    @ApiModelProperty("项目名称")
+    private String albx0002;
+    
+    /**
+     * 服务地点
+     */
+    @ApiModelProperty("服务地点")
+    private String albx0003;
+    
+    /**
+     * 项目开始时间
+     */
+    @ApiModelProperty("项目开始时间")
+    private Date albx0004;
+    
+    /**
+     * 项目结束时间
+     */
+    @ApiModelProperty("项目结束时间")
+    private Date albx0005;
+    
+    /**
+     * 招募开始时间
+     */
+    @ApiModelProperty("招募开始时间")
+    private Date albx0006;
+    
+    /**
+     * 招募结束时间
+     */
+    @ApiModelProperty("招募结束时间")
+    private Date albx0007;
+    
+    /**
+     * 项目进度
+     */
+    @ApiModelProperty("项目进度")
+    private String albx0008;
+    
+    /**
+     * 服务类别
+     */
+    @ApiModelProperty("服务类别")
+    private String albx0009;
+    
+    /**
+     * 服务时间描述
+     */
+    @ApiModelProperty("服务时间描述")
+    private String albx0010;
+    
+    /**
+     * 团体id
+     */
+    @ApiModelProperty("团体id")
+    private String albx0011;
+    
+    /**
+     * 区域名
+     */
+    @ApiModelProperty("区域名")
+    private String albx0012;
+    
+    /**
+     * 项目编号
+     */
+    @ApiModelProperty("项目编号")
+    private String albx0013;
+    
+    /**
+     * 服务对象
+     */
+    @ApiModelProperty("服务对象")
+    private String albx0014;
+    
+    /**
+     * 项目状态
+     */
+    @ApiModelProperty("项目状态")
+    private String albx0015;
+    
+    /**
+     * 正式成员人数
+     */
+    @ApiModelProperty("正式成员人数")
+    private String albx0016;
+    
+    /**
+     * 免审密码
+     */
+    @ApiModelProperty("免审密码")
+    private String albx0017;
+    
+    /**
+     * 项目描述
+     */
+    @ApiModelProperty("项目描述")
+    private String albx0018;
+    
+    /**
+     * 志愿者保障
+     */
+    @ApiModelProperty("志愿者保障")
+    private String albx0019;
+    
+    /**
+     * 照片
+     */
+    @ApiModelProperty("照片")
+    private String albx0020;
+    
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String albx0021;
+    
+    /**
+     * 可报名团体编号
+     */
+    @ApiModelProperty("可报名团体编号")
+    private String albx0022;
+    
+    /**
+     * 不可同时报名项目编号
+     */
+    @ApiModelProperty("不可同时报名项目编号")
+    private String albx0023;
+    
+    /**
+     * 志愿者招募范围
+     */
+    @ApiModelProperty("志愿者招募范围")
+    private String albx0024;
+    
+    /**
+     * 联系人姓名
+     */
+    @ApiModelProperty("联系人姓名")
+    private String albx0025;
+    
+    /**
+     * 联系人手机
+     */
+    @ApiModelProperty("联系人手机")
+    private String albx0026;
+    
+    /**
+     * 联系人手机是否公开
+     */
+    @ApiModelProperty("联系人手机是否公开")
+    private String albx0027;
+    
+    /**
+     * 联系人座机
+     */
+    @ApiModelProperty("联系人座机")
+    private String albx0028;
+    
+    /**
+     * 联系人座机是否公开
+     */
+    @ApiModelProperty("联系人座机是否公开")
+    private String albx0029;
+    
+    /**
+     * 联系人邮箱
+     */
+    @ApiModelProperty("联系人邮箱")
+    private String albx0030;
+    
+    /**
+     * 发布时间
+     */
+    @ApiModelProperty("发布时间")
+    private Date albx0031;
+    
+    /**
+     * 受众人次
+     */
+    @ApiModelProperty("受众人次")
+    private String albx0032;
+    
+    /**
+     * 报名前服务时长要求
+     */
+    @ApiModelProperty("报名前服务时长要求")
+    private String albx0033;
+    
+    /**
+     * 报名问题一
+     */
+    @ApiModelProperty("报名问题一")
+    private String albx0034;
+    
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private String albx0035;
+    
+    /**
+     * 纬度
+     */
+    @ApiModelProperty("纬度")
+    private String albx0036;
+    
+    /**
+     * 是否推荐
+     */
+    @ApiModelProperty("是否推荐")
+    private String albx0037;
+    
+    /**
+     * 项目管理员（志愿者编号）
+     */
+    @ApiModelProperty("项目管理员（志愿者编号）")
+    private String albx0038;
+    
+    /**
+     * 二维码生成日期|
+     */
+    @ApiModelProperty("二维码生成日期|")
+    private Date albx0039;
+    
+    /**
+     * 二维码路径
+     */
+    @ApiModelProperty("二维码路径")
+    private String albx0040;
+    
+    /**
+     * 结项时间
+     */
+    @ApiModelProperty("结项时间")
+    private String albx0041;
+    
+    /**
+     * 服务类别是否属于全国其他
+     */
+    @ApiModelProperty("服务类别是否属于全国其他")
+    private String albx0042;
+    
+    /**
+     * 岗位数
+     */
+    @ApiModelProperty("岗位数")
+    private String albx0043;
+    
+    /**
+     * 计划招募总数
+     */
+    @ApiModelProperty("计划招募总数")
+    private String albx0044;
+    
+    /**
+     * 其他服务类别
+     */
+    @ApiModelProperty("其他服务类别")
+    private String albx0045;
+    
+    /**
+     * 推荐时间
+     */
+    @ApiModelProperty("推荐时间")
+    private Date albx0046;
+    
+    /**
+     * 证明照片
+     */
+    @ApiModelProperty("证明照片")
+    private String albx0047;
+    
+    /**
+     * 原数据
+     */
+    @ApiModelProperty("原数据")
+    private String pid;
+    
+}
\ No newline at end of file

sync-server/src/main/java/com/zq/sync/service/VolunteerService.java

+package com.zq.sync.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zq.common.utils.AssertUtils;
+import com.zq.sync.dao.GroupProSearchDao;
+import com.zq.sync.entity.GroupProject;
+import com.zq.sync.vo.GroupProSearchVo;
+import com.zq.sync.vo.GroupProVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Comparator;
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class VolunteerService {
+
+    private final GroupProSearchDao groupProSearchDao;
+
+    public void volunteer() {
+    }
+
+    public void zyteam() {
+    }
+
+    public void zyproject() {
+    }
+
+    public void zytime() {
+    }
+
+    public void zycontact() {
+    }
+
+    public void searchByJoin() {
+    }
+
+    public GroupProVo searchById(GroupProSearchVo vo) {
+       List<GroupProject> groupProList= groupProSearchDao.selectList(Wrappers.lambdaQuery(GroupProject.builder().albx0011("id").build()));
+       AssertUtils.notEmpty(groupProList, "查询为空");
+        GroupProject groupProject = groupProList.stream().max(Comparator.comparing(GroupProject::getAlbx0011)).get();
+
+        return GroupProVo.builder().groupId(groupProject.getAlbx0011()).build();
+    }
+
+    public void searchByIDcard() {
+    }
+
+    public void searchByPhone() {
+    }
+
+    public void searchProById() {
+    }
+
+    public void searchTimeRecordById() {
+    }
+
+    public void searchBySourceTime() {
+    }
+}

sync-server/src/main/java/com/zq/sync/vo/GroupProSearchVo.java

+package com.zq.sync.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class GroupProSearchVo {
+    @ApiModelProperty("团体id")
+    private String groupId;
+
+    @ApiModelProperty("分页页数")
+    private String page;
+
+    @ApiModelProperty("分页行数")
+    private String row;
+}

sync-server/src/main/java/com/zq/sync/vo/GroupProVo.java

+package com.zq.sync.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GroupProVo {
+
+    @ApiModelProperty("团体id")
+    private String groupId;
+
+    @ApiModelProperty("分页页数")
+    private String page;
+
+    @ApiModelProperty("分页行数")
+    private String row;
+}