From 47aed74050e956919f2eee588fbab15607cf4029 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 31 十月 2023 17:20:31 +0800
Subject: [PATCH] zjh 2023/10/31--1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 266f9ab..2af84db 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
@@ -413,6 +413,7 @@
                             LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
                             wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
                             transitionService.remove(wqq);
+                            asyncService.updateCheckType(tjNumber);
                             return AjaxResult.success("鎿嶄綔鎴愬姛");
                         }
                         return AjaxResult.error("鎿嶄綔澶辫触");
@@ -434,16 +435,17 @@
      */
     @GetMapping("/updateCheckType")
     @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
-//    @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
     public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
         if(redisCache.hasKey("updateCheckType"+tjNumber)) {
-            return redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
+            List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
+            return AjaxResult.success(cacheMapValue);
         }
         return getAjaxResult(tjNumber);
     }
 
     private AjaxResult getAjaxResult(String tjNumber) {
-        final long l = System.currentTimeMillis();
+
+        asyncService.updateCheckType(tjNumber);
         List<Map<String, Object>> list = new ArrayList<>();
         TjOrder one = orderService.getOrderByTjNum(tjNumber);
 
@@ -467,7 +469,11 @@
                 if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                     for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                         final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
-                        tjOrderDetail.setProject(byId);
+                        if(null==byId){
+                            detailService.removeById(tjOrderDetail.getOrderDetailId());
+                        }else {
+                            tjOrderDetail.setProject(byId);
+                        }
                         List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
                         if (list2.size() == 0) {
                             tjOrderDetail.setStandard(new TjStandard());
@@ -498,8 +504,6 @@
                 }
 //                }
             }
-            final long l1 = System.currentTimeMillis();
-            System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
             return AjaxResult.success(list);
         }
         return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");

--
Gitblit v1.8.0