diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InquiryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InquiryController.java
index d8c4720..d7d00e7 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InquiryController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InquiryController.java
@@ -2,6 +2,8 @@ package com.bonus.canteen.core.ims.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 import com.bonus.common.log.enums.OperaType;
 //import com.bonus.canteen.core.ims.common.annotation.PreventRepeatSubmit;
 import io.swagger.annotations.Api;
@@ -42,8 +44,8 @@ public class InquiryController extends BaseController {
      */
     @ApiOperation(value = "查询询价单列表")
     //@RequiresPermissions("ims:inquiry:list")
-    @GetMapping("/list")
-    public TableDataInfo list(Inquiry inquiry) {
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody @Valid Inquiry inquiry) {
         startPage();
         List<Inquiry> list = inquiryService.selectInquiryList(inquiry);
         return getDataTable(list);
@@ -68,7 +70,7 @@ public class InquiryController extends BaseController {
      */
     @ApiOperation(value = "获取询价单详细信息")
     //@RequiresPermissions("ims:inquiry:query")
-    @GetMapping(value = "/{inquiryId}")
+    @PostMapping(value = "/{inquiryId}")
     public AjaxResult getInfo(@PathVariable("inquiryId") Long inquiryId) {
         return success(inquiryService.selectInquiryByInquiryId(inquiryId));
     }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/Inquiry.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/Inquiry.java
index 769ed36..85b75bd 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/Inquiry.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/Inquiry.java
@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.ims.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
@@ -96,12 +98,28 @@ public class Inquiry extends BaseEntity {
     /** 中标供应商id */
     @Excel(name = "中标供应商id")
     @ApiModelProperty(value = "中标供应商id")
-    private Long supplierId;
+    private String supplierId;
 
+    private String[] supplierIds;
+    private String supplierIdstr;
     /** 选择的区域 */
     @Excel(name = "选择的区域")
     @ApiModelProperty(value = "选择的区域")
     private String area;
+    private String bidStatus;
+    @Excel(name = "邀请供应商")
+    @ApiModelProperty(value = "邀请供应商")
+    private String inquirySupplierNum;
+    @Excel(name = "报价供应商")
+    @ApiModelProperty(value = "报价供应商")
+    private String supplierNum;
+    List<InquiryDetail> detailList;
+    /** 中标供应商id */
+    @Excel(name = "中标供应商名称")
+    @ApiModelProperty(value = "中标供应商名称")
+    private String supplierName;
 
-
+    private String searchValue;
+    private String inquiryState;
+    private String orderStatus;
 }
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 7c9c3c4..fca201e 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
@@ -56,7 +56,35 @@ public class InquiryDetail extends BaseEntity {
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty(value = "采购数量")
-    private BigDecimal purchaseNum;
+    private BigDecimal purNum;
 
 
+    private String areaId                 ;
+    private String area               ;
+    private String barCode                ;
+    private String bigCategoryId          ;
+    private String description            ;
+    private String goodsType              ;
+    private String imgUrl                 ;
+    private String materialCode           ;
+    private String materialName           ;
+    private String materialTotalNum       ;
+    private String materialTypeId         ;
+    private String materialTypeIds        ;
+    private String materialTypeName       ;
+    private String missionSource          ;
+    private String nutritionId            ;
+    private String nutritionList          ;
+    private String nutritionName          ;
+    private String nutritionTypeId        ;
+    private String nutritionTypeName      ;
+    private String purPriceCeiling        ;
+    private String remark                 ;
+    private String salePrice              ;
+    private String salesMode              ;
+    private String shelfLifeDays          ;
+    private String shelfLifeType          ;
+    private String unitName               ;
+    private String unitPrice              ;
+
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquirySupplier.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquirySupplier.java
index a660fec..5d430f4 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquirySupplier.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InquirySupplier.java
@@ -27,7 +27,7 @@ public class InquirySupplier extends BaseEntity {
     /** 询价供应商id */
     @Excel(name = "询价供应商id")
     @ApiModelProperty(value = "询价供应商id")
-    private Long inquirySupplierId;
+    private String inquirySupplierId;
 
     /** 询价单id */
     @Excel(name = "询价单id")
@@ -48,17 +48,17 @@ public class InquirySupplier extends BaseEntity {
     /** 决标状态(1-已报价,2-未报价,3-已中标,4-未中标) */
     @Excel(name = "决标状态(1-已报价,2-未报价,3-已中标,4-未中标)")
     @ApiModelProperty(value = "决标状态(1-已报价,2-未报价,3-已中标,4-未中标)")
-    private Long bidStatus;
+    private String bidStatus;
 
     /** 报价供应商id */
     @Excel(name = "报价供应商id")
     @ApiModelProperty(value = "报价供应商id")
-    private Long supplierId;
+    private String supplierId;
 
     /** 报价总金额 */
     @Excel(name = "报价总金额")
     @ApiModelProperty(value = "报价总金额")
-    private Long quoteAmount;
+    private String quoteAmount;
 
     /** 交货日期 */
     @ApiModelProperty(value = "交货日期")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryDetailMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryDetailMapper.java
index 44fef52..9bc60b0 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryDetailMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryDetailMapper.java
@@ -34,6 +34,8 @@ public interface InquiryDetailMapper {
      */
     public int insertInquiryDetail(InquiryDetail inquiryDetail);
 
+
+    public int delInquiryDetail(InquiryDetail inquiryDetail);
     /**
      * 修改询价原料明细
      * 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryMapper.java
index 625b36d..1d0ca5e 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquiryMapper.java
@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.Inquiry;
+import com.bonus.canteen.core.ims.domain.InquiryDetail;
 
 /**
  * 询价单Mapper接口
@@ -18,6 +19,14 @@ public interface InquiryMapper {
      */
     public Inquiry selectInquiryByInquiryId(Long inquiryId);
 
+    /**
+     * 查询询价单货品清单
+     *
+     * @param inquiryId 询价单主键
+     * @return 询价单单货品清单
+     */
+    public List<InquiryDetail> selectInquiryDetailByInquiryId(Long inquiryId);
+
     /**
      * 查询询价单列表
      * 
@@ -57,4 +66,6 @@ public interface InquiryMapper {
      * @return 结果
      */
     public int deleteInquiryByInquiryIds(Long[] inquiryIds);
+
+
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquirySupplierMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquirySupplierMapper.java
index 0808bbc..c41f8a7 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquirySupplierMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InquirySupplierMapper.java
@@ -34,6 +34,7 @@ public interface InquirySupplierMapper {
      */
     public int insertInquirySupplier(InquirySupplier inquirySupplier);
 
+    public int delInquirySupplier(InquirySupplier inquirySupplier);
     /**
      * 修改询价供应商
      * 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InquiryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InquiryServiceImpl.java
index bb8e117..ffa9355 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InquiryServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InquiryServiceImpl.java
@@ -1,6 +1,12 @@
 package com.bonus.canteen.core.ims.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import com.bonus.canteen.core.ims.domain.InquiryDetail;
+import com.bonus.canteen.core.ims.domain.InquirySupplier;
+import com.bonus.canteen.core.ims.mapper.InquiryDetailMapper;
+import com.bonus.canteen.core.ims.mapper.InquirySupplierMapper;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +15,8 @@ import com.bonus.canteen.core.ims.mapper.InquiryMapper;
 import com.bonus.canteen.core.ims.domain.Inquiry;
 import com.bonus.canteen.core.ims.service.IInquiryService;
 
+import static com.bonus.canteen.core.ims.utils.NoGenerateUtils.generateInquiryCode;
+
 /**
  * 询价单Service业务层处理
  * 
@@ -19,7 +27,10 @@ import com.bonus.canteen.core.ims.service.IInquiryService;
 public class InquiryServiceImpl implements IInquiryService {
     @Autowired
     private InquiryMapper inquiryMapper;
-
+    @Autowired
+    private InquirySupplierMapper inquirySupplierMapper;
+    @Autowired
+    private InquiryDetailMapper inquiryDetailMapper;
     /**
      * 查询询价单
      * 
@@ -28,7 +39,16 @@ public class InquiryServiceImpl implements IInquiryService {
      */
     @Override
     public Inquiry selectInquiryByInquiryId(Long inquiryId) {
-        return inquiryMapper.selectInquiryByInquiryId(inquiryId);
+        Inquiry inquiry=new Inquiry();
+        try{
+            inquiry=inquiryMapper.selectInquiryByInquiryId(inquiryId);
+            List<InquiryDetail> inquiryDetails=new ArrayList<>();
+            inquiryDetails=inquiryMapper.selectInquiryDetailByInquiryId(inquiryId);
+            inquiry.setDetailList(inquiryDetails);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return inquiry;
     }
 
     /**
@@ -52,7 +72,35 @@ public class InquiryServiceImpl implements IInquiryService {
     public int insertInquiry(Inquiry inquiry) {
         inquiry.setCreateTime(DateUtils.getNowDate());
         try {
-            return inquiryMapper.insertInquiry(inquiry);
+            List<InquiryDetail>  detailList=new ArrayList<>();
+            detailList=inquiry.getDetailList();
+            String[] supplierIds = inquiry.getSupplierIds();
+            String inquiryCode = generateInquiryCode();
+            inquiry.setInquiryCode(inquiryCode);
+            inquiryMapper.insertInquiry(inquiry);
+            //录入询价供应商
+            if(supplierIds.length>0){
+                for(int i=0;i<supplierIds.length;i++){
+                    InquirySupplier inquirySupplier=new InquirySupplier();
+                    inquirySupplier.setInquirySupplierId(supplierIds[i]);
+                    inquirySupplier.setSupplierId(supplierIds[i]);
+                    inquirySupplier.setBidStatus("2");
+                    inquirySupplier.setInquiryId(inquiry.getInquiryId());
+                    inquirySupplier.setInquiryCode(inquiry.getInquiryCode());
+                    inquirySupplier.setCreateTime(inquiry.getCreateTime());
+                    inquirySupplierMapper.insertInquirySupplier(inquirySupplier);
+                }
+            }
+            //录入货品详情
+            if(detailList!=null&&detailList.size()>0){
+                for(InquiryDetail vo:detailList){
+                    vo.setInquiryId(inquiry.getInquiryId());
+                    vo.setInquiryCode(inquiry.getInquiryCode());
+                    vo.setCreateTime(inquiry.getCreateTime());
+                    inquiryDetailMapper.insertInquiryDetail(vo);
+                }
+            }
+            return 1;
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());
         }
@@ -68,7 +116,39 @@ public class InquiryServiceImpl implements IInquiryService {
     public int updateInquiry(Inquiry inquiry) {
         inquiry.setUpdateTime(DateUtils.getNowDate());
         try {
-            return inquiryMapper.updateInquiry(inquiry);
+            List<InquiryDetail>  detailList=new ArrayList<>();
+            detailList=inquiry.getDetailList();
+            String[] supplierIds = inquiry.getSupplierIds();
+            inquiryMapper.updateInquiry(inquiry);
+            //录入询价供应商
+            if(supplierIds.length>0){
+                InquirySupplier delInquirySupplier=new InquirySupplier();
+                delInquirySupplier.setInquiryId(inquiry.getInquiryId());
+                inquirySupplierMapper.delInquirySupplier(delInquirySupplier);
+                for(int i=0;i<supplierIds.length;i++){
+                    InquirySupplier inquirySupplier=new InquirySupplier();
+                    inquirySupplier.setInquirySupplierId(supplierIds[i]);
+                    inquirySupplier.setSupplierId(supplierIds[i]);
+                    inquirySupplier.setBidStatus("2");
+                    inquirySupplier.setInquiryId(inquiry.getInquiryId());
+                    inquirySupplier.setInquiryCode(inquiry.getInquiryCode());
+                    inquirySupplier.setCreateTime(inquiry.getCreateTime());
+                    inquirySupplierMapper.insertInquirySupplier(inquirySupplier);
+                }
+            }
+            //录入货品详情
+            if(detailList!=null&&detailList.size()>0){
+                InquiryDetail delInquiryDetail=new InquiryDetail();
+                delInquiryDetail.setInquiryId(inquiry.getInquiryId());
+                inquiryDetailMapper.delInquiryDetail(delInquiryDetail);
+                for(InquiryDetail vo:detailList){
+                    vo.setInquiryId(inquiry.getInquiryId());
+                    vo.setInquiryCode(inquiry.getInquiryCode());
+                    vo.setCreateTime(inquiry.getCreateTime());
+                    inquiryDetailMapper.insertInquiryDetail(vo);
+                }
+            }
+            return 1;
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());
         }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryDetailMapper.xml
index 74b52d4..b2143fa 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryDetailMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryDetailMapper.xml
@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unitId"    column="unit_id"    />
         <result property="materialId"    column="material_id"    />
         <result property="size"    column="size"    />
-        <result property="purchaseNum"    column="purchase_num"    />
+        <result property="purNum"    column="purchase_num"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unitId != null "> and unit_id = #{unitId}</if>
             <if test="materialId != null "> and material_id = #{materialId}</if>
             <if test="size != null  and size != ''"> and size = #{size}</if>
-            <if test="purchaseNum != null "> and purchase_num = #{purchaseNum}</if>
+            <if test="purNum != null "> and purchase_num = #{purNum}</if>
         </where>
     </select>
     
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unitId != null">unit_id,</if>
             <if test="materialId != null">material_id,</if>
             <if test="size != null">size,</if>
-            <if test="purchaseNum != null">purchase_num,</if>
+            <if test="purNum != null">purchase_num,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unitId != null">#{unitId},</if>
             <if test="materialId != null">#{materialId},</if>
             <if test="size != null">#{size},</if>
-            <if test="purchaseNum != null">#{purchaseNum},</if>
+            <if test="purNum != null">#{purNum},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -70,6 +70,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <delete id="delInquiryDetail">
+        delete from ims_inquiry_detail where inquiry_id=#{inquiryId}
+    </delete>
+
     <update id="updateInquiryDetail" parameterType="com.bonus.canteen.core.ims.domain.InquiryDetail">
         update ims_inquiry_detail
         <trim prefix="SET" suffixOverrides=",">
@@ -79,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unitId != null">unit_id = #{unitId},</if>
             <if test="materialId != null">material_id = #{materialId},</if>
             <if test="size != null">size = #{size},</if>
-            <if test="purchaseNum != null">purchase_num = #{purchaseNum},</if>
+            <if test="purNum != null">purchase_num = #{purNum},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml
index adb0907..9a2a2bf 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml
@@ -19,41 +19,144 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="bidTotalPrice"    column="bid_total_price"    />
         <result property="supplierId"    column="supplier_id"    />
+        <result property="supplierIdstr"    column="supplier_ids"    />
         <result property="area"    column="area"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="supplierName"    column="supplier_name"    />
+    </resultMap>
+    <resultMap type="com.bonus.canteen.core.ims.domain.InquiryDetail" id="InquiryDetailResult">
+        <result property="inquiryId"    column="inquiry_id"    />
+        <result property="areaId"    column="area_id"    />
+        <result property="inquiryCode"    column="inquiry_code"    />
+        <result property="area"    column="area"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="materialId"    column="material_id"    />
+        <result property="areaId"    column="area_id"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="imgUrl"    column="img_url"    />
+        <result property="nutritionId"    column="nutrition_id"    />
+        <result property="materialTypeId"    column="material_type_id"    />
+        <result property="nutritionTypeId"    column="nutrition_type_id"    />
+        <result property="goodsType"    column="goods_type"    />
+        <result property="barCode"    column="bar_code"    />
+        <result property="unitId"    column="unit_id"    />
+        <result property="salePrice"    column="sale_price"    />
+        <result property="unitPrice"    column="unit_price"    />
+        <result property="salesMode"    column="sales_mode"    />
+        <result property="shelfLifeType"    column="shelf_life_type"    />
+        <result property="shelfLifeDays"    column="shelf_life_days"    />
+        <result property="purPriceCeiling"    column="pur_price_ceiling"    />
+        <result property="bigCategoryId"    column="big_category_id"    />
+        <result property="size"    column="size"    />
+        <result property="description"    column="description"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="nutritionName"    column="nutrition_name"    />
+        <result property="materialTypeName"    column="material_type_name"    />
+        <result property="area"    column="area_name"    />
+        <result property="nutritionTypeName"    column="nutrition_type_name"    />
+        <result property="unitName"    column="unit_name"    />
+        <result property="materialTotalNum"    column="material_total_num"    />
+        <result property="purNum"    column="purchase_num"    />
+        <result property="notes"    column="notes"    />
     </resultMap>
 
     <sql id="selectInquiryVo">
-        select inquiry_id, area_id, inquiry_code, title, start_time, end_time, status, bid_time, request_arrival_time, inquiry_notes, phone, link_man, address, bid_total_price, supplier_id, area, create_by, create_time, update_by, update_time from ims_inquiry
+        select aa.inquiry_id, aa.area_id, aa.inquiry_code, aa.title, aa.start_time, aa.end_time, aa.status, aa.bid_time,
+               aa.request_arrival_time, aa.inquiry_notes, aa.phone, aa.link_man, aa.address, aa.bid_total_price, aa.supplier_id,
+               bb.area_name as area, aa.create_by, aa.create_time, aa.update_by, aa.update_time,case when cc.bid_status=3 then dd.supplier_name else '' end as supplier_name,
+               sum(case when cc.bid_status=2 then 1 else 0 end) as inquirySupplierNum,
+               sum(case when cc.bid_status=1 then 1 else 0 end) as supplierNum
+        from ims_inquiry aa
+                 left join basic_area bb on aa.area_id=bb.area_id
+                 left join ims_inquiry_supplier cc on aa.inquiry_id=cc.inquiry_id
+                 left join ims_supplier dd on cc.inquiry_supplier_id=dd.supplier_id
+        group by aa.inquiry_id
     </sql>
 
     <select id="selectInquiryList" parameterType="com.bonus.canteen.core.ims.domain.Inquiry" resultMap="InquiryResult">
-        <include refid="selectInquiryVo"/>
-        <where>  
-            <if test="areaId != null "> and area_id = #{areaId}</if>
-            <if test="inquiryCode != null  and inquiryCode != ''"> and inquiry_code = #{inquiryCode}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="bidTime != null "> and bid_time = #{bidTime}</if>
-            <if test="requestArrivalTime != null "> and request_arrival_time = #{requestArrivalTime}</if>
-            <if test="inquiryNotes != null  and inquiryNotes != ''"> and inquiry_notes = #{inquiryNotes}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="linkMan != null  and linkMan != ''"> and link_man = #{linkMan}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="bidTotalPrice != null "> and bid_total_price = #{bidTotalPrice}</if>
-            <if test="supplierId != null "> and supplier_id = #{supplierId}</if>
-            <if test="area != null  and area != ''"> and area = #{area}</if>
+        select aa.inquiry_id, aa.area_id, aa.inquiry_code, aa.title, aa.start_time, aa.end_time, aa.status, aa.bid_time,
+        aa.request_arrival_time, aa.inquiry_notes, aa.phone, aa.link_man, aa.address, aa.bid_total_price, aa.supplier_id,
+        bb.area_name as area, aa.create_by, aa.create_time, aa.update_by, aa.update_time,case when cc.bid_status=3 then dd.supplier_name else '' end as supplier_name,
+        GROUP_CONCAT(cc.inquiry_supplier_id ) as supplier_ids,
+        sum(case when cc.bid_status=2 then 1 else 0 end) as inquirySupplierNum,
+        sum(case when cc.bid_status=1 then 1 else 0 end) as supplierNum
+        from ims_inquiry aa
+        left join basic_area bb on aa.area_id=bb.area_id
+        left join ims_inquiry_supplier cc on aa.inquiry_id=cc.inquiry_id
+        left join ims_supplier dd on cc.inquiry_supplier_id=dd.supplier_id
+        <where>
+            <if test="areaId != null "> and aa.area_id = #{areaId}</if>
+            <if test="searchValue != null  and searchValue != ''">
+             and (aa.inquiry_code  like CONCAT('%',#{searchValue},'%') or aa.title  like CONCAT('%',#{searchValue},'%')
+                 )
+            </if>
+            <if test="inquiryState != null  and inquiryState != '' and inquiryState == '1'"> and aa.status = 1 </if>
+            <if test="inquiryState != null  and inquiryState != '' and inquiryState == '2'"> and aa.status = 3 </if>
+            <if test="inquiryState != null  and inquiryState != '' and inquiryState == '3'"> and aa.status = 4 </if>
+            <if test="inquiryState != null  and inquiryState != '' and inquiryState == '4'"> and aa.status = 5 </if>
+            <if test="status != null  and status != '' and status == '1'"> and aa.status = 4 </if>
+            <if test="status != null  and status != '' and status == '2'"> and aa.status = 5 </if>
+            <if test="orderStatus != null  and orderStatus != '' and orderStatus == '1'"> and aa.status = 1 </if>
+            <if test="orderStatus != null  and orderStatus != '' and orderStatus == '2'"> and aa.status != 1</if>
+            <if test="startTime != null "> and aa.start_time >= #{startTime} </if>
+            <if test="endTime != null "> and #{endTime}>=aa.start_time </if>
+
         </where>
+        group by aa.inquiry_id
     </select>
     
     <select id="selectInquiryByInquiryId" parameterType="Long" resultMap="InquiryResult">
-        <include refid="selectInquiryVo"/>
-        where inquiry_id = #{inquiryId}
+        select aa.inquiry_id, aa.area_id, aa.inquiry_code, aa.title, aa.start_time, aa.end_time, aa.status, aa.bid_time,
+               aa.request_arrival_time, aa.inquiry_notes, aa.phone, aa.link_man, aa.address, aa.bid_total_price, aa.supplier_id,
+               bb.area_name as area, aa.create_by, aa.create_time, aa.update_by, aa.update_time,case when cc.bid_status=3 then dd.supplier_name else '' end as supplier_name,
+               GROUP_CONCAT(cc.inquiry_supplier_id ) as supplier_ids,
+               sum(case when cc.bid_status=2 then 1 else 0 end) as inquirySupplierNum,
+               sum(case when cc.bid_status=1 then 1 else 0 end) as supplierNum
+        from ims_inquiry aa
+                 left join basic_area bb on aa.area_id=bb.area_id
+                 left join ims_inquiry_supplier cc on aa.inquiry_id=cc.inquiry_id
+                 left join ims_supplier dd on cc.inquiry_supplier_id=dd.supplier_id
+        where aa.inquiry_id = #{inquiryId}
+        group by aa.inquiry_id
+    </select>
+
+    <select id="selectInquiryDetailByInquiryId" parameterType="Long" resultMap="InquiryDetailResult">
+        SELECT aa.inquiry_id,aa.purchase_num,aa.notes,aa.inquiry_code,bb.*
+        FROM ims_inquiry_detail aa
+                 LEFT JOIN (
+            select cm.material_id, material_name, material_code,cm.img_url,
+                   cm.goods_type, bar_code,
+                   sale_price, unit_price, sales_mode, shelf_life_type, shelf_life_days,
+                   pur_price_ceiling, big_category_id, size, cm.description,cm.create_by,
+                cm.create_time, cm.update_by, cm.update_time,
+                cm.nutrition_id,cn.nutrition_name,
+                cmt.material_type_id, cmt.material_type_name,
+                a.area_id, a.area_name,
+                cm.nutrition_type_id,  cnt.nutrition_type_name,
+                iu.unit_name,cm.unit_id,
+                ii.material_total_num
+            from cook_material cm
+                left join cook_material_type cmt on cm.material_type_id = cmt.material_type_id
+                left join cook_nutrition_type cnt on cm.nutrition_type_id = cnt.nutrition_type_id
+                left join cook_nutrition cn on cm.nutrition_id = cn.nutrition_id
+                left join ims_unit iu on cm.unit_id = iu.unit_id
+                left join basic_area a on cm.area_id = a.area_id
+                left join
+                (select material_id, sum(material_num) as material_total_num
+                from ims_inventory
+                group by material_id) ii on ii.material_id = cm.material_id
+        ) bb on aa.material_id =bb.material_id
+        where aa.inquiry_id = #{inquiryId}
     </select>
         
     <insert id="insertInquiry" parameterType="com.bonus.canteen.core.ims.domain.Inquiry" useGeneratedKeys="true" keyProperty="inquiryId">
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 3b62acc..018cdc1 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
@@ -74,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <delete id="delInquirySupplier">
+        delete from ims_inquiry_supplier where inquiry_id=#{inquiryId}
+    </delete>
+
     <update id="updateInquirySupplier" parameterType="com.bonus.canteen.core.ims.domain.InquirySupplier">
         update ims_inquiry_supplier
         <trim prefix="SET" suffixOverrides=",">