From 23f8236c1ae1a1668bff373491beb37477865a2d Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期四, 27 五月 2021 14:02:26 +0800 Subject: [PATCH] 网格综治app随手拍 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 44 insertions(+), 13 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java index f74aa70..7bc1356 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java @@ -1,12 +1,10 @@ package com.panzhihua.service_grid.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoAddDTO; -import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoDeleteDTO; -import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoEditDTO; -import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO; +import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO; import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO; @@ -19,6 +17,7 @@ import javax.annotation.Resource; import java.util.Date; +import java.util.List; /** * @auther lyq @@ -31,6 +30,8 @@ @Resource private ComActEasyPhotoMapper comActEasyPhotoMapper; + @Resource + private ComActEasyPhotoTypeRelationMapper comActEasyPhotoTypeRelationMapper; /** * 新增社区活动 》随手拍 * @param comActEasyPhotoAddDTO @@ -63,18 +64,30 @@ /** * 分页查找社区活动 》随手拍 - * @param pageComActEasyPhotoDTO + * @param easyAppDTO * @return 维护结果 */ - public R<IPage<ComActEasyPhotoVO>> query(PageComActEasyPhotoDTO pageComActEasyPhotoDTO){ - Page page = new Page(1,10); - if(pageComActEasyPhotoDTO.getPageNum()!=null) { - page.setCurrent(pageComActEasyPhotoDTO.getPageNum()); + public R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO){ + Page page = new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()); + if(easyAppDTO.getStatus() != null){ + switch (easyAppDTO.getStatus()){ + case 1: + easyAppDTO.setHandleStatus(1); + break; + case 2: + easyAppDTO.setIsReport(1); + break; + case 3: + easyAppDTO.setIsPublicity(1); + break; + case 4: + easyAppDTO.setIsPublicity(0); + break; + default: + break; + } } - if(pageComActEasyPhotoDTO.getPageSize()!=null) { - page.setSize(pageComActEasyPhotoDTO.getPageSize()); - } - return R.ok(comActEasyPhotoMapper.findByPage(page, pageComActEasyPhotoDTO)); + return R.ok(comActEasyPhotoMapper.findByPage(page, easyAppDTO)); } /** @@ -101,4 +114,22 @@ return R.fail(); } + /** + * 根据随手拍id查询随手拍详情 + * @param easyId 随手拍id + * @return 随手拍详情 + */ + @Override + public R detail(Long easyId){ + ComActEasyPhotoVO easyPhotoVO = this.baseMapper.findByEaseId(easyId); + if(easyPhotoVO != null){ + //查询随手拍类型 + List<String> typeRelationList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(easyId); + if(!typeRelationList.isEmpty()){ + easyPhotoVO.setEasyPhotoList(typeRelationList); + } + } + return R.ok(easyPhotoVO); + } + } -- Gitblit v1.7.1