diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquiryDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquiryDetail.java index f564831..ab89965 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquiryDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquiryDetail.java @@ -62,6 +62,7 @@ public class InquiryDetail extends BaseEntity { private String supplierId; private String totalPrice; private String singlePrice; + private String arrivalTime; private String areaId ; private String area ; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/QuoteMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/QuoteMapper.java index 66cf44c..aa27f4f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/QuoteMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/QuoteMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.bonus.canteen.core.ims.domain.InquiryDetail; import com.bonus.canteen.core.ims.domain.Quote; +import org.apache.ibatis.annotations.Param; /** * 报价详情Mapper接口 @@ -60,5 +61,5 @@ public interface QuoteMapper { * @return 结果 */ public int deleteQuoteByQuoteIds(Long[] quoteIds); - public int delQuote(Long inquiryId); + public int delQuote(@Param("inquiryId") Long inquiryId,@Param("supplierId") String supplierId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/QuoteServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/QuoteServiceImpl.java index 89d547f..bffeeb7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/QuoteServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/QuoteServiceImpl.java @@ -83,9 +83,10 @@ public class QuoteServiceImpl implements IQuoteService { InquirySupplier iInquirySupplier=new InquirySupplier(); iInquirySupplier.setSupplierId(quote.getSupplierId()); iInquirySupplier.setArrivalTime(quote.getArrivalTime()); + iInquirySupplier.setInquiryId(quote.getInquiryId()); Long allnum=0L; if(list!=null&&list.size()>0){ - quoteMapper.delQuote(quote.getInquiryId()); + quoteMapper.delQuote(quote.getInquiryId(),quote.getSupplierId()); for(InquiryDetail vo:list){ Quote addquote=new Quote(); addquote.setInquiryId(quote.getInquiryId()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquirySupplierMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquirySupplierMapper.xml index 018cdc1..fc0945e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquirySupplierMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquirySupplierMapper.xml @@ -81,8 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ims_inquiry_supplier - inquiry_supplier_id = #{inquirySupplierId}, - inquiry_id = #{inquiryId}, inquiry_code = #{inquiryCode}, quote_time = #{quoteTime}, bid_status = #{bidStatus}, @@ -94,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where id = #{id} + where inquiry_id = #{inquiryId} and inquiry_supplier_id=#{supplierId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml index 6c8fbc7..9587a47 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml @@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -78,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"