From df4d4ead9b72c058819660d90080d58da733b2d1 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期三, 16 四月 2025 18:18:27 +0800
Subject: [PATCH] 焊缝统计表提交
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
index 9091533..945cc4b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -281,7 +281,7 @@
sb.append(value.get("work_order_name"));
sb.append("-");
sb.append(value.get("classification_name"));
- if(sb.toString().equals(title.get(i))){//鍒楁槑
+ if(sb.toString().equals(title.get(i)) && month.equals(value.get("produce_month").toString())){
table.add(value.get("total_weld_seam").toString());
}
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
index 5b9b3fa..dfd139d 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -183,6 +183,7 @@
LEFT JOIN sys_dict_data classification ON seam.classification = classification.dict_value
AND classification.dict_type = 'aps_weld_classification'
<where>
+ seam.del_flag = '0'
<if test="produceYears != null "> and produce_year in
<foreach item="produceYear" collection="produceYears" open="(" separator="," close=")">
#{produceYear}
--
Gitblit v1.9.3