From fc568216a671c79c9fdf8cd12b827898cae84b27 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 25 七月 2024 09:00:41 +0800 Subject: [PATCH] zjh 2024/07/25-1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 91 +++++++++++++++++++++++++-------------------- 1 files changed, 50 insertions(+), 41 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 34766c9..5a5ff9c 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 @@ -327,8 +327,6 @@ // @Transactional public AjaxResult dataSynchronization(@RequestParam String tjNumber) { - - //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12 final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); @@ -365,8 +363,9 @@ if (null != sfkqdyhis && sfkqdyhis.equals("Y")) { List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId()); + List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId()); + //鍚屾妫�楠� if (null != baoGaoDans && baoGaoDans.size() > 0) { - //鍚屾妫�楠� Date dates = new Date(); Map<String, Object> map = new HashMap<>(); map.put("his_registration_id", order.getCardId()); @@ -381,7 +380,7 @@ JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if (null == code || !code.equals("0")) { - return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!"); + return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!"); } JSONArray data = object.getJSONArray("ResultData"); @@ -472,9 +471,12 @@ } } + //鍚屾鍖栭獙椤圭洰 + testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); + } - /*鍚屾妫�鏌� his鎺ュ彛*/ - + /*鍚屾妫�鏌� his鎺ュ彛*/ + if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) { Map<String, Object> maps = new HashMap<>(); maps.put("his_registration_id", order.getCardId()); maps.put("ksbm", "浣撴涓績"); @@ -488,81 +490,88 @@ /*鍚屾妫�鏌� his瀛樺偍杩囩▼*/ - AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績",order.getCardId(),"''",100,1,"'1'"); + AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'"); DynamicDataSourceContextHolder.clearDataSourceType(); - log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: "+results.toString()); + log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + results.toString()); 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){ + if (null != datas && datas.size() > 0) { jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId()); jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId()); for (Map<String, Object> objectMap : datas) { //淇濆瓨鍏ュ弬鍑哄弬 // service.save((JSONObject)objectMap,"Getexamreportinfo",hisApiConfig,JSONUtil.toJsonStr(maps)); - service.save(JSONUtil.parseObj(objectMap),"Getexamreportinfo",hisApiConfig,JSONUtil.toJsonStr(maps)); + service.save(JSONUtil.parseObj(objectMap), "Getexamreportinfo", hisApiConfig, JSONUtil.toJsonStr(maps)); - LtkjExamJcbgd jcbgd=new LtkjExamJcbgd(); + LtkjExamJcbgd jcbgd = new LtkjExamJcbgd(); jcbgd.setTjh(order.getCardId()); - if(null !=objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals("")) - jcbgd.setTmh(objectMap.get("JCBGID").toString()); + if (null != objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals("")) + jcbgd.setTmh(objectMap.get("JCBGID").toString()); - if(null !=objectMap.get("JCXMDM") || !objectMap.get("JCXMDM").equals("")) - jcbgd.setXmdm(objectMap.get("JCXMDM").toString()); + if (null != objectMap.get("JCXMDM") || !objectMap.get("JCXMDM").equals("")) + jcbgd.setXmdm(objectMap.get("JCXMDM").toString()); - if(null !=objectMap.get("JCXMMC") || !objectMap.get("JCXMMC").equals("")) - jcbgd.setXmmc(objectMap.get("JCXMMC").toString()); + if (null != objectMap.get("JCXMMC") || !objectMap.get("JCXMMC").equals("")) + jcbgd.setXmmc(objectMap.get("JCXMMC").toString()); - if(null !=objectMap.get("JCXMJG") || !objectMap.get("JCXMJG").equals("")) - jcbgd.setBgNr(objectMap.get("JCXMJG").toString()); + if (null != objectMap.get("JCXMJG") || !objectMap.get("JCXMJG").equals("")) + jcbgd.setBgNr(objectMap.get("JCXMJG").toString()); - if(null !=objectMap.get("reporturl") || !objectMap.get("reporturl").equals("")) - jcbgd.setBgUrl(objectMap.get("reporturl").toString()); + if (null != objectMap.get("reporturl") || !objectMap.get("reporturl").equals("")) + jcbgd.setBgUrl(objectMap.get("reporturl").toString()); - if(null !=objectMap.get("SHYSQM") || !objectMap.get("SHYSQM").equals("")) - jcbgd.setShysxm(objectMap.get("SHYSQM").toString()); + if (null != objectMap.get("SHYSQM") || !objectMap.get("SHYSQM").equals("")) + jcbgd.setShysxm(objectMap.get("SHYSQM").toString()); - if(null !=objectMap.get("SHYSBH") || !objectMap.get("SHYSBH").equals("")) - jcbgd.setShysdm(objectMap.get("SHYSBH").toString()); + if (null != objectMap.get("SHYSBH") || !objectMap.get("SHYSBH").equals("")) + jcbgd.setShysdm(objectMap.get("SHYSBH").toString()); - if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals("")) - jcbgd.setYxzd(objectMap.get("YXZD").toString()); + if (null != objectMap.get("YXZD") || !objectMap.get("YXZD").equals("")) + jcbgd.setYxzd(objectMap.get("YXZD").toString()); - if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")){ - if(objectMap.get("YXBX").toString().equals("null")){ + if (null != objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")) { + if (objectMap.get("YXBX").toString().equals("null")) { jcbgd.setYxbx("鏈寮傚父"); - }else { + } else { jcbgd.setYxbx(objectMap.get("YXBX").toString()); } } - if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals("")) - jcbgd.setZdsj(objectMap.get("SJJLSJ").toString()); + if (null != objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals("")) + jcbgd.setZdsj(objectMap.get("SJJLSJ").toString()); - if(null !=objectMap.get("JCBW") || !objectMap.get("JCBW").equals("")) + if (null != objectMap.get("JCBW") || !objectMap.get("JCBW").equals("")) jcbgd.setJcbw(objectMap.get("JCBW").toString()); - if(null !=objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals("")) + if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals("")) jcbgd.setSqsj(objectMap.get("SQRQSJ").toString()); jcbgdService.save(jcbgd); } jcsqdService.saveLtkjExamJcsqd(order.getCardId()); + testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); + }else { + return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!"); } } } - //鍚屾鍖栭獙椤圭洰 - testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); - //鍚屾妫�鏌ラ」鐩� - testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); - asyncService.updateCheckType(order.getTjNumber()); + + 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()); return AjaxResult.success("鍚屾鎴愬姛"); -// return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!"); } - return AjaxResult.error(); + return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍"); } //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡 -- Gitblit v1.8.0