1.1.19 报价单添加付款明细字段（提示付款节点及比例），报价单模板加物料税率。

3 weeks ago · 1788d263aa
parent 27ab155b36
commit 1788d263aa
5 changed files with 28 additions and 3 deletions
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmQuoteInfo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmQuoteInfo.java
@ -105,6 +105,11 @@ public class CrmQuoteInfo extends TenantEntity {
     */
    private String paymentMethod;

+    /**
+     * 付款明细（文本说明）
+     */
+    private String paymentDetail;
+
    /**
     * 币种（字典类型）
     */
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmQuoteInfoBo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmQuoteInfoBo.java
@ -105,6 +105,11 @@ public class CrmQuoteInfoBo extends BaseEntity {
     */
    private String paymentMethod;

+    /**
+     * 付款明细（文本说明）
+     */
+    private String paymentDetail;
+
    /**
     * 币种（字典类型）
     */
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmQuoteInfoVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmQuoteInfoVo.java
@ -134,6 +134,12 @@ public class CrmQuoteInfoVo implements Serializable {
    @ExcelProperty(value = "付款方式", converter = ExcelDictConvert.class)
    private String paymentMethod;

+    /**
+     * 付款明细（文本说明）
+     */
+    @ExcelProperty(value = "付款明细")
+    private String paymentDetail;
+
    /**
     * 币种（字典类型）
     */
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java
@ -169,6 +169,7 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService {
                    .eq(bo.getWarrantyPeriod() != null, CrmQuoteInfo::getWarrantyPeriod, bo.getWarrantyPeriod())
                    .eq(StringUtils.isNotBlank(bo.getDeliveryMethod()), CrmQuoteInfo::getDeliveryMethod, bo.getDeliveryMethod())
                    .eq(StringUtils.isNotBlank(bo.getPaymentMethod()), CrmQuoteInfo::getPaymentMethod, bo.getPaymentMethod())
+                    .like(StringUtils.isNotBlank(bo.getPaymentDetail()), CrmQuoteInfo::getPaymentDetail, bo.getPaymentDetail())
                    .eq(StringUtils.isNotBlank(bo.getCurrencyType()), CrmQuoteInfo::getCurrencyType, bo.getCurrencyType())
                    .eq(StringUtils.isNotBlank(bo.getTaxIncludedInfo()), CrmQuoteInfo::getTaxIncludedInfo, bo.getTaxIncludedInfo())
                    .eq(bo.getTaxRate() != null, CrmQuoteInfo::getTaxRate, bo.getTaxRate())
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml
@ -9,7 +9,7 @@
    <select id="selectCustomCrmQuoteInfoVoList" resultMap="CrmQuoteInfoResult">
        select t.quote_id, t.tenant_id, t.quote_code, t.quote_name, t.quote_round, t.quote_category,
        t.quote_type, t.business_direction, t.quote_dept_id, t.quote_date, t.valid_from, t.valid_days, t.valid_to,
-        t.delivery_period, t.warranty_period, t.delivery_method, t.payment_method, t.currency_type, t.tax_included_info, t.tax_rate,
+        t.delivery_period, t.warranty_period, t.delivery_method, t.payment_method, t.payment_detail, t.currency_type, t.tax_included_info, t.tax_rate,
        t.total_price, t.total_before_tax,
        t.total_tax, t.total_including_tax, t.customer_id, t.customer_contact_id, t.customer_contact_name,
        t.customer_contact_phone, t.customer_contact_email,
@ -52,6 +52,7 @@
               t.warranty_period,
               t.delivery_method,
               t.payment_method,
+               t.payment_detail,
               t.currency_type,
               t.tax_included_info,
               t.tax_rate,
@ -90,7 +91,7 @@
    <select id="selectCustomCrmQuoteInfoVoByIds" resultMap="CrmQuoteInfoResult">
        select t.quote_id, t.tenant_id, t.quote_code, t.quote_name, t.quote_round, t.quote_category,
        t.quote_type, t.business_direction, t.quote_dept_id, t.quote_date, t.valid_from, t.valid_days,
-        t.valid_to, t.delivery_period, t.warranty_period, t.delivery_method, t.payment_method, t.currency_type, t.tax_included_info,
+        t.valid_to, t.delivery_period, t.warranty_period, t.delivery_method, t.payment_method, t.payment_detail, t.currency_type, t.tax_included_info,
        t.tax_rate, t.total_price, t.total_before_tax, t.total_tax, t.total_including_tax, t.customer_id,
        t.customer_contact_id, t.customer_contact_name, t.customer_contact_phone, t.customer_contact_email,
        t.supplier_contact_id, t.supplier_contact_name, t.supplier_contact_phone, t.supplier_contact_email,
@ -115,7 +116,7 @@

    <!-- 分页查询（带自定义条件） -->
    <select id="selectCustomCrmQuoteInfoVoPage" resultMap="CrmQuoteInfoResult">
-        select quote_id, tenant_id, quote_code, quote_name, quote_round, quote_category, quote_type, business_direction, quote_dept_id, quote_date, valid_from, valid_days, valid_to, delivery_period, warranty_period, delivery_method, payment_method, currency_type, tax_included_info, tax_rate, total_price, total_before_tax, total_tax, total_including_tax, customer_id, customer_contact_id, customer_contact_name, customer_contact_phone, customer_contact_email, supplier_contact_id, supplier_contact_name, supplier_contact_phone, supplier_contact_email, project_id, template_id, oss_id, quote_status, flow_status, remark, del_flag, create_dept, create_by, create_time, update_by, update_time
+        select quote_id, tenant_id, quote_code, quote_name, quote_round, quote_category, quote_type, business_direction, quote_dept_id, quote_date, valid_from, valid_days, valid_to, delivery_period, warranty_period, delivery_method, payment_method, payment_detail, currency_type, tax_included_info, tax_rate, total_price, total_before_tax, total_tax, total_including_tax, customer_id, customer_contact_id, customer_contact_name, customer_contact_phone, customer_contact_email, supplier_contact_id, supplier_contact_name, supplier_contact_phone, supplier_contact_email, project_id, template_id, oss_id, quote_status, flow_status, remark, del_flag, create_dept, create_by, create_time, update_by, update_time
        from crm_quote_info t
        <where>
            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
@ -159,6 +160,8 @@

            payment_method,

+            payment_detail,
+
            currency_type,

            tax_included_info,
@ -251,6 +254,8 @@

            #{item.paymentMethod},

+            #{item.paymentDetail},
+
            #{item.currencyType},

            #{item.taxIncludedInfo},
@ -364,6 +369,9 @@
                <if test="item.paymentMethod != null and item.paymentMethod != ''">
                    payment_method = #{item.paymentMethod},
                </if>
+                <if test="item.paymentDetail != null">
+                    payment_detail = #{item.paymentDetail},
+                </if>
                <if test="item.currencyType != null and item.currencyType != ''">
                    currency_type = #{item.currencyType},
                </if>