From 5f4847d23506f10f76bc5ba493880bb3b87df12c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 12 十二月 2024 18:55:15 +0800
Subject: [PATCH] zjh202412012

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   76 +++++++++++++++++++++++++------------
 1 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index fcbd62b..10cb722 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -120,28 +120,24 @@
     private HisApiConfigService hisApiConfigService;
     @Autowired
     private RedissonClient redissonClient;
+    @Autowired
+    private ITjRulesService rulesService;
 
 
-//    public void  csdsrw() throws InterruptedException {
-//        log.info("瀹氭椂浠诲姟寮�濮嬫墽琛�"+new Date());
-//        Thread.sleep(1000*5);
-//        log.info("瀹氭椂浠诲姟缁撴潫鎵ц"+new Date());
-//    }
+    @GetMapping ("/ceshicc")
+    @ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
+    @RepeatSubmit
+//    @Transactional
+    public AjaxResult ceshicc(String s) {
 
-    @GetMapping ("/getOperationPermissionsByTjNum")
-    @ApiOperation (value = "(鍒濆椤甸潰  鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛  true鍙搷浣�  鍙嶄箣涓嶅彲")
-    public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
-        TjOrder order = orderService.getOrderByTjNum(tjNumber);
-        if (null != order) {
-            Integer status = order.getStatus();
-            if (status < 300) {
-                return AjaxResult.success(true);
-            }
-            if (status > 300) {
-                return AjaxResult.success(false);
-            }
-        }
-        return AjaxResult.success(false);
+        long start = System.currentTimeMillis();
+        Map<String,Object> map=new HashMap<>();
+        map.put("tjnum", s);
+        testMapper.tjUpdateDetatilByVi(map);
+
+        long end = System.currentTimeMillis();
+        log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000);
+        return AjaxResult.success((end - start) / 1000);
     }
 
 
@@ -171,6 +167,22 @@
         log.info(list1.toString());
 
         return AjaxResult.success(ccXZxYyPacsJgSt);
+    }
+
+    @GetMapping ("/getOperationPermissionsByTjNum")
+    @ApiOperation (value = "(鍒濆椤甸潰  鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛  true鍙搷浣�  鍙嶄箣涓嶅彲")
+    public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+        TjOrder order = orderService.getOrderByTjNum(tjNumber);
+        if (null != order) {
+            Integer status = order.getStatus();
+            if (status < 300) {
+                return AjaxResult.success(true);
+            }
+            if (status > 300) {
+                return AjaxResult.success(false);
+            }
+        }
+        return AjaxResult.success(false);
     }
 
 
@@ -667,6 +679,7 @@
                         testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                     }
                   //妫�鏌�
+                    orderService.tjLispacstongbujianyi(null,null,null,null);
                     return AjaxResult.success("鍚屾鎴愬姛");
                 }
                 return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
@@ -1611,11 +1624,6 @@
 
 
 
-    /**
-     * 鎬绘淇敼澶囨敞
-     *
-     * @return
-     */
     @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
     @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
     public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
@@ -1626,7 +1634,7 @@
     }
 
     private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
-        asyncService.updateCheckType(tjNumber);
+//        asyncService.updateCheckType(tjNumber);
         TjOrder one = orderService.getOrderByTjNum(tjNumber);
 
         if (one == null) {
@@ -1642,11 +1650,19 @@
                     List<TjOrderDetail> dels = new ArrayList<>();
                     for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                         if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+                            if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
+                                List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
+                                if(null !=maps && !maps.isEmpty()){
+                                    tjOrderDetail.setAdvices(maps);
+                                }
+                            }
+
                             dels.add(tjOrderDetail);
                         }
                     }
                     if(!dels.isEmpty()){
                         parent.put("proName",remark.getProName());
+                        parent.put("jyjc",remark.getJyjc());
                         parent.put("sone",dels);
                         list.add(parent);
                     }
@@ -1659,4 +1675,14 @@
         return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
     }
 
+    @GetMapping ("/getyichangxiangmujianyiguize")
+    @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰寤鸿瑙勫垯鎺ュ彛")
+    public AjaxResult getyichangxiangmujianyiguize(@RequestParam String proId,@RequestParam String ycbz) {
+        if (StrUtil.isNotBlank(proId) && StrUtil.isNotBlank(ycbz)) {
+            List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,"",ycbz,"");
+            return AjaxResult.success(map);
+        }
+        return AjaxResult.error();
+    }
+
 }

--
Gitblit v1.8.0