From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 23:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 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..1de6b47 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);
}
/**
--
Gitblit v1.7.1