From bd94f17a788da5fde253ce877a2d79de5d04df9c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 八月 2025 17:39:02 +0800
Subject: [PATCH] zjh202500815
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 70 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 36 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 d2959f4..4afc539 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
@@ -82,6 +82,8 @@
private AwsService awsService;
@Autowired
private ApiJcycpdgjzService apiJcycpdgjzService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
@@ -313,20 +315,26 @@
jcycxmService.deletedByTjh(s);
for (LtkjExamJcsqd jcsqd : jcsqdList) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ String regex = configService.selectConfigByKey("jcycxmzz");
+ if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
+// 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)){
+ 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("鏃犳畩")){
@@ -448,6 +456,7 @@
public AjaxResult tjjcycxm(@ApiParam("浣撴鍙�") @RequestParam(required = false)String tjh) {
String yqbm = configService.selectConfigByKey("dqyyyqbm");
if(StringUtil.isNotBlank(tjh)){
+ ycxmService.delOrderYcXmJyByTjh(tjh);
extracted(tjh, yqbm);
}else {
List<String> jc = orderService.getJianChaTjNum();
@@ -472,31 +481,20 @@
System.out.println("jcycxmzz鍊间负"+regex);
String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
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)){
+ 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.matches("\\d+") && !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);
- }*/
}
}
}
--
Gitblit v1.8.0