springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamWishVO.java
New file @@ -0,0 +1,23 @@ package com.panzhihua.common.model.vos.partybuilding; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 微心愿服务团队人员 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 18:11 **/ @Data @ApiModel("微心愿服务团队人员") public class ComPbServiceTeamWishVO { @ApiModelProperty("managerId") private Long managerId; @ApiModelProperty("姓名") private String name; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -111,6 +111,15 @@ R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId); /** * 微心愿搜索社区团队人员列表 * @param param 请求参数 * @param communityId 社区id * @return 社区团队人员列表 */ @PostMapping("listactivitymanager2") R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId")Long communityId); /** *分页查询人脸识别 * @param loginUserInfoVO 查询参数 * @return 分页集合 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -403,6 +403,17 @@ return userService.listActivityManager(param, communityId); } @ApiOperation(value = "微心愿人员下拉搜索") @GetMapping("listmanagers2") @ApiImplicitParam(name = "param", value = "搜索参数【不传返回所有后台人员】", required = false) public R listManagers2(String param) { Long communityId = this.getCommunityId(); if (ObjectUtils.isEmpty(param)) { param = ""; } return userService.listActivityManager2(param, communityId); } @ApiOperation(value = "审核、反馈随手拍") @PutMapping("puteasyphoto") public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -54,10 +54,10 @@ "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " + " </if> " + "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" + "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " + "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " + " </if> " + "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" + " JOIN sys_user su ON w.responsible_id = su.user_id " + " JOIN com_pb_service_team su ON w.responsible_id = su.id " + "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " + " </if> " + " <where>" + @@ -130,7 +130,7 @@ "FROM " + "com_act_micro_wish w " + "JOIN sys_user u ON w.sponsor_id = u.user_id " + "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " + "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " + "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id " + "WHERE " + "w.id =#{id}"+ @@ -195,7 +195,7 @@ "FROM " + " com_act_micro_wish AS camw " + " LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " + " LEFT JOIN sys_user AS su1 ON su1.user_id = camw.responsible_id " + " LEFT JOIN com_pb_service_team AS su1 ON su1.id = camw.responsible_id " + " <where> " + "<if test='microListDTO.status != null'>" + "AND camw.`status` =#{microListDTO.status} " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml
@@ -39,6 +39,7 @@ and canct.name like concat(#{circleTopicAdminDTO.name},'%') </if> </where> order by canct.create_at desc </select> <select id="getNeighborTopicByApp" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO"> springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -122,6 +122,17 @@ } /** * 微心愿搜索社区团队人员列表 * @param param 请求参数 * @param communityId 社区id * @return 社区团队人员列表 */ @PostMapping("listactivitymanager2") public R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId") Long communityId) { return userService.listActivityManager2(param, communityId); } /** * 分页查询人脸识别 * * @param loginUserInfoVO 查询参数 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -19,6 +19,8 @@ import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO; import com.panzhihua.common.model.vos.grid.GridMemberVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.SysUserVO; @@ -433,4 +435,12 @@ @Select("select user_id,nick_name,phone from sys_user where type = 6 and community_id = #{communityId} limit 3") List<EventGridMemberVO> getGridsMemberList(@Param("communityId") Long communityId); @Select("<script>" + "select id as managerId,`name` from com_pb_service_team where community_id = #{communityId}" + "<if test='param != null and param != ""'>" + "AND `name` like concat(#{param},'%') " + " </if> " + "</script>") List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param, @Param("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -77,6 +77,14 @@ * @return 人员集合 */ R listActivityManager(String param, Long communityId); /** * 微心愿搜索社区团队人员列表 * @param param 请求参数 * @param communityId 社区id * @return 社区团队人员列表 */ R listActivityManager2(String param, Long communityId); /** *分页查询人脸识别 * @param loginUserInfoVO 查询参数 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -20,6 +20,8 @@ import com.panzhihua.common.model.vos.grid.GridMemberVO; import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO; import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.*; //import com.panzhihua.common.service.grid.GridService; @@ -334,6 +336,17 @@ } /** * 微心愿搜索社区团队人员列表 * @param param 请求参数 * @param communityId 社区id * @return 社区团队人员列表 */ @Override public R listActivityManager2(String param, Long communityId) { return R.ok(userDao.getServiceTeamList(param,communityId)); } /** * 分页查询人脸识别 * * @param loginUserInfoVO 查询参数
