From 6671f69b4d24869f3f321a15f511c2ad61b64c04 Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期一, 19 五月 2025 15:12:48 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev --- aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java index 8b50ad4..9859ae7 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java @@ -1,7 +1,11 @@ package com.aps.core.mapper; import java.util.List; +import java.util.Map; + import com.aps.core.domain.ApsWeldSeam; +import com.aps.core.domain.ApsWeldSeamStatistics; +import com.aps.core.domain.ApsWeldSeamTemp; import org.apache.ibatis.annotations.Mapper; /** @@ -67,4 +71,9 @@ * @return 缁撴灉 */ public int deleteApsWeldSeamByIds(String[] ids); + + List<ApsWeldSeamStatistics> weldSeamStat(List<ApsWeldSeamTemp> apsWeldSeamTemps); + + List<Map> weldSeamEcharts(List<ApsWeldSeam> apsWeldSeams); + int removeLastBatch(); } -- Gitblit v1.9.3