xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-06-06 17:23:23 +08:00
parent 2c781da6a1
commit 4da52cefec
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -557,6 +557,7 @@ public class QuotController extends BaseController
@PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')") @PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')")
public void madeQuot(HttpServletResponse response, @RequestBody Quot quot) public void madeQuot(HttpServletResponse response, @RequestBody Quot quot)
{ {
quotService.updateQuot(quot);
List<QuotMaterial> list = quot.getQuotMaterialList(); List<QuotMaterial> list = quot.getQuotMaterialList();
excelUtil.exportQuotExcel(response,quot,list); excelUtil.exportQuotExcel(response,quot,list);
} }

8
ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
View File

@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="quotSalesmanDeptId" column="quot_salesman_dept_id" /> <result property="quotSalesmanDeptId" column="quot_salesman_dept_id" />
<result property="quotSalesmanDeptName" column="quot_salesman_dept_name" /> <result property="quotSalesmanDeptName" column="quot_salesman_dept_name" />
<result property="quotAddress" column="quot_address" /> <result property="quotAddress" column="quot_address" />
<result property="quotContacts" column="quot_contacts" />
<result property="quotPhone" column="quot_phone" /> <result property="quotPhone" column="quot_phone" />
<result property="quotInquiryDate" column="quot_inquiry_date" /> <result property="quotInquiryDate" column="quot_inquiry_date" />
<result property="quotProject" column="quot_project" /> <result property="quotProject" column="quot_project" />
@ -105,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectQuotVo"> <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, 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_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_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_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 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, 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_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_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, 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="quotSalesmanDeptId != null">quot_salesman_dept_id,</if>
<if test="quotSalesmanDeptName != null">quot_salesman_dept_name,</if> <if test="quotSalesmanDeptName != null">quot_salesman_dept_name,</if>
<if test="quotAddress != null">quot_address,</if> <if test="quotAddress != null">quot_address,</if>
<if test="quotContacts != null">quot_contacts,</if>
<if test="quotPhone != null">quot_phone,</if> <if test="quotPhone != null">quot_phone,</if>
<if test="quotInquiryDate != null">quot_inquiry_date,</if> <if test="quotInquiryDate != null">quot_inquiry_date,</if>
<if test="quotProject != null and quotProject != ''">quot_project,</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="quotSalesmanDeptId != null">#{quotSalesmanDeptId},</if>
<if test="quotSalesmanDeptName != null">#{quotSalesmanDeptName},</if> <if test="quotSalesmanDeptName != null">#{quotSalesmanDeptName},</if>
<if test="quotAddress != null">#{quotAddress},</if> <if test="quotAddress != null">#{quotAddress},</if>
<if test="quotContacts != null">#{quotContacts},</if>
<if test="quotPhone != null">#{quotPhone},</if> <if test="quotPhone != null">#{quotPhone},</if>
<if test="quotInquiryDate != null">#{quotInquiryDate},</if> <if test="quotInquiryDate != null">#{quotInquiryDate},</if>
<if test="quotProject != null and quotProject != ''">#{quotProject},</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="quotSalesmanDeptId != null">quot_salesman_dept_id = #{quotSalesmanDeptId},</if>
<if test="quotSalesmanDeptName != null">quot_salesman_dept_name = #{quotSalesmanDeptName},</if> <if test="quotSalesmanDeptName != null">quot_salesman_dept_name = #{quotSalesmanDeptName},</if>
<if test="quotAddress != null">quot_address = #{quotAddress},</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="quotPhone != null">quot_phone = #{quotPhone},</if>
<if test="quotInquiryDate != null">quot_inquiry_date = #{quotInquiryDate},</if> <if test="quotInquiryDate != null">quot_inquiry_date = #{quotInquiryDate},</if>
<if test="quotProject != null and quotProject != ''">quot_project = #{quotProject},</if> <if test="quotProject != null and quotProject != ''">quot_project = #{quotProject},</if>