From 0d4a80fd817b39417ad7eee88aa5d14bf571f79c Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期五, 28 六月 2024 17:29:09 +0800 Subject: [PATCH] zjh 本地 2024/06/28 --1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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 71badca..9cc2433 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 @@ -318,6 +318,7 @@ @GetMapping("/dataSynchronization") @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛") @RepeatSubmit + @Transactional public AjaxResult dataSynchronization(@RequestParam String tjNumber) { //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12 final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); @@ -356,13 +357,21 @@ List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId()); if(null !=baoGaoDans && baoGaoDans.size()>0){ + +// List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId()); +// if (one != null && one.size() > 0) { +// for (LtkjHysqd ltkjHysqd : one) { +// ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh()); +// ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh()); +// } +// } // for (String baoGaoDan : baoGaoDans) { Date dates = new Date(); Map<String,Object> map=new HashMap<>(); map.put("his_registration_id",order.getCardId()); map.put("ksbm",""); map.put("pationid",""); - map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(dates), "yyyy-MM-dd HH:mm:ss")); + map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss")); map.put("jsrq",DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss")); map.put("pagecount",10); map.put("page",1); @@ -378,7 +387,8 @@ JSONObject jsonObject = (JSONObject)datum; LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID")); if(null !=jybgid){ - continue; + ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(),jsonObject.getStr("JYBGID")); + ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jybgid.getTmh()); } LtkjHysqd hysqd=new LtkjHysqd(); hysqd.setTjh(order.getCardId()); -- Gitblit v1.8.0