From 4ccd96e52b9815ddfd5528fbebc6560042ec189b Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 22 十二月 2023 10:49:13 +0800
Subject: [PATCH] zjh 本地 2023/12/22 -1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 3074a8a..94037b0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -79,7 +79,10 @@
public boolean deletedTbTransitionListByCusIdAndPac(String cusId);
//鏍规嵁韬唤璇佸彿鍜屽椁恑d鏌ヨ鍜岄」鐩甶d
- @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id) AND pro_id =#{proId}")
+// @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id) AND pro_id =#{proId}")
+// public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
+
+ @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pro_id =#{proId}")
public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);
@Select("SELECT DISTINCT pac_id FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
@@ -132,38 +135,23 @@
"\tLEFT JOIN tj_project c ON b.pro_id = c.pro_parent_id\n" +
"\tLEFT JOIN tj_package d ON a.pac_id=d.pac_id\n" +
"\t\n" +
- "\tWHERE a.pac_id=#{pacId}")
+ "\tWHERE a.pac_id=#{pacId} and c.deleted=0")
void saveRedisTransitionByPacId(@Param("cusId") String cusId,@Param("pacId") Long pacId);
- @Insert("INSERT INTO tb_transition(\n" +
- " cus_id,\n" +
- " pro_id,\n" +
- " pro_name,\n" +
- " parent_pro_id,\n" +
- " parent_pro_name,\n" +
- " ord_price,\n" +
- " now_price,\n" +
- " create_time,\n" +
- " pro_check_method,\n" +
- " pro_type\n" +
- ")\n" +
+ @Insert("INSERT INTO tb_transition \n" +
+ "(cus_id, pro_id, pro_name, parent_pro_id, parent_pro_name, ord_price, now_price, create_time, pro_check_method, pro_type ) \n" +
"SELECT\n" +
- "\t#{cusId},\n" +
- "\tb.pro_id,\n" +
- "\tb.pro_name,\n" +
- "\ta.pro_id,\n" +
- "\ta.pro_name,\n" +
- "\tb.pro_price,\n" +
- "\tb.pro_price,\n" +
- "\tSYSDATE(),\n" +
- "\tb.pro_check_method,\n" +
- "\tIFNULL(b.pro_type,'')\n" +
+ "#{cusId},\n" +
+ "a.pro_id,a.pro_name,b.pro_id,b.pro_name,a.pro_price,a.pro_price,SYSDATE(),a.pro_check_method,\n" +
+ "IFNULL ( a.pro_type, '' ) \n" +
"FROM\n" +
"\ttj_project a\n" +
- "\tLEFT JOIN tj_project b ON b.pro_parent_id = a.pro_id \n" +
+ "\tLEFT JOIN \n" +
+ "\ttj_project b \n" +
+ "\tON a.pro_parent_id = b.pro_id \n" +
"WHERE\n" +
- "\ta.pro_id = #{proId} ")
+ "\ta.pro_id = #{proId}")
void saveRedisTransitionByProId(@Param("cusId")String cusId,@Param("proId") Long proId);
@@ -194,7 +182,7 @@
"\ttj_grouping_pro a\n" +
"\tLEFT JOIN tj_project b ON a.pro_id = b.pro_id \n" +
"\tLEFT JOIN tj_project c ON c.pro_parent_id=b.pro_id\n" +
- "WHERE 1=1 AND a.grouping_id =#{groupingId} ")
+ "WHERE 1=1 AND a.grouping_id =#{groupingId} and c.deleted=0 ")
boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);
@@ -206,4 +194,11 @@
"LEFT JOIN tj_package_project b\n" +
"\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
+
+
+ @Select("SELECT SUM(c.pro_price) FROM tj_project c WHERE c.pro_id IN " +
+ "(SELECT b.pro_id FROM tb_transition b WHERE" +
+ " b.cus_id=(SELECT a.cus_idcard FROM tj_customer a " +
+ "WHERE a.cus_id=#{cusId}) AND b.parent_pro_id=#{proId}) ")
+ BigDecimal getTbTransitionDxPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
}
--
Gitblit v1.8.0