From 0291aea60bfd1f66dbe8138568ee26c4ddaa2a91 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 26 五月 2026 11:41:10 +0800
Subject: [PATCH] 列表查询按照id倒序
---
src/main/resources/mapper/basic/CustomerMapper.xml | 278 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 192 insertions(+), 86 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index d098178..2957c7e 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -1,91 +1,197 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.CustomerMapper">
-
- <resultMap type="com.ruoyi.basic.pojo.Customer" id="CustomerResult">
- <result property="id" column="id" />
- <result property="customerName" column="customer_name" />
- <result property="taxpayerIdentificationNumber" column="taxpayer_identification_number" />
- <result property="companyAddress" column="company_address" />
- <result property="companyPhone" column="company_phone" />
- <result property="contactPerson" column="contact_person" />
- <result property="contactPhone" column="contact_phone" />
- <result property="maintainer" column="maintainer" />
- <result property="maintenanceTime" column="maintenance_time" />
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.Customer">
+ <id column="id" property="id" />
</resultMap>
-
- <sql id="selectCustomerVo">
- select id, customer_name, taxpayer_identification_number, company_address, company_phone, contact_person, contact_phone, maintainer, maintenance_time from customer
- </sql>
-
- <select id="selectCustomerList" parameterType="com.ruoyi.basic.pojo.Customer" resultMap="CustomerResult">
- <include refid="selectCustomerVo"/>
- <where>
- <if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
- <if test="taxpayerIdentificationNumber != null and taxpayerIdentificationNumber != ''"> and taxpayer_identification_number = #{taxpayerIdentificationNumber}</if>
- <if test="companyAddress != null and companyAddress != ''"> and company_address = #{companyAddress}</if>
- <if test="companyPhone != null and companyPhone != ''"> and company_phone = #{companyPhone}</if>
- <if test="contactPerson != null and contactPerson != ''"> and contact_person = #{contactPerson}</if>
- <if test="contactPhone != null and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
- <if test="maintainer != null and maintainer != ''"> and maintainer = #{maintainer}</if>
- <if test="maintenanceTime != null "> and maintenance_time = #{maintenanceTime}</if>
+ <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
+ select
+ c.*,
+ u.user_name usage_user_name,
+ (
+ select group_concat(u2.user_name separator ', ')
+ from customer_user cu
+ left join sys_user u2 on cu.user_id = u2.user_id
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as together_user_names,
+ (
+ select group_concat(cu.user_id separator ',')
+ from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as user_ids_str
+ from customer c
+ left join sys_user u on c.usage_user = u.user_id
+ <where>
+ <if test="c.customerName != null and c.customerName != ''">
+ and customer_name like concat('%', #{c.customerName}, '%')
+ </if>
+ <if test="c.customerType != null and c.customerType != ''">
+ and customer_type = #{c.customerType}
+ </if>
+ <!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
+ <if test="c.type != null and c.type == 1">
+ and type = #{c.type}
+ </if>
+ <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
+ <if test="c.type != null and c.type == 0">
+ and (
+ (type = #{c.type} or (type = 1 and is_assigned = 1))
+ and (
+ c.usage_user = #{loginUserId}
+ or c.create_user = #{loginUserId}
+ or exists (
+ select 1 from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id = #{loginUserId}
+ )
+ )
+ )
+ </if>
</where>
- </select>
-
- <select id="selectCustomerById" parameterType="Long" resultMap="CustomerResult">
- <include refid="selectCustomerVo"/>
- where id = #{id}
+ order by c.id desc
</select>
- <insert id="insertCustomer" parameterType="com.ruoyi.basic.pojo.Customer" useGeneratedKeys="true" keyProperty="id">
- insert into customer
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="customerName != null and customerName != ''">customer_name,</if>
- <if test="taxpayerIdentificationNumber != null and taxpayerIdentificationNumber != ''">taxpayer_identification_number,</if>
- <if test="companyAddress != null and companyAddress != ''">company_address,</if>
- <if test="companyPhone != null and companyPhone != ''">company_phone,</if>
- <if test="contactPerson != null and contactPerson != ''">contact_person,</if>
- <if test="contactPhone != null and contactPhone != ''">contact_phone,</if>
- <if test="maintainer != null and maintainer != ''">maintainer,</if>
- <if test="maintenanceTime != null">maintenance_time,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="customerName != null and customerName != ''">#{customerName},</if>
- <if test="taxpayerIdentificationNumber != null and taxpayerIdentificationNumber != ''">#{taxpayerIdentificationNumber},</if>
- <if test="companyAddress != null and companyAddress != ''">#{companyAddress},</if>
- <if test="companyPhone != null and companyPhone != ''">#{companyPhone},</if>
- <if test="contactPerson != null and contactPerson != ''">#{contactPerson},</if>
- <if test="contactPhone != null and contactPhone != ''">#{contactPhone},</if>
- <if test="maintainer != null and maintainer != ''">#{maintainer},</if>
- <if test="maintenanceTime != null">#{maintenanceTime},</if>
- </trim>
- </insert>
-
- <update id="updateCustomer" parameterType="com.ruoyi.basic.pojo.Customer">
- update customer
- <trim prefix="SET" suffixOverrides=",">
- <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
- <if test="taxpayerIdentificationNumber != null and taxpayerIdentificationNumber != ''">taxpayer_identification_number = #{taxpayerIdentificationNumber},</if>
- <if test="companyAddress != null and companyAddress != ''">company_address = #{companyAddress},</if>
- <if test="companyPhone != null and companyPhone != ''">company_phone = #{companyPhone},</if>
- <if test="contactPerson != null and contactPerson != ''">contact_person = #{contactPerson},</if>
- <if test="contactPhone != null and contactPhone != ''">contact_phone = #{contactPhone},</if>
- <if test="maintainer != null and maintainer != ''">maintainer = #{maintainer},</if>
- <if test="maintenanceTime != null">maintenance_time = #{maintenanceTime},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteCustomerById" parameterType="Long">
- delete from customer where id = #{id}
- </delete>
-
- <delete id="deleteCustomerByIds" parameterType="String">
- delete from customer where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
+ <select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
+ select
+ c.*,
+ u.user_name usage_user_name,
+ (
+ select group_concat(u2.user_name separator ', ')
+ from customer_user cu
+ left join sys_user u2 on cu.user_id = u2.user_id
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as together_user_names,
+ (
+ select group_concat(cu.user_id separator ',')
+ from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as user_ids_str
+ from customer c
+ left join sys_user u on c.usage_user = u.user_id
+ <where>
+ <if test="c.ids != null and c.ids.length > 0">
+ and c.id in
+ <foreach collection="c.ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="c.customerName != null and c.customerName != ''">
+ and customer_name like concat('%', #{c.customerName}, '%')
+ </if>
+ <if test="c.customerType != null and c.customerType != ''">
+ and customer_type = #{c.customerType}
+ </if>
+ <!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
+ <if test="c.type != null and c.type == 1">
+ and type = #{c.type}
+ </if>
+ <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
+ <if test="c.type != null and c.type == 0">
+ and (
+ (type = #{c.type} or (type = 1 and is_assigned = 1))
+ and (
+ c.usage_user = #{loginUserId}
+ or c.create_user = #{loginUserId}
+ or exists (
+ select 1 from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id = #{loginUserId}
+ )
+ )
+ )
+ </if>
+ </where>
+ order by c.id desc
+ </select>
+ <select id="customewTransactions" resultType="com.ruoyi.sales.vo.CustomerTransactionsVo">
+ select T1.customer_id,
+ c.customer_name,
+ T1.contractAmounts,
+ IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
+ IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount
+ from (select customer_id, sum(contract_amount) as contractAmounts from sales_ledger group by customer_id) T1
+ left join (select customer_id, sum(collection_amount) as receiptPaymentAmount from account_sales_collection group by customer_id) T2 on T1.customer_id = T2.customer_id
+ left join (
+ SELECT
+ sl.customer_id,
+ sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
+ FROM stock_out_record sor
+ LEFT join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ and slp.type = 1
+ group by sl.customer_id
+ ) T3 on T3.customer_id=T1.customer_id
+ left join (
+ select
+ sl.customer_id,
+ sum(rm.refund_amount) as returnAmount
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where rm.status=1
+ group by sl.customer_id
+ ) T4 on T4.customer_id=T1.customer_id
+ left join customer c on T1.customer_id = c.id
+ <where>
+ <if test="customerName!=null and customerName!=''">
+ AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
+ </if>
+ </where>
+ order by T1.customer_id desc
+ </select>
+ <select id="customewTransactionsDetails"
+ resultType="com.ruoyi.sales.vo.CustomerTransactionsDetailsVo">
+ select sl.id salesLedgerId,
+ sl.sales_contract_no,
+ sl.execution_date,
+ sl.contract_amount,
+ IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
+ IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount
+ from sales_ledger sl
+ left join (
+ select
+ sl.id,
+ sum(ascc.collection_amount) as receiptPaymentAmount
+ from account_sales_collection ascc
+ left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
+ left join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ group by sl.id
+ )T1 on T1.id = sl.id
+ left join (
+ SELECT
+ sl.id,
+ sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
+ FROM stock_out_record sor
+ left join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ and slp.type = 1
+ group by sl.id
+ )T2 on T2.id = sl.id
+ left join (
+ select sl.id,
+ sum(rm.refund_amount) as returnAmount
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where rm.status=1
+ group by sl.id
+ )T3 on T3.id = sl.id
+ where sl.customer_id = #{customerId}
+ order by sl.id desc
+ </select>
+</mapper>
--
Gitblit v1.9.3