springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.vos.common.ComActEasyPhotoEvaluateVo; import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; @@ -236,4 +237,7 @@ @ApiModelProperty(value = "是否人大代表成员 1.是 2.否", hidden = true) private Integer isDpcMember; @ApiModelProperty(value = "处理记录") private List<ComActEasyPhotoHandlerVo> handleRecordList; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoHandlerMapper.java
@@ -54,5 +54,13 @@ * @date 2022-03-01 13:45:11 */ List<ComActEasyPhotoHandlerVo> queryAllByList(@Param("dto") PageComActEasyPhotoHandlerDto comActEasyPhotoHandler); /** * 获取处理记录 * @param serviceId * @param serviceType * @return */ List<ComActEasyPhotoHandlerVo> selectHandleRecord(@Param("serviceId") Long serviceId, @Param("serviceType") Integer serviceType); }
@@ -2,6 +2,9 @@ import com.panzhihua.common.model.dtos.common.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo; import java.util.List; /** * title: 随手拍、微心愿处理人绑定表表服务接口 @@ -86,4 +89,11 @@ */ void addHandleRecord(Long communityId,Long userId,Long serviceId,Integer type,Integer serviceType,Long sponsorId); /** * 获取处理记录 * @param serviceId * @param serviceType * @return */ List<ComActEasyPhotoHandlerVo> selectHandleRecord(Long serviceId, Integer serviceType); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoHandlerServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo; import com.panzhihua.service_community.entity.ComActEasyPhotoHandler; import com.panzhihua.service_community.dao.ComActEasyPhotoHandlerMapper; import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.Date; import java.util.List; /** * title: 随手拍、微心愿处理人绑定表表服务实现类 @@ -140,4 +142,15 @@ easyPhotoHandler.setServiceType(serviceType); this.baseMapper.insert(easyPhotoHandler); } /** * 获取处理记录 * @param serviceId * @param serviceType * @return */ @Override public List<ComActEasyPhotoHandlerVo> selectHandleRecord(Long serviceId, Integer serviceType) { return this.baseMapper.selectHandleRecord(serviceId, serviceType); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -8,6 +8,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto; import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo; import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO; import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate; import com.panzhihua.service_community.entity.ComActEasyPhotoHandler; @@ -187,6 +188,12 @@ comActEasyPhotoVO.setPhotoFeedbackListForDpc(photoFeedbackListForDpc); } //处理记录 List<ComActEasyPhotoHandlerVo> handleRecordList = easyPhotoHandlerService.selectHandleRecord(id, 1); if (!handleRecordList.isEmpty()) { comActEasyPhotoVO.setHandleRecordList(handleRecordList); } // comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone())); if (comActEasyPhotoVO.getAddrRemark() == null) { comActEasyPhotoVO.setAddrRemark(""); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java
@@ -9,6 +9,7 @@ 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.utlis.DateUtils; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComActSocialMemberDao; import com.panzhihua.service_community.dao.ComActSocialOrgDao; @@ -104,18 +105,17 @@ comActSocialProjectDao.updateById(comActSocialProject); SocialProjectVO projectVO = comActSocialProjectDao.getByApplet(id); if (nonNull(projectVO)) { ComActSocialOrg socialOrg = comActSocialOrgDao.selectOrgByUserId(userId); Integer signCount = nonNull(socialOrg) ? comActSocialProjectSignDAO.selectCount(new LambdaQueryWrapper<ComActSocialProjectSign>() .eq(ComActSocialProjectSign::getProjectId, projectVO.getId()).eq(ComActSocialProjectSign::getOrgId, socialOrg.getId())) : 0; if(projectVO.getStatus().equals(2) || signCount > 0){ projectVO.setIsCouldSign(2); } else { projectVO.setIsCouldSign(1); } List<SocialProjectVO> list = new ArrayList<>(); list.add(projectVO); setSignUpStatus(list); ComActSocialOrg socialOrg = comActSocialOrgDao.selectOrgByUserId(userId); Integer signCount = nonNull(socialOrg) ? comActSocialProjectSignDAO.selectCount(new LambdaQueryWrapper<ComActSocialProjectSign>() .eq(ComActSocialProjectSign::getProjectId, projectVO.getId()).eq(ComActSocialProjectSign::getOrgId, socialOrg.getId())) : 0; if(!projectVO.getSignUpStatus().equals(1) || signCount > 0) { projectVO.setIsCouldSign(2); } else { projectVO.setIsCouldSign(1); } } return R.ok(projectVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoHandlerMapper.xml
@@ -44,7 +44,7 @@ and t.status = #{dto.status} </if> </where> order by create_at desc order by t.create_time desc </select> <!--查询所有数据--> @@ -74,6 +74,10 @@ </where> order by create_at desc </select> <select id="selectHandleRecord" resultType="com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo"> SELECT * FROM com_act_easy_photo_handler WHERE service_id = #{serviceId} AND service_type = #{serviceType} </select> </mapper>
