From 4da52cefecf30de9dac1d9c1b7d7f49c9219e72b Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Thu, 6 Jun 2024 17:23:23 +0800
Subject: [PATCH] '123'

---
 .../com/ruoyi/web/controller/quot/QuotController.java     | 1 +
 .../src/main/resources/mapper/quot/QuotMapper.xml         | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index 42984b8..4cffba5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -557,6 +557,7 @@ public class QuotController extends BaseController
     @PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')")
     public void madeQuot(HttpServletResponse response, @RequestBody Quot quot)
     {
+        quotService.updateQuot(quot);
         List<QuotMaterial> list = quot.getQuotMaterialList();
         excelUtil.exportQuotExcel(response,quot,list);
     }
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
index 0b7eade..ec43727 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quotSalesmanDeptId"    column="quot_salesman_dept_id"    />
         <result property="quotSalesmanDeptName"    column="quot_salesman_dept_name"    />
         <result property="quotAddress"    column="quot_address"    />
+        <result property="quotContacts"    column="quot_contacts"    />
         <result property="quotPhone"    column="quot_phone"    />
         <result property="quotInquiryDate"    column="quot_inquiry_date"    />
         <result property="quotProject"    column="quot_project"    />
@@ -105,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectQuotVo">
         select a.quot_id, a.quot_code,a.quot_jsw_code, a.quot_salesman_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_bm,
-               a.quot_customer_name,a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address,
+               a.quot_customer_name,a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts,
                a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from,
                a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price,
                a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
@@ -150,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectQuotByQuotId" parameterType="String" resultMap="QuotQuotMaterialResult">
         select a.quot_id, a.quot_code,a.quot_jsw_code, a.quot_salesman_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_bm,a.quot_customer_name,
-               a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_phone, a.quot_inquiry_date,
+               a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date,
                a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation,
                a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
                a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,u3.nick_name quot_print_user_name,
@@ -217,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotSalesmanDeptId != null">quot_salesman_dept_id,</if>
             <if test="quotSalesmanDeptName != null">quot_salesman_dept_name,</if>
             <if test="quotAddress != null">quot_address,</if>
+            <if test="quotContacts != null">quot_contacts,</if>
             <if test="quotPhone != null">quot_phone,</if>
             <if test="quotInquiryDate != null">quot_inquiry_date,</if>
             <if test="quotProject != null and quotProject != ''">quot_project,</if>
@@ -263,6 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotSalesmanDeptId != null">#{quotSalesmanDeptId},</if>
             <if test="quotSalesmanDeptName != null">#{quotSalesmanDeptName},</if>
             <if test="quotAddress != null">#{quotAddress},</if>
+            <if test="quotContacts != null">#{quotContacts},</if>
             <if test="quotPhone != null">#{quotPhone},</if>
             <if test="quotInquiryDate != null">#{quotInquiryDate},</if>
             <if test="quotProject != null and quotProject != ''">#{quotProject},</if>
@@ -358,6 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotSalesmanDeptId != null">quot_salesman_dept_id = #{quotSalesmanDeptId},</if>
             <if test="quotSalesmanDeptName != null">quot_salesman_dept_name = #{quotSalesmanDeptName},</if>
             <if test="quotAddress != null">quot_address = #{quotAddress},</if>
+            <if test="quotContacts != null">quot_contacts = #{quotContacts},</if>
             <if test="quotPhone != null">quot_phone = #{quotPhone},</if>
             <if test="quotInquiryDate != null">quot_inquiry_date = #{quotInquiryDate},</if>
             <if test="quotProject != null and quotProject != ''">quot_project = #{quotProject},</if>