From 658c3d5749673d68de17ff86a5ee2ea994e09e02 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 19 Oct 2023 21:36:18 +0800
Subject: [PATCH] 导出查询调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java
index 1923420..d563aed 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/SkxsQkTjServiceImpl.java
@@ -35,7 +35,7 @@
@Override
@DS("ztznwh")
public boolean exportSkxsQkTj(SkxsQkTj skxsQkTj) {
- // 查询库中是否包含当前日期，当前行政区的数据，如果有，则更新，没有则新增
+ // 查询库中是否包含当前日期，当前行政区的数据，如果有，则更新，没有则新增 ---有问题
QueryWrapper<SkxsQkTj> wrapper = new QueryWrapper<>();
wrapper.eq("\"statistic_time\"",skxsQkTj.getStatisticTime())
.eq("\"res_code\"",skxsQkTj.getResCode());
@@ -78,6 +78,11 @@
*/
@Override
public Object getStatisticList(SkxsQkTjVO skxsQkTj) {
+ // 通过adCode 获取adGrad
+ String adGrad = baseMapper.getAdGradByAdCode(skxsQkTj.getAdCode());
+ if (null!= adGrad && !adGrad.equals("")){
+ skxsQkTj.setAdGrad(adGrad);
+ }
return baseMapper.getStatisticList(skxsQkTj);
}
@@ -92,10 +97,7 @@
data.forEach(skxsQkTjExcel -> {
SkxsQkTj skxsQkTj = Objects.requireNonNull(BeanUtil.copy(skxsQkTjExcel, SkxsQkTj.class));
// 查询库中是否包含当前日期，当前行政区的数据，如果有，则更新，没有则新增
- QueryWrapper<SkxsQkTj> wrapper = new QueryWrapper<>();
- wrapper.eq("\"statistic_time\"",skxsQkTj.getStatisticTime())
- .eq("\"res_code\"",skxsQkTj.getResCode());
- SkxsQkTj qkTj = baseMapper.selectOne(wrapper);
+ SkxsQkTj qkTj = baseMapper.selectSkxsQkTj(skxsQkTjExcel);
// 设置更新人员，更新时间，来源信息
skxsQkTj.setUpdateTime(new Date());
skxsQkTj.setUpdateUser(AuthUtil.getUserId());
--
Gitblit v1.9.3