价格分析按最低价格总计方法修改

src/main/java/com/uas/ps/inquiry/dao/PublicInquiryItemDao.java

@@ -153,6 +153,14 @@ public interface PublicInquiryItemDao extends JpaRepository<PublicInquiryItem, L
      * @param itemIds 询价明细Ids
      * @return 合计价格总额
      */
-    @Query(value = "select sum(sumprice) from (select min(id_sumprice) as sumprice from public$inquiryitems,(select min(id_leadtime) as leadtime,id_sourceid as sourceid from public$inquiryitems where id_sourceid in :itemIds group by id_sourceid) a where id_sourceid = a.sourceid and id_leadtime = a.leadtime group by id_sourceid) b", nativeQuery = true)
+    @Query(value = "select sum(sumprice) from (select min(id_sumprice) as sumprice,id_sourceid as sourceid from public$inquiryitems where id_sourceid in (:itemIds) group by id_sourceid)a", nativeQuery = true)
     Double getMinPriceSumBySourceId(@Param("itemIds") Long[] itemIds);
+
+    /**
+     * 获取按最低交期计算的合计价格
+     * @param itemIds 询价明细Ids
+     * @return 合计价格总额
+     */
+    @Query(value = "select sum(sumprice) from (select min(id_sumprice) as sumprice from public$inquiryitems,(select min(id_leadtime) as leadtime,id_sourceid as sourceid from public$inquiryitems where id_sourceid in :itemIds group by id_sourceid) a where id_sourceid = a.sourceid and id_leadtime = a.leadtime group by id_sourceid) b", nativeQuery = true)
+    Double getMinDeliverySumBySourceId(@Param("itemIds") Long[] itemIds);
 }

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -756,7 +756,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         inquiry.setQuotedAmount(quotedAmount);
         inquiry.setReplaceQuotedAmount(replaceQuotedAmount);
         Double minPriceSum = publicInquiryItemDao.getMinPriceSumBySourceId(itemIds.toArray(itemIdArray));
-        Double minDeliverySum = publicInquiryItemDao.getMinPriceSumBySourceId(itemIds.toArray(itemIdArray));
+        Double minDeliverySum = publicInquiryItemDao.getMinDeliverySumBySourceId(itemIds.toArray(itemIdArray));
         if (null != minPriceSum) {
             inquiry.setMinPriceSum(new BigDecimal(minPriceSum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
         } else {