From 5a6b8f6aae658b025d2e6e1127544bc8a95ec7c6 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 17:26:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingProcessMainServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingProcessMainServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingProcessMainServiceImpl.java
index 42fa27f..8de2f5c 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingProcessMainServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingProcessMainServiceImpl.java
@@ -30,6 +30,7 @@
@Override
public List<CokingProcessMainEntity> list(Map<String, Object> params) {
String category = (String) params.get("category");
+ String infoType = (String) params.get("infoType");
String clock = (String) params.get("clock");
if (StringUtils.isBlank(category)) {
return new ArrayList<>();
@@ -41,14 +42,25 @@
}
QueryWrapper<CokingProcessMainEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("category", category)
+ .eq("info_type", infoType)
.eq("clock", clock)
.orderByAsc("sort");
return cokingProcessMainDao.selectList(queryWrapper);
}
@Override
- public void save(CokingProcessMainEntity cokingProcessMainEntity) {
- cokingProcessMainDao.insert(cokingProcessMainEntity);
+ public List<CokingProcessMainEntity> historyList(String start, String end, String category, String indCode) {
+ QueryWrapper<CokingProcessMainEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("category", category)
+ .eq("ind_code",indCode)
+ .between("clock", start,end)
+ .orderByAsc("sort");
+ return cokingProcessMainDao.selectList(queryWrapper);
+ }
+
+ @Override
+ public void save(List<CokingProcessMainEntity> list) {
+ cokingProcessMainDao.insert(list);
}
@Override
--
Gitblit v1.9.3