From 399142eaaef038d040b78e20ce07a17e67d4e96a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 13 八月 2024 18:11:53 +0800
Subject: [PATCH] zjh 2024-08-13

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 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 88019a4..ab2051c 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
@@ -8,6 +8,7 @@
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ltkj.common.annotation.RepeatSubmit;
@@ -297,7 +298,7 @@
                 tjOrder.setConfirmStatus(String.valueOf(status));
                 if (status == 0) {
                     tjOrder.setStatus(TjConstants.TJ_CHECK);
-                    asyncService.updateCheckType(tjNumber);
+//                    asyncService.updateCheckType(tjNumber);
                 } else {
                     tjOrder.setStatus(TjConstants.TJ_REFUSED);
                 }
@@ -307,8 +308,8 @@
                     confirmLog.setTjNum(tjNumber);
                     confirmLog.setStatus(status);
                     confirmLogService.save(confirmLog);
-                    asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
-                    asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
+//                    asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
+//                    asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
                     return AjaxResult.success("鎿嶄綔鎴愬姛");
                 }
                 return AjaxResult.error("鎿嶄綔澶辫触");
@@ -605,7 +606,7 @@
                 List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
                 List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
                 //鍚屾妫�楠�
-                if (null != baoGaoDans && baoGaoDans.size() > 0) {
+                if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
                     Date dates = new Date();
                     Map<String, Object> map = new HashMap<>();
                     map.put("his_registration_id", order.getCardId());
@@ -641,7 +642,8 @@
                         hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
                         hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
                         hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
-                        List<LtkjHysqd> list = ltkjHysqdService.listByMap(BeanUtil.beanToMap(hysqd,true,true));
+                        QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
+                        List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
                         if (list.isEmpty())
                             isInsertHysqd = true;
                         if (isInsertHysqd){
@@ -669,7 +671,9 @@
                     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.isEmpty()) {
+                            jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+                            jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
                             for (Map<String, Object> objectMap : datas) {
                                 //淇濆瓨鍏ュ弬鍑哄弬
                                 service.save(JSONUtil.parseObj(objectMap), "Getexamreportinfo", hisApiConfig, JSONUtil.toJsonStr(maps));
@@ -704,13 +708,9 @@
                                     jcbgd.setJcbw(objectMap.get("JCBW").toString());
                                 if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
                                     jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
-                                List<LtkjExamJcbgd> list = jcbgdService.listByMap(BeanUtil.beanToMap(jcbgd,true,true));
-                                if (list.isEmpty())
-                                    jcbgdService.save(jcbgd);
+                                jcbgdService.save(jcbgd);
                             }
-                            List<LtkjExamJcbgd> list = jcsqdService.queryLtkjExamJcsqdByTjh(order.getCardId());
-                            if (list.isEmpty())
-                                jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+                            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                             testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
                         }else {
                             return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
@@ -764,7 +764,8 @@
                 bgd.setShysmc(js.getStr("SHRXM"));
                 bgd.setYcbz(js.getStr("YCTS"));
 //                            bgd.setTpurl(js.getStr(""));
-                List<LtkjHybgd> list = ltkjHybgdService.listByMap(BeanUtil.beanToMap(bgd,true,true));
+                QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+                List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
                 if (list.isEmpty())
                     ltkjHybgdService.save(bgd);
             }
@@ -795,7 +796,8 @@
                 bgd.setShsj(js.getStr("BGRQ"));
                 bgd.setShys(hysqd.getShrdm());
                 bgd.setShysmc(hysqd.getShrxm());
-                List<LtkjHybgd> list = ltkjHybgdService.listByMap(BeanUtil.beanToMap(bgd,true,true));
+                QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+                List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
                 if (list.isEmpty())
                     ltkjHybgdService.save(bgd);
             }

--
Gitblit v1.8.0