From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 2fe38fa..d0fa644 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
@@ -51,6 +51,7 @@
* @param comActEasyPhotoAddDTO
* @return 新增结果
*/
+ @Override
public R add(ComActEasyPhotoAddDTO comActEasyPhotoAddDTO) {
ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
BeanUtils.copyProperties(comActEasyPhotoAddDTO, comActEasyPhotoDO);
@@ -67,6 +68,7 @@
* @param comActEasyPhotoEditDTO
* @return 维护结果
*/
+ @Override
public R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO) {
ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
BeanUtils.copyProperties(comActEasyPhotoEditDTO, comActEasyPhotoDO);
@@ -83,6 +85,7 @@
* @param easyAppDTO
* @return 维护结果
*/
+ @Override
public R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO) {
Page page = new Page(easyAppDTO.getPageNum(), easyAppDTO.getPageSize());
if (easyAppDTO.getStatus() != null) {
@@ -97,7 +100,7 @@
easyAppDTO.setIsPublicity(1);
break;
case 4:
- easyAppDTO.setIsPublicity(0);
+ easyAppDTO.setIsPublicity(2);
break;
default:
break;
@@ -112,6 +115,7 @@
* @param ComActEasyPhotoDeleteDTO
* @return 平台用户信息
*/
+ @Override
public R delete(ComActEasyPhotoDeleteDTO ComActEasyPhotoDeleteDTO) {
return R.fail();
}
@@ -123,6 +127,7 @@
* 社区活动 》随手拍 id
* @return 查找结果
*/
+ @Override
public R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id) {
ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoMapper.selectById(id);
if (comActEasyPhotoDO != null) {
@@ -253,7 +258,7 @@
photoAdminVOIPage.getRecords().forEach(photoAdmin -> {
if(photoAdmin.getClassifyId() != null){
List<String> photoTypeList =
- comActEasyPhotoTypeRelationMapper.getEasyPhotoClassifyName(photoAdmin.getId());
+ comActEasyPhotoTypeRelationMapper.getEasyPhotoClassifyName(photoAdmin.getClassifyId());
if (!photoTypeList.isEmpty()) {
photoAdmin.setPhotoTypeList(photoTypeList);
}
@@ -309,6 +314,7 @@
}
BeanUtils.copyProperties(photoHandleDTO, easyPhotoDO);
easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
+ easyPhotoDO.setFeedbackAt(new Date());
// 关联随手拍类型
if (!photoHandleDTO.getEasyTypeIds().isEmpty()) {
List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();
--
Gitblit v1.7.1