From 94e3a209bb9a31c4ddbd31494bb1628f6fe2e96e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 12 十月 2022 17:54:49 +0800
Subject: [PATCH] 新增首页工单 办事指南排行榜接口 导办人员排行榜接口 组织排行榜接口 新增办事指南统计接口 导办人员统计接口 组织胖行榜统计接口
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 a43eea6..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) {
@@ -174,17 +179,17 @@
easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
easyPhotoDO.setFeedbackAt(new Date());
// 关联随手拍类型
- if (!photoHandleDTO.getEasyTypeIds().isEmpty()) {
- List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();
- photoHandleDTO.getEasyTypeIds().forEach(typeId -> {
- ComActEasyPhotoTypeRelationDO typeRelationDO = new ComActEasyPhotoTypeRelationDO();
- typeRelationDO.setEasyId(easyPhotoDO.getId());
- typeRelationDO.setEasyTypeId(typeId);
- typeRelationDO.setCreateAt(new Date());
- typeRelationDOList.add(typeRelationDO);
- });
- comActEasyPhotoTypeRelationService.saveBatch(typeRelationDOList);
- }
+// if (!photoHandleDTO.getEasyTypeIds().isEmpty()) {
+// List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();
+// photoHandleDTO.getEasyTypeIds().forEach(typeId -> {
+// ComActEasyPhotoTypeRelationDO typeRelationDO = new ComActEasyPhotoTypeRelationDO();
+// typeRelationDO.setEasyId(easyPhotoDO.getId());
+// typeRelationDO.setEasyTypeId(typeId);
+// typeRelationDO.setCreateAt(new Date());
+// typeRelationDOList.add(typeRelationDO);
+// });
+// comActEasyPhotoTypeRelationService.saveBatch(typeRelationDOList);
+// }
if (this.baseMapper.updateById(easyPhotoDO) > 0) {
return R.ok();
} else {
@@ -251,11 +256,12 @@
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);
+ if(photoAdmin.getClassifyId() != null){
+ List<String> photoTypeList =
+ comActEasyPhotoTypeRelationMapper.getEasyPhotoClassifyName(photoAdmin.getClassifyId());
+ if (!photoTypeList.isEmpty()) {
+ photoAdmin.setPhotoTypeList(photoTypeList);
+ }
}
});
}
@@ -308,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