From a807cfe099406b061afafd53219bbacf71fcc9d9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 21 十月 2024 16:34:57 +0800
Subject: [PATCH] zjh20241021
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 47729ee..d1e9395 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -147,6 +148,8 @@
private IdUtils idUtils;
@Autowired
private LtkjJybbzdService jybbzdService;
+ @Autowired
+ private LisJyflhbService lisJyflhbService;
@Override
@@ -474,7 +477,30 @@
String config = configService.selectConfigByKey("sfkqdyhis");
if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
- log.info("getJyFlHb ->{}",JSONUtil.toJsonStr(ajaxResult));
+ if (ajaxResult.get("code").toString().equals("200")){
+ String str = ajaxResult.get("data").toString();
+ str = str.replace("=", ":");
+ JSONArray array = JSONUtil.parseArray(str);
+ for (Object o : array) {
+ JSONObject object = (JSONObject) o;
+ LisJyflhb lisJyflhb = new LisJyflhb();
+ lisJyflhb.setHbhxm(object.getStr("hbhxm"));
+ lisJyflhb.setFlmc(object.getStr("flmc"));
+ lisJyflhb.setMc(object.getStr("mc"));
+ lisJyflhb.setFlbm(object.getStr("flbm"));
+ LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
+ LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
+ if (jyflhb == null) {
+ lisJyflhb.setId(IdUtil.getSnowflake().nextId());
+ lisJyflhbService.save(lisJyflhb);
+ }else {
+ lisJyflhb.setId(jyflhb.getId());
+ lisJyflhbService.updateById(lisJyflhb);
+ }
+ }
+ }
+
}
}
@@ -779,6 +805,12 @@
} else {
// wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
+
+ //濡傛灉璇ラ」鐩瓨鍦� 鍒� 涓嶄繚瀛�
+
+ TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
+ if(null !=orderDetail) continue;
+
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
TjProject projectss = projectService.getById(projects.getProParentId());
@@ -818,11 +850,14 @@
}
}
- List<TjOrderDetail> collect = tjOrderDetails.stream().filter(item -> {
- TjProject project = projectService.getById(item.getProId());
- return project != null && project.getProParentId() == 0;
- }).collect(Collectors.toList());
- addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// List<TjOrderDetail> collect = tjOrderDetails.stream().filter(item -> {
+// TjProject project = projectService.getById(item.getProId());
+// return project != null && project.getProParentId() == 0;
+// }).collect(Collectors.toList());
+//// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+ addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
+
tjOrderDetails = new ArrayList<>();
ArrayList<TjProject> jianChaProjects = new ArrayList<>();
@@ -996,11 +1031,13 @@
}
}
}
- collect = tjOrderDetails.stream().filter(item -> {
- TjProject project = projectService.getById(item.getProId());
- return project != null && project.getProParentId() == 0;
- }).collect(Collectors.toList());
- addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// collect = tjOrderDetails.stream().filter(item -> {
+// TjProject project = projectService.getById(item.getProId());
+// return project != null && project.getProParentId() == 0;
+// }).collect(Collectors.toList());
+//// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+ List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+ addCaiYangDengJi(detailLists,!detailLists.isEmpty(), order, sysUser,jxbz);
}
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
@@ -1071,6 +1108,9 @@
ltkjJianchajianyanTreeService.save(tree);
}
+// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+// addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
+
}
}
--
Gitblit v1.8.0