三社联动功能修改

101captain

2022-02-11 52f08686451a117dbb3058608a45c04ca8b16cb2

三社联动功能修改

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

New file
@@ -0,0 +1,92 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 社会组织成员表(ComActSocialMember)表控制层
 *
 * @author makejava
 * @since 2021-10-22 09:52:47
 */
@Slf4j
@Api(tags = {"社会组织成员"})
@RestController
@RequestMapping("comActSocialMember")
public class ComActSocialMemberApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.communityService.comActSocialMemberSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("详情")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActSocialMemberSelectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.communityService.comActSocialMemberInsert(comActSocialMember);
    }

    /**
     * 修改数据
     *
     * @param comActSocialMember 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.communityService.comActSocialMemberUpdate(comActSocialMember);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActSocialMemberDelete(id);
    }
}

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

New file
@@ -0,0 +1,100 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 三社联动项目表(ComActSocialProject)表控制层
 *
 * @author zzj
 * @since 2021-12-22 14:02:48
 */
@Slf4j
@Api(tags = {"项目管理"})
@RestController
@RequestMapping("comActSocialProject")
public class ComActSocialProjectApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProject(commonPage);
    }

    /**
     * 平台详情接口
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.getAppletComActSocialProject(id);
    }
    /**
     * 根据项目id分页获取关联项目
     */
    @ApiOperation(value = "根据项目id分页获取关联项目")
    @PostMapping("/getRelation")
    public R getRelation(@RequestBody CommonPage commonPage){
        return communityService.getRelationComActSocialProject(commonPage);
    }

    /**
     * 新增数据
     *
     * @param socialProjectVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody SocialProjectVO socialProjectVO) {
        return communityService.insertComActSocialProject(socialProjectVO);
    }

    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody SocialProjectVO socialProjectVO) {
        return communityService.updateComActSocialProject(socialProjectVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProject(id);
    }

}

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

New file
@@ -0,0 +1,91 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 项目人员(ComActSocialProjectMember)表控制层
 *
 * @author makejava
 * @since 2021-12-23 15:16:43
 */
