From 1f7a2b7352d3155e3b716751ccca94ef253fd399 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 04 十二月 2024 10:32:30 +0800
Subject: [PATCH] 合并数据
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 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 968a99b..51ff07b 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
@@ -138,6 +138,35 @@
}
+
+ @GetMapping ("/ceshi")
+ @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
+ @RepeatSubmit
+// @Transactional
+ public AjaxResult ceshi() {
+ List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
+ return AjaxResult.success(ccXZxYyLisJgSt);
+ }
+
+
+ @GetMapping ("/pacs")
+ @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛")
+ @RepeatSubmit
+ public AjaxResult pacs() {
+ List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
+
+ List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
+
+ log.info(list.toString());
+
+ List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
+
+ log.info(list1.toString());
+
+ return AjaxResult.success(ccXZxYyPacsJgSt);
+ }
+
+
@GetMapping ("/getCsList")
@ApiOperation (value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
@Transactional
@@ -348,6 +377,7 @@
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
+ final String sfkqdshitulianjie = configService.selectConfigByKey("sfkqdshitulianjie");
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
@@ -587,24 +617,49 @@
}
}
}
-
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
}
}
-
-
return AjaxResult.success("鍚屾鎴愬姛");
-
-
- //鍚屾妫�鏌ラ」鐩粰redis缂撳瓨鐜板湪涓嶇敤浜�
-// asyncService.updateCheckType(order.getTjNumber());
}
- //鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- //妫�鏌�
-// jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+ else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
+ if(null != hysqdList && !hysqdList.isEmpty()){
+ for (LtkjHysqd hysqd : hysqdList) {
+ LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
+ if (null != jybgid) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
+ }
+ if (ltkjHysqdService.save(hysqd)) {
+ List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
+ ltkjHybgdService.saveBatch(hybgdList);
+ }
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+// List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber());
+// if(null !=jcsqdList && !jcsqdList.isEmpty()){
+// jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+// jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
+// jcsqdService.saveBatch(jcsqdList);
+// List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId());
+// if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// }
+ String tjNumber1 = order.getTjNumber();
+ log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
+ log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+tjNumber);
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjnum",tjNumber);
+ testMapper.tjUpdateDetatilByVi(map);
+ }else {
+ //鍖栭獙
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ }
+ //妫�鏌�
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
@@ -618,6 +673,8 @@
}
}
+
+
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
--
Gitblit v1.8.0