From 0f658843b92eb41a87cb113c9eb6416e25e76a2e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 14 三月 2025 08:42:10 +0800
Subject: [PATCH] zjh20250314
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 729bdf1..4ceb6e7 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
@@ -8,6 +8,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
+import cn.hutool.json.JSONUtil;
import com.ltkj.common.core.domain.entity.SysMenu;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
@@ -192,22 +193,22 @@
@ApiOperation(value = "鎵嬪姩鍚屾妫�楠屾鏌ュ閫侀」鐩粨鏋滄帴鍙�")
public AjaxResult shoudongtbjyjcwsxmjg(@RequestParam @ApiParam(value = "jy妫�楠� jc妫�鏌� jyjc妫�楠屽拰妫�鏌�") String tblx,
@ApiParam(value = "浣撴鍙�")@RequestParam String tjh) {
-
+ String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
log.info("鎵嬪姩鍚屾妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
try {
switch (tblx){
case "jy":
- tbjianyan(tjh);
+ tbjianyan(tjh,dqyyyqbm);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠�");
break;
case "jc":
- tbjiancha(tjh);
+ tbjiancha(tjh,dqyyyqbm);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�鏌�");
break;
case "jyjc":
- tbjianyan(tjh);
- tbjiancha(tjh);
+ tbjianyan(tjh,dqyyyqbm);
+ tbjiancha(tjh,dqyyyqbm);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠屾鏌�");
break;
default:
@@ -227,20 +228,26 @@
return AjaxResult.success();
}
- private void tbjianyan(String s) {
+ private void tbjianyan(String s,String dqyyyqbm) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
+ log.info("澶栭�侀」鐩釜鏁�->{} 缁撴灉",awsList.size());
log.info(awsList.toString());
testMapper.delWsxmjg(s);
log.info("鍒犻櫎澶栭�侀」鐩垚鍔�");
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm);
+ log.info("鍘焗ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
- if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
+ 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) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
if (null != jybgid) {
@@ -265,10 +272,10 @@
}
- private void tbjiancha(String s) {
+ private void tbjiancha(String s,String dqyyyqbm) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,dqyyyqbm);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
@@ -349,7 +356,7 @@
List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
- if(jcsqd.getJgbx().contains("銆�")){
+ if(StringUtil.isNotBlank(jcsqd.getJgzt())){
String[] split = jcsqd.getJgzt().split("銆�");
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
--
Gitblit v1.8.0