From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/service/impl/RectifyServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/RectifyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/RectifyServiceImpl.java
index 4375fc3..c7cd5cb 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/RectifyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/RectifyServiceImpl.java
@@ -47,7 +47,7 @@
QueryWrapper<Rectify> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("city_code", cityCode)
.eq("is_delete", Constants.NOT_DELETE)
- .likeRight("complete_time", time);
+ .likeRight("create_time", time);
Page<Rectify> rectifyPage = new Page<>(page, size);
rectifyMapper.selectPage(rectifyPage, queryWrapper);
@@ -63,6 +63,20 @@
}
@Override
+ public List<Rectify> exportRectifyByCityCode(Map<String, Object> params) {
+ //������������������
+ Integer cityCode = Integer.parseInt(params.get("cityCode").toString());
+ String time = params.get("time").toString();
+
+ QueryWrapper<Rectify> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("city_code", cityCode)
+ .eq("is_delete", Constants.NOT_DELETE)
+ .likeRight("create_time", time);
+ List<Rectify> rectifies = rectifyMapper.selectList(queryWrapper);
+ return rectifies;
+ }
+
+ @Override
public int updateRectify(Rectify rectify) {
UpdateWrapper<Rectify> wrapper = new UpdateWrapper<>();
wrapper.eq("id", rectify.getId());
--
Gitblit v1.8.0