From 14ecea8537d5b29ca64c75aad4ff49265018415d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 七月 2025 08:51:22 +0800
Subject: [PATCH] zjh20250702
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
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 3014b3a..789d03b 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.vo.ProFcListVo;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.apache.ibatis.annotations.*;
@@ -207,7 +208,7 @@
"FROM `tj_order_detail` \n" +
"where order_id=#{orderId}\n" +
"and pro_id IN\n" +
- "(select pro_id from tj_project where pro_parent_id=#{proParentId})")
+ "(select pro_id from tj_project where pro_parent_id=#{proParentId} and deleted=0 and pro_status=0)")
public List<TjOrderDetail> getDetailByOrderIdAndParId(@Param("orderId")Long orderId,@Param("proParentId")Long proParentId);
public List<TjOrderDetail> getDetailByOrderIdAndParIds(@Param("orderId")Long orderId,@Param("proParentIds")List<Long> proParentIds);
@@ -289,4 +290,17 @@
"a.update_time=SYSDATE()\n" +
"WHERE a.order_id=#{orderId} and isnull(a.jxbz)")
void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(@Param("orderId") String orderId,@Param("ls")String ls);
+
+
+ @Update("UPDATE tj_order_detail a SET\n" +
+ "a.deleted=1 \n" +
+ "WHERE a.order_detail_id=#{id}")
+ void updateTjOrderDetailDel(@Param("id") String id);
+
+ @Select("SELECT p.pro_id,p.pro_name,p.pro_parent_id,o.order_id,p.sl * p.pro_price as price,d.dept_id,d.dept_name\n" +
+ " FROM tj_order_detail o \n" +
+ " LEFT JOIN tj_project p ON o.pro_id = p.pro_id\n" +
+ " LEFT JOIN sys_dept d ON p.dept_id = d.dept_id\n" +
+ " WHERE order_id = #{orderId} AND p.pro_parent_id <>0 AND o.is_return = #{type}")
+ List<ProFcListVo> getFcList(@Param("orderId") Long orderId, @Param("type") Integer type);
}
--
Gitblit v1.8.0