From 41f99a843fb2c0424426e006f29c1e78192eae01 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 十二月 2023 08:37:55 +0800
Subject: [PATCH] zjh 2023/12/06--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 dc2ccb9..99b8f5a 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
@@ -359,7 +359,7 @@
customers = redisCache.getCacheMapValue("check", "ys");
}
if (customers != null && customers.size() > 0) {
- asyncService.addRedis(customers);
+// asyncService.addRedis(customers);
List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
map.put("customers", customerLists);
map.put("total", customers.size());
@@ -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());
@@ -482,7 +488,14 @@
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
- parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));
+// List<Long> longList = new ArrayList<>();
+// for (String str : split) {
+// if(!"".equals(str)){
+// longList.add(Long.valueOf(str));
+// }
+// }
+// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
} else {
parent.put("parentAdvice", null);
@@ -498,8 +511,6 @@
}
// }
}
- final long l1 = System.currentTimeMillis();
- System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
return AjaxResult.success(list);
}
return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
--
Gitblit v1.8.0