From 2eb40036e885988fbf93ebcb98a339b197fb6340 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 17:39:52 +0800
Subject: [PATCH] zjh20250605

---
 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 19e1285..326905a 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,25 +412,33 @@
     @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) {
         TjOrder order = orderService.getOrderByTjNum(s);
-        jcycxmService.deletedByTjh(order.getCardId());
+        jcycxmService.deletedByTjh(s);
         List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
         if(null !=list && !list.isEmpty()){
             for (LtkjExamJcsqd jcsqd : list) {

--
Gitblit v1.8.0