From 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 19:01:13 +0800
Subject: [PATCH] zjh20250620
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 4cf674c..f418e9f 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
@@ -412,20 +412,28 @@
@GetMapping ("/tjjcycxm")//鍚屾his椤圭洰鍗曚环淇℃伅
// @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
@ApiOperation (value = "tjjcycxm")
- public AjaxResult tjjcycxm(@RequestParam(required = false)@ApiParam(value = "浣撴鍙�") String tjh) {
+ public AjaxResult tjjcycxm(@RequestParam(required = false)@ApiParam(value = "浣撴鍙�") String tjh,
+ @RequestParam(defaultValue = "0",required = false)@ApiParam(value = "0 浠呭悓姝ユ湭瀹℃牳浜哄憳 1鎵�鏈変汉") String lx) {
String yqbm = configService.selectConfigByKey("dqyyyqbm");
if(StringUtil.isNotBlank(tjh)){
zongjianshengchengyichangxiangmu(tjh, yqbm);
return AjaxResult.success();
- }
- List<String> jc = orderService.getJianChaTjNum();
- if (null != jc && !jc.isEmpty()) {
- for (String s : jc) {
- zongjianshengchengyichangxiangmu(s, yqbm);
-
+ }else {
+ List<String> jc =null;
+ if(lx.equals("0")){
+ jc = orderService.getJianChaTjNumWsh();
+ }else {
+ jc = orderService.getJianChaTjNum();
}
+
+ if (null != jc && !jc.isEmpty()) {
+ for (String s : jc) {
+ zongjianshengchengyichangxiangmu(s, yqbm);
+ }
+ }
+ return AjaxResult.success();
}
- return AjaxResult.success();
+
}
public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
@@ -438,7 +446,7 @@
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("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
TjJcycxm jcycxm=new TjJcycxm();
jcycxm.setTjh(s);
--
Gitblit v1.8.0