From cf1ecf13ac4c3606371d16aa50f885b831a92e3e Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期五, 09 五月 2025 11:04:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyIndServiceImpl.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyIndServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyIndServiceImpl.java index 58c9d7f..f2f2c97 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyIndServiceImpl.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingAnalyIndServiceImpl.java @@ -28,12 +28,25 @@ @Override public List<CokingAnalyIndEntity> list(Map<String, Object> params) { String analyDate = (String) params.get("analyDate"); - String analyClass = (String) params.get("analyClass"); QueryWrapper<CokingAnalyIndEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StringUtils.isNotBlank(analyDate),"analy_date", analyDate) - .eq(StringUtils.isNotBlank(analyClass),"analy_class", analyClass) .orderByAsc("sort"); return cokingAnalyIndDao.selectList(queryWrapper); + } + + @Override + public CokingAnalyIndEntity get(String analyType, String analyDate) { + QueryWrapper<CokingAnalyIndEntity> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("analy_type", analyType) + .eq("analy_date", analyDate) + .orderByDesc("analy_date"); + + List<CokingAnalyIndEntity> list = cokingAnalyIndDao.selectList(queryWrapper); + if (list != null && list.size() > 0) { + return list.get(0); + } else { + return null; + } } @Override @@ -47,8 +60,6 @@ queryWrapper.eq("analy_type", analyType) .eq("analy_date", analyDate); cokingAnalyIndDao.delete(queryWrapper); - - } @Override -- Gitblit v1.9.3