From fc236fc10f2bda6aa9419753c5cb284155026fa2 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 19 一月 2026 18:00:04 +0800
Subject: [PATCH] 新增位运算

---
 service/src/main/resources/mapper/cwgl/InvoiceInfoMapper.xml |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/service/src/main/resources/mapper/cwgl/InvoiceInfoMapper.xml b/service/src/main/resources/mapper/cwgl/InvoiceInfoMapper.xml
index f8db041..5d9b400 100644
--- a/service/src/main/resources/mapper/cwgl/InvoiceInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/InvoiceInfoMapper.xml
@@ -6,9 +6,11 @@
 
     <resultMap type="com.ruoyi.cwgl.domain.InvoiceInfo" id="InvoiceInfoResult">
         <result property="id"    column="id"    />
-        <result property="customerId"    column="customer_id"    />
         <result property="invoiceCompanyName"    column="invoice_company_name"    />
+        <result property="customerId"    column="customer_id"    />
         <result property="invoiceCreditCode"    column="invoice_credit_code"    />
+        <result property="enterpriseType"    column="enterprise_type"    />
+        <result property="customerName"    column="customer_name"    />
         <result property="invoiceBankName"    column="invoice_bank_name"    />
         <result property="invoiceBankNo"    column="invoice_bank_no"    />
         <result property="invoiceOperatingLicenseAddress"    column="invoice_operating_license_address"    />
@@ -24,16 +26,18 @@
     </resultMap>
 
     <sql id="selectInvoiceInfoVo">
-        select thisTab.id, thisTab.customer_id, thisTab.invoice_company_name, thisTab.invoice_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 from invoice_info AS thisTab
+        select thisTab.id, thisTab.invoice_company_name, thisTab.customer_id, thisTab.invoice_credit_code, thisTab.enterprise_type, thisTab.customer_name, 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 from invoice_info AS thisTab
     </sql>
     <sql id="selectInvoiceInfoVoCount">
         select count(0) from invoice_info as thisTab
     </sql>
 
     <sql id="whereCondition">
