From b2ca7af3db0d1e2baf37829c33a82cd43d690751 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 26 十二月 2025 16:27:14 +0800
Subject: [PATCH] 新增字段
---
service/src/main/java/com/ruoyi/cwgl/domain/InvoiceManage.java | 23 ++++++++++++++++++++++-
service/src/main/resources/mapper/cwgl/InvoiceManageMapper.xml | 24 +++++++++++++++++++++---
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/InvoiceManage.java b/service/src/main/java/com/ruoyi/cwgl/domain/InvoiceManage.java
index 607931b..fb99ae9 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/InvoiceManage.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/InvoiceManage.java
@@ -113,6 +113,27 @@
private Integer status;
+ /** 鍙戠エ鍙风爜 */
+ @Excel(name = "鍙戠エ鍙风爜")
+
+ @TableField("invoice_no")
+ private String invoiceNo;
+
+
+ /** 寮�绁ㄦ椂闂� */
+ @Excel(name = "寮�绁ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField("invoice_date")
+ private Date invoiceDate;
+
+
+ /** 鍙戠エ閲戦 */
+ @Excel(name = "鍙戠エ閲戦")
+
+ @TableField("invoice_amount")
+ private java.math.BigDecimal invoiceAmount;
+
+
/** 鍒涘缓浜� */
@TableField("create_by")
private String createBy;
@@ -157,4 +178,4 @@
@TableField(exist = false)
private List<InvoiceDetail> invoiceDetailList;
-}
+}
\ No newline at end of file
diff --git a/service/src/main/resources/mapper/cwgl/InvoiceManageMapper.xml b/service/src/main/resources/mapper/cwgl/InvoiceManageMapper.xml
index 17c8053..bbbe05f 100644
--- a/service/src/main/resources/mapper/cwgl/InvoiceManageMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/InvoiceManageMapper.xml
@@ -19,6 +19,9 @@
<result property="invoiceOperatingLicensePhone" column="invoice_operating_license_phone" />
<result property="invoiceOperatingLicenseEmail" column="invoice_operating_license_email" />
<result property="status" column="status" />
+ <result property="invoiceNo" column="invoice_no" />
+ <result property="invoiceDate" column="invoice_date" />
+ <result property="invoiceAmount" column="invoice_amount" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="createTime" column="create_time" />
@@ -47,7 +50,7 @@
</resultMap>
<sql id="selectInvoiceManageVo">
- select thisTab.id, thisTab.invoice_info_id, thisTab.invoice_seller_id, thisTab.customer_name, thisTab.invoice_seller_name, thisTab.invoice_company_name, thisTab.invoice_credit_code, thisTab.invoice_seller_credit_code, thisTab.invoice_bank_name, thisTab.invoice_bank_no, thisTab.invoice_operating_license_address, thisTab.invoice_operating_license_phone, thisTab.invoice_operating_license_email, thisTab.status, thisTab.create_by, thisTab.update_by, thisTab.create_time, thisTab.update_time, thisTab.deleted, thisTab.invoice_type, thisTab.enterprise_type from invoice_manage AS thisTab
+ select thisTab.id, thisTab.invoice_info_id, thisTab.invoice_seller_id, thisTab.customer_name, thisTab.invoice_seller_name, thisTab.invoice_company_name, thisTab.invoice_credit_code, thisTab.invoice_seller_credit_code, thisTab.invoice_bank_name, thisTab.invoice_bank_no, thisTab.invoice_operating_license_address, thisTab.invoice_operating_license_phone, thisTab.invoice_operating_license_email, thisTab.status, thisTab.invoice_no, thisTab.invoice_date, thisTab.invoice_amount, thisTab.create_by, thisTab.update_by, thisTab.create_time, thisTab.update_time, thisTab.deleted, thisTab.invoice_type, thisTab.enterprise_type from invoice_manage AS thisTab
</sql>
<sql id="selectInvoiceManageVoCount">
select count(0) from invoice_manage as thisTab
@@ -67,6 +70,9 @@
<if test="invoiceOperatingLicensePhone != null and invoiceOperatingLicensePhone != ''"> and thisTab.invoice_operating_license_phone = #{invoiceOperatingLicensePhone}</if>
<if test="invoiceOperatingLicenseEmail != null and invoiceOperatingLicenseEmail != ''"> and thisTab.invoice_operating_license_email = #{invoiceOperatingLicenseEmail}</if>
<if test="status != null "> and thisTab.status = #{status}</if>
+ <if test="invoiceNo != null and invoiceNo != ''"> and thisTab.invoice_no = #{invoiceNo}</if>
+ <if test="invoiceDate != null "> and thisTab.invoice_date = #{invoiceDate}</if>
+ <if test="invoiceAmount != null "> and thisTab.invoice_amount = #{invoiceAmount}</if>
<if test="deleted != null "> and thisTab.deleted = #{deleted}</if>
<if test="invoiceType != null and invoiceType != ''"> and thisTab.invoice_type = #{invoiceType}</if>
<if test="enterpriseType != null "> and thisTab.enterprise_type = #{enterpriseType}</if>
@@ -74,7 +80,7 @@
<!--鏌ヨ-->
<select id="selectInvoiceManageById" parameterType="Integer" resultMap="InvoiceManageInvoiceDetailResult">
- select a.id, a.invoice_info_id, a.invoice_seller_id, a.customer_name, a.invoice_seller_name, a.invoice_company_name, a.invoice_credit_code, a.invoice_seller_credit_code, a.invoice_bank_name, a.invoice_bank_no, a.invoice_operating_license_address, a.invoice_operating_license_phone, a.invoice_operating_license_email, a.status, a.create_by, a.update_by, a.create_time, a.update_time, a.deleted, a.invoice_type, a.enterprise_type,
+ select a.id, a.invoice_info_id, a.invoice_seller_id, a.customer_name, a.invoice_seller_name, a.invoice_company_name, a.invoice_credit_code, a.invoice_seller_credit_code, a.invoice_bank_name, a.invoice_bank_no, a.invoice_operating_license_address, a.invoice_operating_license_phone, a.invoice_operating_license_email, a.status, a.invoice_no, a.invoice_date, a.invoice_amount, a.create_by, a.update_by, a.create_time, a.update_time, a.deleted, a.invoice_type, a.enterprise_type,
b.id as sub_id, b.invoice_manage_id as sub_invoice_manage_id, b.receivable_bill_no as sub_receivable_bill_no, b.receivable_bill_amount as sub_receivable_bill_amount, b.receivable_bill_currency as sub_receivable_bill_currency, b.billed_amount as sub_billed_amount, b.unbilled_amount as sub_unbilled_amount, b.current_billed_amount as sub_current_billed_amount, b.create_time as sub_create_time, b.update_time as sub_update_time, b.deleted as sub_deleted from invoice_manage a
left join invoice_detail b on b.invoice_manage_id = a.id
where a.id = #{id}
@@ -112,6 +118,9 @@
<if test="invoiceOperatingLicensePhone != null">invoice_operating_license_phone,</if>
<if test="invoiceOperatingLicenseEmail != null">invoice_operating_license_email,</if>
<if test="status != null">status,</if>
+ <if test="invoiceNo != null">invoice_no,</if>
+ <if test="invoiceDate != null">invoice_date,</if>
+ <if test="invoiceAmount != null">invoice_amount,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="createTime != null">create_time,</if>
@@ -134,6 +143,9 @@
<if test="invoiceOperatingLicensePhone != null">#{invoiceOperatingLicensePhone},</if>
<if test="invoiceOperatingLicenseEmail != null">#{invoiceOperatingLicenseEmail},</if>
<if test="status != null">#{status},</if>
+ <if test="invoiceNo != null">#{invoiceNo},</if>
+ <if test="invoiceDate != null">#{invoiceDate},</if>
+ <if test="invoiceAmount != null">#{invoiceAmount},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -151,7 +163,7 @@
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.invoiceInfoId},#{item.invoiceSellerId},#{item.customerName},#{item.invoiceSellerName},#{item.invoiceCompanyName},#{item.invoiceCreditCode},#{item.invoiceSellerCreditCode},#{item.invoiceBankName},#{item.invoiceBankNo},#{item.invoiceOperatingLicenseAddress},#{item.invoiceOperatingLicensePhone},#{item.invoiceOperatingLicenseEmail},#{item.status},#{item.createBy},#{item.updateBy},#{item.createTime},#{item.updateTime},#{item.deleted},#{item.invoiceType},#{item.enterpriseType},
+ #{item.id},#{item.invoiceInfoId},#{item.invoiceSellerId},#{item.customerName},#{item.invoiceSellerName},#{item.invoiceCompanyName},#{item.invoiceCreditCode},#{item.invoiceSellerCreditCode},#{item.invoiceBankName},#{item.invoiceBankNo},#{item.invoiceOperatingLicenseAddress},#{item.invoiceOperatingLicensePhone},#{item.invoiceOperatingLicenseEmail},#{item.status},#{item.invoiceNo},#{item.invoiceDate},#{item.invoiceAmount},#{item.createBy},#{item.updateBy},#{item.createTime},#{item.updateTime},#{item.deleted},#{item.invoiceType},#{item.enterpriseType},
</trim>
</foreach>
</insert>
@@ -173,6 +185,9 @@
<if test="invoiceOperatingLicensePhone != null">invoice_operating_license_phone = #{invoiceOperatingLicensePhone},</if>
<if test="invoiceOperatingLicenseEmail != null">invoice_operating_license_email = #{invoiceOperatingLicenseEmail},</if>
<if test="status != null">status = #{status},</if>
+ <if test="invoiceNo != null">invoice_no = #{invoiceNo},</if>
+ <if test="invoiceDate != null">invoice_date = #{invoiceDate},</if>
+ <if test="invoiceAmount != null">invoice_amount = #{invoiceAmount},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
@@ -201,6 +216,9 @@
<if test="item.invoiceOperatingLicensePhone != null">invoice_operating_license_phone = #{item.invoiceOperatingLicensePhone},</if>
<if test="item.invoiceOperatingLicenseEmail != null">invoice_operating_license_email = #{item.invoiceOperatingLicenseEmail},</if>
<if test="item.status != null">status = #{item.status},</if>
+ <if test="item.invoiceNo != null">invoice_no = #{item.invoiceNo},</if>
+ <if test="item.invoiceDate != null">invoice_date = #{item.invoiceDate},</if>
+ <if test="item.invoiceAmount != null">invoice_amount = #{item.invoiceAmount},</if>
<if test="item.createBy != null">create_by = #{item.createBy},</if>
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.createTime != null">create_time = #{item.createTime},</if>
--
Gitblit v1.8.0