From 90a3c6e8d52d3360ef12c07cae6e984a33af523d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 12 十月 2024 15:47:02 +0800
Subject: [PATCH] zjh20241011
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 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 2022c2e..104201d 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
@@ -398,7 +398,11 @@
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
wq.eq(TjOrderDetail::getIsSampling, 0);
List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
- if (null != detailList && detailList.size() > 0) {
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser);
+ }
+
+ private void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser) {
+ if (null != detailList && detailList1) {
String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
for (TjOrderDetail detail : detailList) {
TjSampling sampling = new TjSampling();
@@ -1693,36 +1697,7 @@
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
wq.eq(TjOrderDetail::getIsSampling, 0);
List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
- if (null != detailList && detailList.size() > 0) {
- String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
- for (TjOrderDetail detail : detailList) {
- TjSampling sampling = new TjSampling();
- if (null == projectService.getById(detail.getProId())) continue;
- Long proParentId = projectService.getById(detail.getProId()).getProParentId();
- if (null != proParentId && proParentId == 0) {
- sampling.setSpecimenType(projectService.getById(detail.getProId()).getSpecimenType());
- } else {
- sampling.setSpecimenType(projectService.getById(projectService.getById(detail.getProId()).getProParentId()).getSpecimenType());
- }
- sampling.setSamplingNumber(format);
- sampling.setTjNum(order.getTjNumber());
- sampling.setCusId(String.valueOf(order.getUserId()));
- if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) {
- sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName());
- }
- sampling.setApplicationTime(new Date());
- sampling.setTjTime(order.getCreateTime());
- sampling.setProId(String.valueOf(detail.getProId()));
- sampling.setProName(projectService.getById(detail.getProId()).getProName());
- sampling.setCreateBy(sysUser.getNickName());
- sampling.setCreateTime(new Date());
- sampling.setUpdateBy(sysUser.getNickName());
- sampling.setUpdateTime(new Date());
- sampling.setCreateId(String.valueOf(sysUser.getUserId()));
- sampling.setUpdateId(String.valueOf(sysUser.getUserId()));
- samplingService.save(sampling);
- }
- }
+ addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser);
}
//棣栭〉楗肩姸鍥剧櫥璁颁汉鏁版帴鍙�
--
Gitblit v1.8.0