From cdd1ef49773e49dd91d19f9d02c82fb70e9f658c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 七月 2025 18:07:54 +0800
Subject: [PATCH] zjh20250718
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 12 ++++++------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 13 +++++++++----
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index b1a246a..3d54d10 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -234,7 +234,7 @@
private void tbjianyan(String s,String dqyyyqbm) {
try {
- List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
+ /* List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
log.info("澶栭�侀」鐩釜鏁�->{} 缁撴灉",awsList.size());
log.info(awsList.toString());
@@ -242,14 +242,14 @@
log.info("鍒犻櫎澶栭�侀」鐩垚鍔�");
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
- }
+ }*/
List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm);
log.info("鍘焗ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
- List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
+ /* List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
if(null !=wssq && !wssq.isEmpty()){
log.info("澶栭�侀」涓�->{} 缁撴灉",wssq.toString());
hysqdList.addAll(wssq);
- }
+ }*/
if (null != hysqdList && !hysqdList.isEmpty()) {
log.info("鐜癶ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
for (LtkjHysqd hysqd : hysqdList) {
@@ -260,8 +260,8 @@
}
if (ltkjHysqdService.save(hysqd)) {
List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
- List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
- if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
+// List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+// if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
ltkjHybgdService.saveBatch(hybgdList);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index 7ca2360..ec2858e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -167,6 +167,8 @@
List<TjUserAdvice> list = userAdviceService.list(wq0);
List<TjAdvice> kjbqPage = new ArrayList<>();
Map<String,Object> map = new HashMap<>();
+ map.put("total", 0);
+ map.put("records", null);
if (null != list && !list.isEmpty()) {
for (TjUserAdvice advice : list) {
TjAdvice advice1 = tjAdviceService.getById(advice.getAdviceId());
@@ -177,13 +179,16 @@
}
List<TjAdvice> adviceList =null;
if(StringUtil.isNotBlank( nr)){
- adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr))
- .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr)).collect(Collectors.toList());
+ List<TjAdvice> tjAdviceList = adviceList.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ map.put("total", adviceList.size());
+ map.put("records", tjAdviceList);
}else {
adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ map.put("total", kjbqPage.size());
+ map.put("records", adviceList);
}
- map.put("total", kjbqPage.size());
- map.put("records", adviceList);
+
return AjaxResult.success(map);
}
return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!");
--
Gitblit v1.8.0