From 90dc879d5b04c348789fc233bf44f08cec2f540d Mon Sep 17 00:00:00 2001
From: wupeng <1591539960@qq.com>
Date: Thu, 28 May 2026 09:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=B2=A1?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E5=92=8C=E6=98=BE=E7=A4=BAerp=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=B8=AD=E5=BF=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/cost/controller/SubjectFeeDetailController.java      | 4 ++++
 .../org/springblade/desk/cost/mapper/CostStatisticsMapper.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java
index a01317652..18d7d6200 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java
@@ -191,6 +191,10 @@ public class SubjectFeeDetailController extends BladeController {
 				if ("辅助人员材料费用".equals(subjectName)) {
 					iterator.remove(); // 只有迭代器的 remove 才安全
 				}
+				// 如果“erp作业中心材料费用”，删除
+				if ("erp作业中心材料费用".equals(subjectName)) {
+					iterator.remove(); // 只有迭代器的 remove 才安全
+				}
 			}
 		}
 		return R.data(list);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml
index c47575138..3853cbb6a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml
@@ -25,6 +25,7 @@
         <result column="REMARKS" property="remarks"/>
         <result column="STATUS" property="status"/>
         <result column="IS_DELETED" property="isDeleted"/>
+        <result column="JC_ID" property="jcId"/>
     </resultMap>
 
 
@@ -35,6 +36,9 @@
             <if test="param2.month != null and param2.month != ''">
                 and MONTH = #{param2.month}
             </if>
+            <if test="param2.jcId != null and param2.jcId != ''">
+                and JC_ID = #{param2.jcId}
+            </if>
         </where>
     </select>