-        <if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
         <if test="invoiceCompanyName != null  and invoiceCompanyName != ''"> and  thisTab.invoice_company_name like concat('%', #{invoiceCompanyName}, '%')</if>
+        <if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
         <if test="invoiceCreditCode != null  and invoiceCreditCode != ''"> and thisTab.invoice_credit_code = #{invoiceCreditCode}</if>
+        <if test="enterpriseType != null "> and thisTab.enterprise_type = #{enterpriseType}</if>
+        <if test="customerName != null  and customerName != ''"> and  thisTab.customer_name like concat('%', #{customerName}, '%')</if>
         <if test="invoiceBankName != null  and invoiceBankName != ''"> and  thisTab.invoice_bank_name like concat('%', #{invoiceBankName}, '%')</if>
         <if test="invoiceBankNo != null  and invoiceBankNo != ''"> and thisTab.invoice_bank_no = #{invoiceBankNo}</if>
         <if test="invoiceOperatingLicenseAddress != null  and invoiceOperatingLicenseAddress != ''"> and thisTab.invoice_operating_license_address = #{invoiceOperatingLicenseAddress}</if>
@@ -69,9 +73,11 @@
     <insert id="insertInvoiceInfo" parameterType="com.ruoyi.cwgl.domain.InvoiceInfo"  useGeneratedKeys="true" keyProperty="id">
         insert into invoice_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="customerId != null">customer_id,</if>
             <if test="invoiceCompanyName != null">invoice_company_name,</if>
+            <if test="customerId != null">customer_id,</if>
             <if test="invoiceCreditCode != null">invoice_credit_code,</if>
+            <if test="enterpriseType != null">enterprise_type,</if>
+            <if test="customerName != null">customer_name,</if>
             <if test="invoiceBankName != null">invoice_bank_name,</if>
             <if test="invoiceBankNo != null">invoice_bank_no,</if>
             <if test="invoiceOperatingLicenseAddress != null">invoice_operating_license_address,</if>
@@ -86,9 +92,11 @@
             <if test="invoiceType != null">invoice_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="customerId != null">#{customerId},</if>
             <if test="invoiceCompanyName != null">#{invoiceCompanyName},</if>
+            <if test="customerId != null">#{customerId},</if>
             <if test="invoiceCreditCode != null">#{invoiceCreditCode},</if>
+            <if test="enterpriseType != null">#{enterpriseType},</if>
+            <if test="customerName != null">#{customerName},</if>
             <if test="invoiceBankName != null">#{invoiceBankName},</if>
             <if test="invoiceBankNo != null">#{invoiceBankNo},</if>
             <if test="invoiceOperatingLicenseAddress != null">#{invoiceOperatingLicenseAddress},</if>
@@ -107,11 +115,11 @@
     <insert id="insertInvoiceInfoBatch" parameterType="java.util.List"  useGeneratedKeys="true" keyProperty="id">
         insert into invoice_info
         <trim prefix="(" suffix=") values" suffixOverrides=",">
-            id,customer_id,invoice_company_name,invoice_credit_code,invoice_bank_name,invoice_bank_no,invoice_operating_license_address,invoice_operating_license_phone,invoice_operating_license_email,status,create_by,update_by,create_time,update_time,deleted,invoice_type,
+            id,invoice_company_name,customer_id,invoice_credit_code,enterprise_type,customer_name,invoice_bank_name,invoice_bank_no,invoice_operating_license_address,invoice_operating_license_phone,invoice_operating_license_email,status,create_by,update_by,create_time,update_time,deleted,invoice_type,
         </trim>
         <foreach item="item" index="index" collection="list" separator=",">
             <trim prefix="(" suffix=") " suffixOverrides=",">
-                #{item.id},#{item.customerId},#{item.invoiceCompanyName},#{item.invoiceCreditCode},#{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.id},#{item.invoiceCompanyName},#{item.customerId},#{item.invoiceCreditCode},#{item.enterpriseType},#{item.customerName},#{item.invoiceBankName},#{item.invoiceBankNo},#{item.invoiceOperatingLicenseAddress},#{item.invoiceOperatingLicensePhone},#{item.invoiceOperatingLicenseEmail},#{item.status},#{item.createBy},#{item.updateBy},#{item.createTime},#{item.updateTime},#{item.deleted},#{item.invoiceType},
             </trim>
         </foreach>
     </insert>
@@ -120,9 +128,11 @@
     <update id="updateInvoiceInfo" parameterType="com.ruoyi.cwgl.domain.InvoiceInfo">
         update invoice_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="customerId != null">customer_id = #{customerId},</if>
             <if test="invoiceCompanyName != null">invoice_company_name = #{invoiceCompanyName},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
             <if test="invoiceCreditCode != null">invoice_credit_code = #{invoiceCreditCode},</if>
+            <if test="enterpriseType != null">enterprise_type = #{enterpriseType},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
             <if test="invoiceBankName != null">invoice_bank_name = #{invoiceBankName},</if>
             <if test="invoiceBankNo != null">invoice_bank_no = #{invoiceBankNo},</if>
             <if test="invoiceOperatingLicenseAddress != null">invoice_operating_license_address = #{invoiceOperatingLicenseAddress},</if>
@@ -143,9 +153,11 @@
         <foreach collection="list" item="item" index="index" separator=";">
             update invoice_info
             <trim prefix="SET" suffixOverrides=",">
-                <if test="item.customerId != null">customer_id = #{item.customerId},</if>
                 <if test="item.invoiceCompanyName != null">invoice_company_name = #{item.invoiceCompanyName},</if>
+                <if test="item.customerId != null">customer_id = #{item.customerId},</if>
                 <if test="item.invoiceCreditCode != null">invoice_credit_code = #{item.invoiceCreditCode},</if>
+                <if test="item.enterpriseType != null">enterprise_type = #{item.enterpriseType},</if>
+                <if test="item.customerName != null">customer_name = #{item.customerName},</if>
                 <if test="item.invoiceBankName != null">invoice_bank_name = #{item.invoiceBankName},</if>
                 <if test="item.invoiceBankNo != null">invoice_bank_no = #{item.invoiceBankNo},</if>
                 <if test="item.invoiceOperatingLicenseAddress != null">invoice_operating_license_address = #{item.invoiceOperatingLicenseAddress},</if>

--
Gitblit v1.8.0