From ee78af45af74b6ae6c72c123f63efd1a9b56d4dc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 08 六月 2021 11:01:31 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 fc1459b..b396826 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
@@ -155,6 +155,7 @@
}
BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO);
easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
+ easyPhotoDO.setFeedbackAt(new Date());
//关联随手拍类型
if(!photoHandleDTO.getEasyTypeIds().isEmpty()){
List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();
@@ -223,7 +224,17 @@
*/
@Override
public R easyListByAdmin(PageEasyAdminDTO easyAppDTO){
- return R.ok(this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()), easyAppDTO));
+ IPage<ComActEasyPhotoAdminVO> photoAdminVOIPage = this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()), easyAppDTO);
+ if(!photoAdminVOIPage.getRecords().isEmpty()){
+ photoAdminVOIPage.getRecords().forEach(photoAdmin -> {
+ //随手拍已处理，查询随手拍类型
+ List<String> photoTypeList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdmin.getId());
+ if(!photoTypeList.isEmpty()){
+ photoAdmin.setPhotoTypeList(photoTypeList);
+ }
+ });
+ }
+ return R.ok(photoAdminVOIPage);
}
/**
@@ -293,6 +304,15 @@
*/
@Override
public R easyPublicityByAdmin(ComActEasyPhotoEditAdminDTO photoEditDTO){
+
+ if(photoEditDTO.getType().equals(1)){
+ Integer count = this.baseMapper.selectCount(new QueryWrapper<ComActEasyPhotoDO>().lambda()
+ .eq(ComActEasyPhotoDO::getHandleStatus,ComActEasyPhotoDO.handleStatus.no).in(ComActEasyPhotoDO::getId,photoEditDTO.getIds()));
+ if(count > 0){
+ return R.fail("您选择的有未处理的随手拍，不可进行操作");
+ }
+ }
+
if(this.baseMapper.easyPublicityByAdmin(photoEditDTO) > 0){
return R.ok();
}else{
--
Gitblit v1.7.1