From d75541110d428f61a9fe3378110248b7dd78e240 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 21 五月 2025 12:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java
index c653463..7ca23e2 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java
@@ -1,9 +1,15 @@
package com.aps.core.mapper;
import com.aps.core.domain.ApsGasPipelinePrediction;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import org.jetbrains.annotations.NotNull;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* 绠¤矾鎵嬪伐姘斾綋棰勬祴鏁版嵁Mapper鎺ュ彛
@@ -62,4 +68,19 @@
public int deleteApsGasPipelinePredictionByIds(Long[] ids);
void deleteAll();
+
+ @Select("""
+ <script>
+ select id, factory || '##' || material_code || '##' || TO_CHAR(predict_date, 'yyyy-MM') as key
+ from aps_gas_pipeline_prediction
+ where 1 = 0
+ <if test="!keys.isEmpty()">or factory || '##' || material_code || '##' || TO_CHAR(predict_date, 'yyyy-MM') in
+ <foreach collection="keys" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </script>
+ """)
+ List<Map<String, Object>> selectByFacOrMaterial(@NotNull Set<String> keys);
+
}
--
Gitblit v1.9.3