From dcd1aab9b5bec2556161c16bd1bc4fe71fef476d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 17:17:47 +0800
Subject: [PATCH] 关于社保补缴的计算,如果社保保险设置有多条数据,根据创建时间来判断,当月即以后得参考标准用对应的配置,并且需要统计当年从1月到现在缴纳的所有社保金额,和最新的社保比列得出的金额进行比较,计算需要补缴的金额,只有社会保险设置新增一条数据的当月会计算,其余月份对应的都是0

---
 src/main/resources/mapper/sales/SalesQuotationMapper.xml |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesQuotationMapper.xml b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
index a39cd45..746e331 100644
--- a/src/main/resources/mapper/sales/SalesQuotationMapper.xml
+++ b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
@@ -4,16 +4,19 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.sales.mapper.SalesQuotationMapper">
     <select id="listPage" resultType="com.ruoyi.sales.dto.SalesQuotationDto">
-        SELECT * FROM sales_quotation
-        WHERE 1=1
-        <if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
-            AND quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
-        </if>
-        <if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
-            AND customer = #{salesQuotationDto.customer}
-        </if>
-        <if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
-            AND status = #{salesQuotationDto.status}
-        </if>
+        SELECT t1.*
+        FROM sales_quotation t1
+        <where>
+            <if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
+                AND t1.quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
+            </if>
+            <if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
+                AND t1.customer = #{salesQuotationDto.customer}
+            </if>
+            <if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
+                AND t1.status = #{salesQuotationDto.status}
+            </if>
+        </where>
+        order by t1.id desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3