From 2f9691b8de0e2800f22ce96768aacfd129f02b3c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 19 七月 2024 17:08:50 +0800
Subject: [PATCH] zjh 2024/07/19-2

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 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 caec8fa..5aac19d 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
@@ -320,8 +320,11 @@
     @GetMapping ("/dataSynchronization")
     @ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
     @RepeatSubmit
-    @Transactional
+//    @Transactional
     public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
+
+
+
         //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
         final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
 
@@ -377,10 +380,7 @@
                         return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
                     }
                     JSONArray data = object.getJSONArray("ResultData");
-//                    int size = data.size();
-//                    if(size>0){
-//
-//                     }
+
                     for (Object datum : data) {
                         JSONObject jsonObject = (JSONObject) datum;
                         LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
@@ -469,13 +469,21 @@
                         }
                     }
 
-                    //鍚屾妫�鏌�
-                    Map<String, Object> maps = new HashMap<>();
-                    maps.put("his_registration_id", order.getCardId());
-                    maps.put("ksbm", "浣撴涓績");
-                    maps.put("pagecount", 100);
-                    maps.put("page", 1);
-                    AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
+                    /*鍚屾妫�鏌� his鎺ュ彛*/
+
+//                    Map<String, Object> maps = new HashMap<>();
+//                    maps.put("his_registration_id", order.getCardId());
+//                    maps.put("ksbm", "浣撴涓績");
+//                    maps.put("pagecount", 100);
+//                    maps.put("page", 1);
+//                    AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
+
+
+                    /*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
+                    AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績",order.getCardId(),"''",100,1,"'1'");
+                    DynamicDataSourceContextHolder.clearDataSourceType();
+
+
                     if (Integer.parseInt(results.get("code").toString()) == 200) {
                         List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
                         if(null !=datas && datas.size()>0){
@@ -541,6 +549,7 @@
                 asyncService.updateCheckType(order.getTjNumber());
             }
             return AjaxResult.success("鍚屾鎴愬姛");
+//            return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
         }
         return AjaxResult.error();
     }

--
Gitblit v1.8.0