修改bug

huanghongfa

2022-02-17 90e2ee28ae5479d9d116a22e5b8cfd3be562ee53

修改bug

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -4,6 +4,12 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -282,6 +288,31 @@
        return communityService.detailVolunteer(id);
    }

    @ApiOperation(value = "查询志愿者组织列表", response = ComMngVolunteerOrgTeamVo.class)
    @GetMapping("/volunteer/org/list")
    public R listVolunteerOrgAdmin() {
        PageComMngVolunteerOrgTeamDto orgTeamDto = new PageComMngVolunteerOrgTeamDto();
        orgTeamDto.setParentId(0L);
        orgTeamDto.setCommunityId(this.getCommunityId());
        return communityService.listVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "查询志愿者服务类型列表", response = ComMngVolunteerServiceTypeVo.class)
    @GetMapping("/volunteer/service/type/list")
    public R listVolunteerServiceTypeAdmin() {
        PageComMngVolunteerServiceTypeDto serviceTypeDto = new PageComMngVolunteerServiceTypeDto();
        serviceTypeDto.setCommunityId(this.getCommunityId());
        return communityService.listServiceTypeAdmin(serviceTypeDto);
    }

    @ApiOperation(value = "查询志愿者技能列表", response = ComMngVolunteerSkillVo.class)
    @GetMapping("/volunteer/skill/list")
    public R listVolunteerSkillAdmin() {
        PageComMngVolunteerSkillDto volunteerSkillDto = new PageComMngVolunteerSkillDto();
        volunteerSkillDto.setCommunityId(this.getCommunityId());
        return communityService.listVolunteerSkillAdmin(volunteerSkillDto);
    }

    @ApiOperation(value = "车辆登记")
    @PostMapping("car/register")
    public R addComMngCar(@Validated(AddGroup.class) @RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerApi.java

@@ -118,7 +118,7 @@
    }

    @ApiOperation(value = "删除志愿者组织/队伍")
    @PostMapping("/org/delete")
    @GetMapping("/org/delete")
    public R deleteVolunteerOrgAdmin(@RequestParam("id") Long id) {
        if(id == null){
            return R.fail("参数错误");
@@ -155,7 +155,7 @@
    }

    @ApiOperation(value = "删除志愿者组织/队伍")
    @PostMapping("/service/type/delete")
    @GetMapping("/service/type/delete")
    public R deleteServiceTypeAdmin(@RequestParam("id") Long id) {
        if(id == null){
            return R.fail("参数错误");
@@ -192,7 +192,7 @@
    }

    @ApiOperation(value = "删除志愿者技能列表")
    @PostMapping("/skill/delete")
    @GetMapping("/skill/delete")
    public R deleteVolunteerSkillAdmin(@RequestParam("id") Long id) {
        if(id == null){
            return R.fail("参数错误");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml

@@ -38,6 +38,9 @@
        cmvm.phone,
        cmvm.integral,
        cmvm.id_card,
        cmvm.skill_id,
        cmvm.org_id,
        cmvm.team_id,
        cmvm.is_university,
        cmvm.university_name,
        cmvot.`name` as orgName,

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerServiceTypeDao.xml

@@ -41,17 +41,8 @@
            <if test="dto.remark != null and dto.remark != ''">
                and cmvst.remark = #{dto.remark}
            </if>
            <if test="dto.createAt != null">
                and cmvst.create_at = #{dto.createAt}
            </if>
            <if test="dto.createBy != null">
                and cmvst.create_by = #{dto.createBy}
            </if>
            <if test="dto.updateAt != null">
                and cmvst.update_at = #{dto.updateAt}
            </if>
            <if test="dto.updateBy != null">
                and cmvst.update_by = #{dto.updateBy}
            <if test="dto.keyWord != null and dto.keyWord != ''">
                and cmvst.name like concat(#{dto.keyWord},'%')
            </if>
        </where>
        order by cmvst.create_at desc
@@ -107,18 +98,6 @@
            </if>
            <if test="dto.remark != null and dto.remark != ''">
                and remark = #{dto.remark}
            </if>
            <if test="dto.createAt != null">
                and create_at = #{dto.createAt}
            </if>
            <if test="dto.createBy != null">
                and create_by = #{dto.createBy}
            </if>
            <if test="dto.updateAt != null">
                and update_at = #{dto.updateAt}
            </if>
            <if test="dto.updateBy != null">
                and update_by = #{dto.updateBy}
            </if>
        </where>
        order by create_at desc