From d17f28fb9a5894b08cd8754d763f0f06e93cb958 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 10 二月 2021 15:11:34 +0800
Subject: [PATCH] 1、优化报修汇总报表增加汇总数据展示2、增加业主绑定后登录获取头像和昵称3、员工办结维修前图片和维修后图片上传4、业主手机端查询详情时刷入图片信息

---
 service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java b/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java
index 4a875c5..13608cb 100644
--- a/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java
@@ -125,19 +125,44 @@
 
         //鍒峰叆鍥剧墖淇℃伅
         List<PhotoVo> photoVos = null;
+        List<PhotoVo> repairPhotos = null;  //涓氫富涓婁紶缁翠慨鍥剧墖
+        List<PhotoVo> beforePhotos = null;  //缁翠慨鍓嶅浘鐗�
+        List<PhotoVo> afterPhotos = null;  //缁翠慨鍚庡浘鐗�
         PhotoVo photoVo = null;
         for (RepairDto repairDto : ownerRepairs) {
             FileRelDto fileRelDto = new FileRelDto();
             fileRelDto.setObjId(repairDto.getRepairId());
             List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
             photoVos = new ArrayList<>();
+            repairPhotos = new ArrayList<>();
+            beforePhotos = new ArrayList<>();
+            afterPhotos = new ArrayList<>();
             for (FileRelDto tmpFileRelDto : fileRelDtos) {
                 photoVo = new PhotoVo();
                 photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+                photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
                 photoVos.add(photoVo);
+                if (tmpFileRelDto.getRelTypeCd().equals("14000")) {  //缁翠慨鍥剧墖
+                    photoVo = new PhotoVo();
+                    photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+                    photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
+                    repairPhotos.add(photoVo);  //缁翠慨鍥剧墖
+                } else if (tmpFileRelDto.getRelTypeCd().equals("19000")) {  //缁翠慨鍓嶅浘鐗�
+                    photoVo = new PhotoVo();
+                    photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+                    photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
+                    beforePhotos.add(photoVo);  //缁翠慨鍓嶅浘鐗�
+                } else if (tmpFileRelDto.getRelTypeCd().equals("200000")) {  //缁翠慨鍚庡浘鐗�
+                    photoVo = new PhotoVo();
+                    photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
+                    photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
+                    afterPhotos.add(photoVo);
+                }
             }
-
             repairDto.setPhotos(photoVos);
+            repairDto.setRepairPhotos(repairPhotos);
+            repairDto.setBeforePhotos(beforePhotos);
+            repairDto.setAfterPhotos(afterPhotos);
         }
 
     }

--
Gitblit v1.8.0