From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java | 43 +++++++++++++++++--------------------------
1 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java
index f9bf01d..0f72d33 100644
--- a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java
@@ -49,16 +49,12 @@
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
super.validatePageInfo(reqJson);
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯淇℃伅");
-
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
-
hasOwnerId(reqJson);
-
RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
-
if (!StringUtil.isEmpty(ownerRepairDto.getRoomId()) && ownerRepairDto.getRoomId().contains(",")) {
String[] roomIds = ownerRepairDto.getRoomId().split(",");
ownerRepairDto.setRoomIds(roomIds);
@@ -74,9 +70,7 @@
String[] repair_channel = {RepairDto.REPAIR_CHANNEL_STAFF, RepairDto.REPAIR_CHANNEL_TEL};
ownerRepairDto.setRepairChannels(Arrays.asList(repair_channel));
}
-
int count = repairInnerServiceSMOImpl.queryRepairsCount(ownerRepairDto);
-
List<RepairDto> ownerRepairs = new ArrayList<>();
if (count > 0) {
List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(ownerRepairDto);
@@ -121,31 +115,28 @@
}
private void hasOwnerId(JSONObject reqJson) {
- if(reqJson.containsKey("ownerId") && !StringUtil.isEmpty(reqJson.getString("ownerId"))){
+ if (reqJson.containsKey("ownerId") && !StringUtil.isEmpty(reqJson.getString("ownerId"))) {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setMemberId(reqJson.getString("ownerId"));
ownerDto.setCommunityId(reqJson.getString("communityId"));
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
- if(ownerDtos != null && ownerDtos.size() > 0){
- reqJson.put("tel",ownerDtos.get(0).getLink());
+ if (ownerDtos != null && ownerDtos.size() > 0) {
+ reqJson.put("tel", ownerDtos.get(0).getLink());
}
}
}
private void refreshRepair(List<RepairDto> ownerRepairs) {
-
List<String> repairIds = new ArrayList<>();
for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
repairIds.add(apiOwnerRepairDataVo.getRepairId());
}
-
if (repairIds.size() < 1) {
return;
}
RepairUserDto repairUserDto = new RepairUserDto();
repairUserDto.setRepairIds(repairIds.toArray(new String[repairIds.size()]));
List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
-
for (RepairUserDto tmpRepairUserDto : repairUserDtos) {
for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
if (tmpRepairUserDto.getRepairId().equals(apiOwnerRepairDataVo.getRepairId())) {
@@ -154,15 +145,13 @@
}
}
}
-
//鍒峰叆鍥剧墖淇℃伅
List<PhotoVo> photoVos = null;
List<PhotoVo> repairPhotos = null; //涓氫富涓婁紶缁翠慨鍥剧墖
List<PhotoVo> beforePhotos = null; //缁翠慨鍓嶅浘鐗�
List<PhotoVo> afterPhotos = null; //缁翠慨鍚庡浘鐗�
PhotoVo photoVo = null;
- String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
-
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
for (RepairDto repairDto : ownerRepairs) {
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setObjId(repairDto.getRepairId());
@@ -178,28 +167,30 @@
photoVos.add(photoVo);
if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.REL_TYPE_CD_REPAIR)) { //缁翠慨鍥剧墖
photoVo = new PhotoVo();
- if(!tmpFileRelDto.getFileRealName().startsWith("http")){
- photoVo.setUrl(imgUrl+tmpFileRelDto.getFileRealName());
- }else{
+ if (!tmpFileRelDto.getFileRealName().startsWith("http")) {
+ photoVo.setUrl(imgUrl + tmpFileRelDto.getFileRealName());
+ } else {
photoVo.setUrl(tmpFileRelDto.getFileRealName());
}
photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
repairPhotos.add(photoVo); //缁翠慨鍥剧墖
} else if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.BEFORE_REPAIR_PHOTOS)) { //缁翠慨鍓嶅浘鐗�
photoVo = new PhotoVo();
- if(!tmpFileRelDto.getFileRealName().startsWith("http")){
- photoVo.setUrl(imgUrl+tmpFileRelDto.getFileRealName());
- }else{
+ if (!tmpFileRelDto.getFileRealName().startsWith("http")) {
+ photoVo.setUrl(imgUrl + tmpFileRelDto.getFileRealName());
+ } else {
photoVo.setUrl(tmpFileRelDto.getFileRealName());
- } photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
+ }
+ photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
beforePhotos.add(photoVo); //缁翠慨鍓嶅浘鐗�
} else if (tmpFileRelDto.getRelTypeCd().equals(FileRelDto.AFTER_REPAIR_PHOTOS)) { //缁翠慨鍚庡浘鐗�
photoVo = new PhotoVo();
- if(!tmpFileRelDto.getFileRealName().startsWith("http")){
- photoVo.setUrl(imgUrl+tmpFileRelDto.getFileRealName());
- }else{
+ if (!tmpFileRelDto.getFileRealName().startsWith("http")) {
+ photoVo.setUrl(imgUrl + tmpFileRelDto.getFileRealName());
+ } else {
photoVo.setUrl(tmpFileRelDto.getFileRealName());
- } photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
+ }
+ photoVo.setRelTypeCd(tmpFileRelDto.getRelTypeCd());
afterPhotos.add(photoVo);
}
}
--
Gitblit v1.8.0