From f934309e1f07ea68e975bfd5c9d4fb06762f0dfc Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 十月 2024 16:17:51 +0800
Subject: [PATCH] zjh20241015修改采样数据添加逻辑
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 11 ++++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 6 ++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 7 +++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 4 ++++
4 files changed, 23 insertions(+), 5 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 039a8b7..c572f27 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
@@ -403,11 +403,12 @@
chargingStandardService.save(tjChargingStandard);
}
- LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
- wq.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq.eq(TjOrderDetail::getIsSampling, 0);
- List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
+// LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
+// wq.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wq.eq(TjOrderDetail::getIsSampling, 0);
+// List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 8860cae..1dcc39b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -232,4 +232,11 @@
"\t\tOR c.pro_name LIKE '%鑸掑紶鍘�%' \n" +
"\t)) aa ")
List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum);
+
+
+
+ @Select("SELECT a.* FROM tj_order_detail a LEFT JOIN tj_project b ON a.pro_id=b.pro_id\n" +
+ "LEFT JOIN sys_dept c ON c.dept_id=b.dept_id AND c.org_type=1\n" +
+ " WHERE a.deleted=0 AND !ISNULL(a.flowing_water_id) AND a.order_id=#{orderId}")
+ List<TjOrderDetail> getCaiYangDengJi(Long orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index 4ea249c..3968deb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -117,4 +117,8 @@
List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum);
+
+
+
+ List<TjOrderDetail> getCaiYangDengJi(Long orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 2cafe08..04b08b8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -1,5 +1,6 @@
package com.ltkj.hosp.service.impl;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -191,4 +192,9 @@
return tjOrderDetailMapper.getShenGaoTiZhongList(tjNum);
}
+ @Override
+ public List<TjOrderDetail> getCaiYangDengJi(Long orderId) {
+ return tjOrderDetailMapper.getCaiYangDengJi(orderId);
+ }
+
}
--
Gitblit v1.8.0