bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk

This commit is contained in:
skjia 2025-07-21 13:16:53 +08:00
parent 784e7689b1
commit 40b0dbaefd
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquiryDetail.java
View File

@ -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 ;

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/QuoteMapper.java
View File

@ -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);
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/QuoteServiceImpl.java
View File

@ -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());

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquirySupplierMapper.xml
View File

@ -81,8 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateInquirySupplier" parameterType="com.bonus.canteen.core.ims.domain.InquirySupplier">
update ims_inquiry_supplier
<trim prefix="SET" suffixOverrides=",">
<if test="inquirySupplierId != null">inquiry_supplier_id = #{inquirySupplierId},</if>
<if test="inquiryId != null">inquiry_id = #{inquiryId},</if>
<if test="inquiryCode != null and inquiryCode != ''">inquiry_code = #{inquiryCode},</if>
<if test="quoteTime != null">quote_time = #{quoteTime},</if>
<if test="bidStatus != null">bid_status = #{bidStatus},</if>
@ -94,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
where inquiry_id = #{inquiryId} and inquiry_supplier_id=#{supplierId}
</update>
<delete id="deleteInquirySupplierById" parameterType="Long">

13
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml
View File

@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="totalPrice" column="total_price" />
<result property="singlePrice" column="single_price" />
<result property="inquiryDetailId" column="inquiry_detail_id" />
<result property="arrivalTime" column="arrival_time" />
</resultMap>
<sql id="selectQuoteVo">
@ -78,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectInquiryDetailByInquiryId" parameterType="com.bonus.canteen.core.ims.domain.Quote" resultMap="InquiryDetailResult">
SELECT aa.inquiry_id,aa.inquiry_detail_id,aa.purchase_num,aa.notes,aa.inquiry_code,bb.*,cc.quote_num,cc.total_price,cc.single_price
SELECT aa.inquiry_id,aa.inquiry_detail_id,aa.purchase_num,aa.notes,aa.inquiry_code,bb.*,cc.quote_num,cc.total_price,cc.single_price,cc.arrival_time
FROM ims_inquiry_detail aa
LEFT JOIN (
select cm.material_id, material_name, material_code,cm.img_url,
@ -104,10 +105,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by material_id) ii on ii.material_id = cm.material_id
) bb on aa.material_id =bb.material_id
left join (
select bb.inquiry_id,aa.inquiry_detail_id,aa.quote_num,aa.total_price,aa.single_price
select bb.inquiry_id,aa.inquiry_detail_id,aa.quote_num,aa.total_price,aa.single_price,cc.arrival_time
from ims_quote aa
left join ims_inquiry_detail bb on aa.inquiry_detail_id=bb.inquiry_detail_id
left join ims_inquiry_supplier cc on bb.inquiry_id=cc.inquiry_id
left join ims_inquiry_supplier cc on bb.inquiry_id=cc.inquiry_id and aa.inquiry_supplier_id=cc.supplier_id
where aa.inquiry_supplier_id=#{supplierId}
) cc on aa.inquiry_detail_id=cc.inquiry_detail_id
left join ims_inquiry_supplier dd on aa.inquiry_id=dd.inquiry_id
@ -143,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="inquiryId != null">inquiry_Id,</if>
<if test="inquiryId != null">#{inquiryId},</if>
</trim>
</insert>
@ -173,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{quoteId}
</foreach>
</delete>
<delete id="delQuote" parameterType="Long">
delete from ims_quote where inquiry_id=#{inquiryId}
<delete id="delQuote" >
delete from ims_quote where inquiry_id=#{inquiryId} and inquiry_supplier_id=#{supplierId}
</delete>
</mapper>