|
@@ -70,6 +70,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
import com.ruoyi.project.business.service.quotation.*;
|
|
|
import com.ruoyi.project.system.domain.SysDictData;
|
|
|
+import com.ruoyi.project.system.mapper.SysDictDataMapper;
|
|
|
import fr.opensagres.xdocreport.document.images.FileImageProvider;
|
|
|
import fr.opensagres.xdocreport.template.formatter.NullImageBehaviour;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
@@ -80,6 +81,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.io.File;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
@@ -146,7 +148,8 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
|
|
|
private final ITpParaLibraryService tpParaLibraryService;
|
|
|
|
|
|
private final ITpParaSelectItemService tpParaSelectItemService;
|
|
|
-
|
|
|
+ @Resource
|
|
|
+ private SysDictDataMapper dictDataMapper;
|
|
|
|
|
|
/**
|
|
|
* 查询【请填写功能名称】
|
|
@@ -1272,7 +1275,12 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
|
|
|
// 2.3 规格统计信息
|
|
|
String targetPort = "";
|
|
|
if (isNotBlank(tqQuotation.getTargetPort())){
|
|
|
- targetPort = DictUtils.getInternationalDictLabel("target_port", tqQuotation.getTargetPort());
|
|
|
+ //targetPort = DictUtils.getInternationalDictLabel("target_port", tqQuotation.getTargetPort());
|
|
|
+ List<SysDictData> dict = dictDataMapper.selectDictDataByType("target_port").stream()
|
|
|
+ .filter(it->it.getDictValue().equals(tqQuotation.getTargetPort())).collect(Collectors.toList());
|
|
|
+ if(ObjectUtils.isNotEmpty(dict)){
|
|
|
+ targetPort = dict.get(0).getDictLabelUS();
|
|
|
+ }
|
|
|
//装船口岸需要字典
|
|
|
map.put("targetPort", "- To " + targetPort);
|
|
|
}
|