From 7c266bff815ebed897e51f401ef5987629d77c44 Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期三, 21 五月 2025 11:08:29 +0800 Subject: [PATCH] 修改管路预测与物料产品组导入功能 根据工厂及料号更新与插入 --- aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 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..ef687da 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,24 @@ 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="!facs.isEmpty()">or factory in + <foreach collection="facs" item="item" open="(" separator="," close=")"> + #{item} + </foreach> + </if> + <if test="!facs.isEmpty()">or material_code in + <foreach collection="codes" item="item" open="(" separator="," close=")"> + #{item} + </foreach> + </if> + </script> + """) + List<Map<String, Object>> selectByFacOrMaterial(@NotNull Set<String> facs, @NotNull Set<String> codes); + } -- Gitblit v1.9.3