|
@@ -37,6 +37,7 @@ import javax.persistence.criteria.CriteriaBuilder;
|
|
|
import javax.persistence.criteria.CriteriaQuery;
|
|
import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
import javax.persistence.criteria.Root;
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
|
|
@@ -756,8 +757,16 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
inquiry.setReplaceQuotedAmount(replaceQuotedAmount);
|
|
inquiry.setReplaceQuotedAmount(replaceQuotedAmount);
|
|
|
Double minPriceSum = publicInquiryItemDao.getMinPriceSumBySourceId(itemIds.toArray(itemIdArray));
|
|
Double minPriceSum = publicInquiryItemDao.getMinPriceSumBySourceId(itemIds.toArray(itemIdArray));
|
|
|
Double minDeliverySum = publicInquiryItemDao.getMinPriceSumBySourceId(itemIds.toArray(itemIdArray));
|
|
Double minDeliverySum = publicInquiryItemDao.getMinPriceSumBySourceId(itemIds.toArray(itemIdArray));
|
|
|
- inquiry.setMinPriceSum(minPriceSum);
|
|
|
|
|
- inquiry.setMinDeliverySum(minDeliverySum);
|
|
|
|
|
|
|
+ if (null != minPriceSum) {
|
|
|
|
|
+ inquiry.setMinPriceSum(new BigDecimal(minPriceSum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ inquiry.setMinPriceSum(0d);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (null != minDeliverySum) {
|
|
|
|
|
+ inquiry.setMinDeliverySum(new BigDecimal(minDeliverySum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ inquiry.setMinDeliverySum(0d);
|
|
|
|
|
+ }
|
|
|
return inquiry;
|
|
return inquiry;
|
|
|
}
|
|
}
|
|
|
|
|
|