springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java
@@ -177,15 +177,19 @@ @ApiOperation(value = "微团队成员分页查询服务处理", response = ComFmsServiceVO.class) @PostMapping("/service/pageDeal") public R pageDealFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) { adminDTO.setCommunityId(this.getCommunityId()); adminDTO.setUserId(this.getUserId()); LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); adminDTO.setCommunityId(loginUserInfo.getCommunityId()); adminDTO.setUserId(loginUserInfo.getUserId()); adminDTO.setUserInfo(loginUserInfo); return communityService.pageDealFmsService(adminDTO); } @ApiOperation(value = "微团队成员服务反馈", response = ComFmsServiceVO.class) @PostMapping("/service/feedback") public R feedbackFmsService(@RequestBody @Valid FeedbackFmsServiceDTO adminDTO) { adminDTO.setUserId(this.getUserId()); LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); adminDTO.setUserId(loginUserInfo.getUserId()); adminDTO.setUserInfo(loginUserInfo); return communityService.feedbackFmsService(adminDTO); }
@@ -2,6 +2,8 @@ import javax.validation.constraints.NotNull; import com.panzhihua.common.model.vos.LoginUserInfoVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,4 +35,7 @@ @ApiModelProperty(value = "用户id", hidden = true) private Long userId; @ApiModelProperty(value = "用户信息", hidden = true) private LoginUserInfoVO userInfo; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAppletsDTO.java
@@ -2,6 +2,7 @@ import javax.validation.constraints.NotNull; import com.panzhihua.common.model.vos.LoginUserInfoVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,4 +37,10 @@ @ApiModelProperty(value = "用户id", hidden = true) private Long userId; @ApiModelProperty(value = "用户信息", hidden = true) private LoginUserInfoVO userInfo; @ApiModelProperty(value = "成员id", hidden = true) private Long memberId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
@@ -9,6 +9,8 @@ import javax.annotation.Resource; import com.panzhihua.service_community.dao.ComFmsTeamMemberDAO; import com.panzhihua.service_community.entity.ComFmsTeamMember; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -53,6 +55,8 @@ private ComFmsServiceRecordDAO comFmsServiceRecordDAO; @Resource private ComFmsServiceEvaluationsDAO comFmsServiceEvaluationsDAO; @Resource private ComFmsTeamMemberDAO comFmsTeamMemberDAO; /** * 后台新增微服务 @@ -323,6 +327,13 @@ Page page = new Page<>(); page.setSize(adminDTO.getPageSize()); page.setCurrent(adminDTO.getPageNum()); LoginUserInfoVO userInfo = adminDTO.getUserInfo(); ComFmsTeamMember comFmsTeamMember = comFmsTeamMemberDAO.selectOne(new LambdaQueryWrapper<ComFmsTeamMember>() .eq(ComFmsTeamMember::getPhone, userInfo.getPhone()) .eq(ComFmsTeamMember::getCommunityId, userInfo.getCommunityId())); if (nonNull(comFmsTeamMember)) { adminDTO.setMemberId(comFmsTeamMember.getId()); } return R.ok(this.baseMapper.pageDealFmsService(page, adminDTO)); } @@ -341,7 +352,11 @@ if (isNull(comFmsService.getMemberId())) { return R.fail("还未分配服务人员"); } if (!comFmsService.getMemberId().equals(adminDTO.getUserId())) { LoginUserInfoVO userInfo = adminDTO.getUserInfo(); ComFmsTeamMember comFmsTeamMember = comFmsTeamMemberDAO.selectOne(new LambdaQueryWrapper<ComFmsTeamMember>() .eq(ComFmsTeamMember::getPhone, userInfo.getPhone()) .eq(ComFmsTeamMember::getCommunityId, userInfo.getCommunityId())); if (isNull(comFmsTeamMember) || !comFmsService.getMemberId().equals(comFmsTeamMember.getId())) { return R.fail("不是指定的分配服务人员"); } Boolean isEnd = adminDTO.getIsEnd(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceMapper.xml
@@ -41,7 +41,7 @@ <select id="pageFmsServiceAdmin" resultType="com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO"> SELECT t1.id, t1.user_name, t1.phone, t1.created_at, t1.service_content, t2.`name` AS serviceMember, t3.star_level, t1.service_status FROM com_fms_service t1 LEFT JOIN sys_user t2 ON t1.member_id = t2.user_id LEFT JOIN com_fms_team_member t2 ON t1.member_id = t2.id LEFT JOIN com_fms_service_evaluations t3 ON t1.id = t3.service_id WHERE t1.community_id = #{adminDTO.communityId} <if test="adminDTO.keyword != null and adminDTO.keyword != """> @@ -59,7 +59,7 @@ SELECT t1.id, t1.user_name, t2.`name` AS realName, t1.phone, t1.service_content, t1.service_image, t1.service_status FROM com_fms_service t1 LEFT JOIN sys_user t2 ON t1.member_id = t2.user_id LEFT JOIN com_fms_team_member t2 ON t1.member_id = t2.id WHERE t1.id = #{serviceId} </select> <select id="statisticsFmsService" @@ -104,7 +104,7 @@ LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id WHERE t1.community_id = #{adminDTO.communityId} <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 1"> AND t1.member_id = #{adminDTO.userId} AND t1.member_id = #{adminDTO.memberId} </if> <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 2"> AND t1.service_status = 1
