springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -203,7 +203,7 @@ int dsh = 1; int dfk = 2; int ybh = 3; int ywc = 4; int dpj = 4; int ypj = 5; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoEvaluateServiceImpl.java
@@ -5,11 +5,9 @@ import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate; import com.panzhihua.service_community.dao.ComActEasyPhotoEvaluateMapper; import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO; import com.panzhihua.service_community.model.dos.ComActMicroWishDO; import com.panzhihua.service_community.service.ComActEasyPhotoEvaluateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService; import com.panzhihua.service_community.service.ComActMicroWishService; import org.springframework.beans.BeanUtils; import com.panzhihua.common.model.dtos.common.*; import com.panzhihua.common.model.vos.R; @@ -141,7 +139,7 @@ if(easyPhotoDO == null){ return R.fail("未查询到该记录"); } if(!easyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)){ if(!easyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dpj)){ return R.fail("当前状态不可进行评价"); } Date nowDate = new Date(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -7,7 +7,6 @@ import javax.annotation.Resource; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto; import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO; import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate; @@ -118,7 +117,7 @@ } if (comActEasyPhotoVO1.getActivityId() != null && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)) { && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.dpj)) { // 查询随手拍活动 ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId()); @@ -357,7 +356,7 @@ comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO); break; case 4: if (cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)) { if (cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ypj)) { return R.fail("该随手拍已完成，不可重复操作"); } if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult()) @@ -379,7 +378,7 @@ // comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO); // } cmActEasyPhotoDO.setFeedbackAt(nowDate); cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc); cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.dpj); cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId()); if(comActEasyPhotoVO.getUrbanStatus()!=null&&comActEasyPhotoVO.getUrbanStatus()==2){ cmActEasyPhotoDO.setUrbanStatus(2); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml
@@ -38,11 +38,14 @@ cpo.type, cmv.`name` AS areaName, cmb.`name` AS buildName, cpmr.`name` AS userName, cpmr.phone, (select count(id) from com_pb_member where org_id = cpo.id and audit_result = 1) as countPerson FROM com_pb_org AS cpo LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cpo.area_id left join com_mng_building as cmb on cmb.id = cpo.build_id LEFT JOIN com_pb_member_role cpmr ON cpmr.org_id = cpo.id <where> <if test="partyOrganizationVO.communityId != null"> and cpo.community_id = ${partyOrganizationVO.communityId} @@ -63,6 +66,7 @@ and cpo.build_id = #{partyOrganizationVO.buildId} </if> </where> GROUP BY cpo.id ORDER BY cpo.id desc </select>
