From 12614448a0e4c9521cc9d99cc56f4b453705c48c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 18:19:36 +0800
Subject: [PATCH] zjh20250703
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 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 e7a3bd5..b1a246a 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
@@ -79,6 +79,8 @@
private AwsService awsService;
@Autowired
private IdUtils idUtils;
+ @Autowired
+ private ApiJcycpdgjzService apiJcycpdgjzService;
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
@@ -290,7 +292,19 @@
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ boolean b = apiJcycpdgjz(jg);
+ if(!b){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(dqyyyqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ /* if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
TjJcycxm jcycxm=new TjJcycxm();
@@ -302,7 +316,7 @@
jcycxm.setCreateTime(new Date());
jcycxm.setJcjg(jg);
jcycxmService.save(jcycxm);
- }
+ }*/
}
}
}
@@ -440,25 +454,40 @@
public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
TjOrder order = orderService.getOrderByTjNum(s);
- jcycxmService.deletedByTjh(s);
- List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
- if(null !=list && !list.isEmpty()){
- for (LtkjExamJcsqd jcsqd : list) {
- if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
- for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏃犲紓甯�")
- && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
- TjJcycxm jcycxm=new TjJcycxm();
- jcycxm.setTjh(s);
- jcycxm.setYqid(yqbm);
- String[] split1 = jcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(jcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
+ if(null != order){
+ jcycxmService.deletedByTjh(s);
+ List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
+ if(null !=list && !list.isEmpty()){
+ for (LtkjExamJcsqd jcsqd : list) {
+ if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+ for (String jg : split) {
+ boolean b = apiJcycpdgjz(jg);
+ if(!b){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(yqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+
+ /* if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏃犲紓甯�")
+ && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(yqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }*/
}
}
}
@@ -507,4 +536,16 @@
return AjaxResult.success();
}
+
+
+ public boolean apiJcycpdgjz(String jg) {
+ if(StringUtil.isNotBlank(jg)){
+ List<String> gjzList = apiJcycpdgjzService.getGjzList();
+ if(null !=gjzList && !gjzList.isEmpty()){
+ return gjzList.stream().anyMatch(jg::contains);
+ }
+ }
+ return false;
+ }
+
}
--
Gitblit v1.8.0