From 3e0a5ec84e20908f9300dad9b82bc851803cca66 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 01 七月 2022 09:31:18 +0800
Subject: [PATCH] 1、优化页面查询相关bug2、优化优惠申请图片上传3、优化页面性bug
---
service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/GetApplyRoomDiscountBMOImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/GetApplyRoomDiscountBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/GetApplyRoomDiscountBMOImpl.java
index 66cef39..36b46ac 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/GetApplyRoomDiscountBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/GetApplyRoomDiscountBMOImpl.java
@@ -1,8 +1,12 @@
package com.java110.fee.bmo.applyRoomDiscount.impl;
import com.java110.dto.applyRoomDiscount.ApplyRoomDiscountDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.fee.bmo.applyRoomDiscount.IGetApplyRoomDiscountBMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.fee.IApplyRoomDiscountInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -18,6 +22,9 @@
@Autowired
private IApplyRoomDiscountInnerServiceSMO applyRoomDiscountInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
/**
* @param applyRoomDiscountDto
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -27,9 +34,25 @@
int count = applyRoomDiscountInnerServiceSMOImpl.queryApplyRoomDiscountsCount(applyRoomDiscountDto);
- List<ApplyRoomDiscountDto> applyRoomDiscountDtos = null;
+ List<ApplyRoomDiscountDto> applyRoomDiscountDtos = new ArrayList<>();
if (count > 0) {
- applyRoomDiscountDtos = applyRoomDiscountInnerServiceSMOImpl.queryApplyRoomDiscounts(applyRoomDiscountDto);
+ List<ApplyRoomDiscountDto> applyRoomDiscounts = applyRoomDiscountInnerServiceSMOImpl.queryApplyRoomDiscounts(applyRoomDiscountDto);
+ String imgUrl = MappingCache.getValue("IMG_PATH");
+ for (ApplyRoomDiscountDto applyRoomDiscount : applyRoomDiscounts) {
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(applyRoomDiscount.getArdId());
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ List<String> urls = new ArrayList<>();
+ for (FileRelDto fileRel : fileRelDtos) {
+ if (!StringUtil.isEmpty(fileRel.getFileRealName()) && fileRel.getRelTypeCd().equals("19000")) {
+ urls.add(imgUrl + fileRel.getFileRealName());
+ }else if (!StringUtil.isEmpty(fileRel.getFileRealName()) && fileRel.getRelTypeCd().equals("21000")) {
+ urls.add(imgUrl + fileRel.getFileRealName());
+ }
+ }
+ applyRoomDiscount.setUrls(urls);
+ applyRoomDiscountDtos.add(applyRoomDiscount);
+ }
} else {
applyRoomDiscountDtos = new ArrayList<>();
}
--
Gitblit v1.8.0