From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 13608cb..6084f66 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
@@ -21,6 +21,7 @@
import org.springframework.http.ResponseEntity;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
@@ -80,6 +81,17 @@
ownerRepairDto.setRoomIds(roomIds);
ownerRepairDto.setRoomId("");
}
+ //PC鐢佃瘽鎶ヤ慨銆丳C宸ュ崟姹犮�丠5宸ュ崟姹�
+ //鎵嬫満绔憳宸ュ崟宸ュ崟姹� 鍙繑鍥炴湭澶勭悊鐘舵�佺殑鏁版嵁
+ if (!StringUtil.isEmpty(ownerRepairDto.getReqSource()) && ownerRepairDto.getReqSource().equals("mobile")) {
+ ownerRepairDto.setState(RepairDto.STATE_WAIT);
+ }
+ //pc鐢佃瘽鎶ヤ慨妯″潡 鍙繑鍥濸C鍛樺伐鐧昏鍜屾墜鏈虹鍛樺伐鐧昏鐨勬暟鎹�
+ if (!StringUtil.isEmpty(ownerRepairDto.getReqSource()) && ownerRepairDto.getReqSource().equals("pc_mobile")) {
+ String[] repair_channel={RepairDto.REPAIR_CHANNEL_STAFF, RepairDto.REPAIR_CHANNEL_TEL};
+ ownerRepairDto.setRepairChannels(Arrays.asList(repair_channel));
+ }
+
int count = repairInnerServiceSMOImpl.queryRepairsCount(ownerRepairDto);
@@ -142,17 +154,17 @@
photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
photoVos.add(photoVo);
- if (tmpFileRelDto.getRelTypeCd().equals("14000")) { //缁翠慨鍥剧墖
+ if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.REL_TYPE_CD_REPAIR)) { //缁翠慨鍥剧墖
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")) { //缁翠慨鍓嶅浘鐗�
+ } else if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.BEFORE_REPAIR_PHOTOS)) { //缁翠慨鍓嶅浘鐗�
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")) { //缁翠慨鍚庡浘鐗�
+ } else if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.AFTER_REPAIR_PHOTOS)) { //缁翠慨鍚庡浘鐗�
photoVo = new PhotoVo();
photoVo.setUrl("/callComponent/download/getFile/file?fileId=" + tmpFileRelDto.getFileRealName() + "&communityId=" + repairDto.getCommunityId());
photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
--
Gitblit v1.8.0