|
@@ -1217,7 +1217,7 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
|
|
|
Map<String, String> optionalsMap = Maps.newHashMap();
|
|
|
priceDetailMap.entrySet().forEach(entry -> {
|
|
|
JSONObject data = dataMap.get(entry.getKey());
|
|
|
- String no = data.getString("no");
|
|
|
+ String elevatorCode = data.getString("elevatorCode");
|
|
|
entry.getValue().forEach(item -> {
|
|
|
if (isNotBlank(item.getExportParaCodes())){
|
|
|
Arrays.stream(item.getExportParaCodes().split(",")).forEach(code ->{
|
|
@@ -1225,9 +1225,9 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
|
|
|
String key = paraNameMap.get(code) + ":" + (nonNull(str) ? str: data.getString(code));
|
|
|
String value = optionalsMap.get(key);
|
|
|
if (isNotBlank(value)){
|
|
|
- value += "," + no;
|
|
|
+ value += "," + elevatorCode;
|
|
|
} else {
|
|
|
- value = no;
|
|
|
+ value = elevatorCode;
|
|
|
}
|
|
|
optionalsMap.put(key, value);
|
|
|
});
|