From c2ce524ef3276412d8313892e79e5ebca5c74e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Sat, 23 Aug 2025 10:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=BA=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/out/OutMonthPlanMapper.xml         | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/out/OutMonthPlanMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/out/OutMonthPlanMapper.xml
index 3827518c..ae8e6643 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/out/OutMonthPlanMapper.xml
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/out/OutMonthPlanMapper.xml
@@ -6,22 +6,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="purchaseValueAA" resultType="org.dromara.out.domain.BusProcurement">
-        SELECT
-            b.name,
-            b.specification,
-            b.unit,
-            (SELECT SUM(accepted_quantity) FROM mat_material_receive_item WHERE project_id = #{projectId} and name = b.name and specification = b.specification) as acceptedQuantity,
-            a.unit_price,
-            DATE_FORMAT(b.create_time,'%Y-%m') as yf
-        FROM
-            bus_bidding_limit_list as a
-                RIGHT JOIN mat_material_receive_item as b on b.`name` = a.`name` and b.specification = a.specification
-        WHERE
-            b.project_id = #{projectId}
-        <if test="planMonth != null and planMonth!=''">
-            and DATE_FORMAT(b.create_time,'%Y-%m') = #{planMonth}
-        </if>
-        GROUP BY  yf,b.name,b.specification
+<!--        SELECT-->
+<!--            b.name,-->
+<!--            b.specification,-->
+<!--            b.unit,-->
+<!--            (SELECT SUM(accepted_quantity) FROM mat_material_receive_item WHERE project_id = #{projectId} and name = b.name and specification = b.specification) as acceptedQuantity,-->
+<!--            a.unit_price,-->
+<!--            DATE_FORMAT(b.create_time,'%Y-%m') as yf-->
+<!--        FROM-->
+<!--            bus_bidding_limit_list as a-->
+<!--                RIGHT JOIN mat_material_receive_item as b on b.`name` = a.`name` and b.specification = a.specification-->
+<!--        WHERE-->
+<!--            b.project_id = #{projectId}-->
+<!--        <if test="planMonth != null and planMonth!=''">-->
+<!--            and DATE_FORMAT(b.create_time,'%Y-%m') = #{planMonth}-->
+<!--        </if>-->
+<!--        GROUP BY  yf,b.name,b.specification-->
+            SELECT
+            a.NAME,
+            a.specification,
+            a.unit,
+            sum(a.quantity),
+            DATE_FORMAT( a.create_time, '%Y-%m' ) AS yf
+            FROM
+            bus_bidding_limit_list AS a
+            <where>
+                a.project_id = #{projectId}
+                <if test="planMonth != null and planMonth!='' ">
+                    and DATE_FORMAT(b.create_time,'%Y-%m') = #{planMonth}
+                </if>
+            </where>
+            GROUP BY
+            yf,
+            a.NAME,
+            a.specification
     </select>
 
     <select id="purchaseValueBB" resultType="org.dromara.out.domain.BusProcurement">