@Slf4j
@Api(tags = {"项目成员管理"})
@RestController
@RequestMapping("comActSocialProjectMember")
public class ComActSocialProjectMemberApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation("分页查询所有数据")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectMember(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectMember(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        return communityService.updateComActSocialProjectMember(comActSocialProjectMemberVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectMember(id);
    }
}

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

New file
@@ -0,0 +1,103 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * 项目宣传表(ComActSocialProjectPublicity)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:30:55
 */
@Slf4j
@Api(tags = {"项目宣传管理"})
@RestController
@RequestMapping("comActSocialProjectPublicity")
public class ComActSocialProjectPublicityApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectPublicity(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectPublicity(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        return communityService.updateComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectPublicity(id);
    }
    /**
     * 多条删除数据
     *
     * @param ids 主键结合
     * @return 删除结果
     */
    @ApiOperation("多条删除数据")
    @PostMapping("delBatch")
    public R delBatch(@RequestBody List<Long> ids) {
        return communityService.delBatchComActSocialProjectPublicity(ids);
    }
}

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

New file
@@ -0,0 +1,91 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 项目进度表(ComActSocialProjectSchedule)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:31:16
 */
@Slf4j
@Api(tags = {"项目进度管理"})
@RestController
@RequestMapping("comActSocialProjectSchedule")
public class ComActSocialProjectScheduleApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 根据projectId查询所有进度
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation("分页查询")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectSchedule(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectSchedule(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        return communityService.insertComActSocialProjectSchedule(comActSocialProjectScheduleVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        return communityService.updateComActSocialProjectSchedule(comActSocialProjectScheduleVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectSchedule(id);
    }
}

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

New file
@@ -0,0 +1,132 @@
package com.panzhihua.applets.api;

import com.alibaba.excel.EasyExcel;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Slf4j
@RestController
@RequestMapping("/comactsocialworker")
@Api(tags = {"社工"})
public class ComActSocialWorkerApi extends BaseController {

    @Resource
    private CommunityService communityService;

//    @Value("${excel.comactsocialworkerUrl}")
//    private String comactsocialworkerUrl;
    /**
     * 新增社工
     * @param {classNameFirstLower}AddDTO 添加社工传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增社工", response = R.class)
    R add(@Validated @RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
        ClazzUtils.setIfStringIsEmpty(comActSocialWorkerAddDTO);
        comActSocialWorkerAddDTO.setUserId(getUserId());
        comActSocialWorkerAddDTO.setCommunityId(getCommunityId());
        return communityService.addComactsocialworker(comActSocialWorkerAddDTO);
    }

    /**
     * 修改
     * @param comActSocialWorkerEditDTO 修改社工传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑社工", response = R.class)
    R edit(@Validated @RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
        comActSocialWorkerEditDTO.setUserId(getUserId());
        return communityService.editComactsocialworker(comActSocialWorkerEditDTO);
    }

    /**
     * 分页查找
     * @param pageComActSocialWorkerDTO 查找社工传递对象
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
    R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
        pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
    }

    /**
     * 删除
     * @param comActSocialWorkerDeleteDTO 删除社工传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除社工", response = R.class)
    R delete(@Validated @RequestBody ComActSocialWorkerDeleteDTO  comActSocialWorkerDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(comActSocialWorkerDeleteDTO);
        return communityService.deleteComactsocialworker(comActSocialWorkerDeleteDTO);
    }

    /**
     * 查询社工详细信息
     * @param id 社工 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询社工详细信息")
    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
        return communityService.comActSocialWorkerDetails(id);
    }

    /**
     * 导入社工名单
     * @return
     */
    @ApiOperation(value = "导入社工名单")
    @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-data")
    public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
        String fileName = file.getOriginalFilename();  //获取文件名
        log.info("传入文件名字【{}】",fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, ComActSocialWorkerExcelVO.class, new ComActSocialWorkerExcelListen(communityService,this.getCommunityId())).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
            return R.fail("信息有误");
        }
        return R.ok();
    }


//    @GetMapping("/getTemplate")
//    @ApiOperation("获取模板")
//    public R getTemplate(){
//        return R.ok(comactsocialworkerUrl);
//    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java

@@ -65,7 +65,13 @@
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long skillType;
    private String  skillType;

    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类名称")
    private String  skillTypeName;

    /**
     * 入职时间
@@ -109,4 +115,10 @@
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    /**
     * 年龄
     */
    @ApiModelProperty(value = "年龄")
    private Integer age;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java

@@ -27,15 +27,15 @@
    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
    private Long socialOrgId;

    @NotBlank() @Length(max=32)
    @Length(max=32)
    @ApiModelProperty(value = "姓名", hidden = false, example = "")
    private String name;

    @NotBlank() @Length(max=32)
    @Length(max=32)
    @ApiModelProperty(value = "联系电话", hidden = false, example = "")
    private String telephone;

@@ -64,12 +64,13 @@
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long skillType;
    private String skillType;

    /**
     * 入职时间
     */
    @ApiModelProperty(value = "入职时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinTime;

    /**

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java

@@ -130,4 +130,13 @@
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    @ApiModelProperty(value = "关键字搜索")
    private String keyword;

    @ApiModelProperty(value = "年龄开始")
    private Integer ageBegin;

    @ApiModelProperty(value = "年龄结束")
    private Integer ageEnd;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java

@@ -63,7 +63,7 @@
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long skillType;
    private String skillType;

    /**
     * 入职时间
@@ -109,5 +109,11 @@
    private Integer credential;

    @ApiModelProperty(value = "分类名称")
    private String skillName;
    private String skillTypeName;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "社区名字")
    private String communityName;
}

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

@@ -52,8 +52,8 @@
    @Resource
    private CommunityService communityService;

//    @Value("${excel.comactsocialworkerUrl}")
//    private String comactsocialworkerUrl;
    @Value("${excel.comactsocialworkerUrl}")
    private String comactsocialworkerUrl;
    /**
     * 新增社工
     * @param {classNameFirstLower}AddDTO 添加社工传递对象
@@ -76,7 +76,6 @@
    @PutMapping()
    @ApiOperation(value = "编辑社工", response = R.class)
    R edit(@Validated @RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
        ClazzUtils.setIfStringIsEmpty(comActSocialWorkerEditDTO);
        comActSocialWorkerEditDTO.setUserId(getUserId());
        return communityService.editComactsocialworker(comActSocialWorkerEditDTO);
    }
@@ -89,7 +88,6 @@
    @GetMapping()
    @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
    R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
        pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
    }
@@ -102,7 +100,6 @@
    @DeleteMapping()
    @ApiOperation(value = "删除社工", response = R.class)
    R delete(@Validated @RequestBody ComActSocialWorkerDeleteDTO  comActSocialWorkerDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(comActSocialWorkerDeleteDTO);
        return communityService.deleteComactsocialworker(comActSocialWorkerDeleteDTO);
    }

@@ -139,10 +136,10 @@
    }


//    @GetMapping("/getTemplate")
//    @ApiOperation("获取模板")
//    public R getTemplate(){
//        return R.ok(comactsocialworkerUrl);
//    }
    @GetMapping("/getTemplate")
    @ApiOperation("获取模板")
    public R getTemplate(){
        return R.ok(comactsocialworkerUrl);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java

@@ -84,4 +84,6 @@

    private Long communityId;

    private Long parentId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java

@@ -107,8 +107,12 @@
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long skillType;

    private String skillType;
    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类id")
    private String skillTypeName;
    /**
     * 入职时间
     */
@@ -151,4 +155,9 @@
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    /**
     * 年龄
     */
    private Integer age;

}

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

@@ -24,11 +24,10 @@
    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO"
            parameterType="com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO">
        SELECT a.*,b.name as socialOrgId,c.name as communityId,e.name as streetId,f.name as skillName
        SELECT a.*,b.name as socialOrgId,c.name as communityName,e.name as streetId
        FROM com_act_social_worker a left join com_act_social_org b on a.social_org_id = b.id
        left join com_act c on a.community_id = c.community_id
        left join com_street e on a.street_id = e.street_id
        left join com_act_column f on a.skill_type = f.id
        <where>
            <if test="pageComActSocialWorkerDTO.id!=null">
                AND a.id = #{pageComActSocialWorkerDTO.id}
@@ -38,6 +37,15 @@
            </if>
            <if test="pageComActSocialWorkerDTO.name!=null">
                AND a.name = #{pageComActSocialWorkerDTO.name}
            </if>
            <if test="pageComActSocialWorkerDTO.keyword!=null and pageComActSocialWorkerDTO.keyword!=''">
                AND (a.name like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') or  a.telephone like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') )
            </if>
            <if test="pageComActSocialWorkerDTO.ageBegin!=null">
                AND a.age>=#{pageComActSocialWorkerDTO.ageBegin}
            </if>
            <if test="pageComActSocialWorkerDTO.ageEnd!=null">
                AND #{pageComActSocialWorkerDTO.ageEnd} >= a.age
            </if>
            <if test="pageComActSocialWorkerDTO.telephone!=null">
                AND a.telephone = #{pageComActSocialWorkerDTO.telephone}
@@ -54,20 +62,8 @@
            <if test="pageComActSocialWorkerDTO.createBy!=null">
                AND a.create_by = #{pageComActSocialWorkerDTO.createBy}
            </if>
            <if test="pageComActSocialWorkerDTO.createAtBegin!=null">
                AND a.create_at &gt;= #{pageComActSocialWorkerDTO.createAtBegin}
            </if>
            <if test="pageComActSocialWorkerDTO.createAtEnd!=null">
                AND a.create_at &lt;= #{pageComActSocialWorkerDTO.createAtEnd}
            </if>
            <if test="pageComActSocialWorkerDTO.updateBy!=null">
                AND a.update_by = #{pageComActSocialWorkerDTO.updateBy}
            </if>
            <if test="pageComActSocialWorkerDTO.updateAtBegin!=null">
                AND a.update_at &gt;= #{pageComActSocialWorkerDTO.updateAtBegin}
            </if>
            <if test="pageComActSocialWorkerDTO.updateAtEnd!=null">
                AND a.update_at &lt;= #{pageComActSocialWorkerDTO.updateAtEnd}
            </if>
        </where>
    </select>