From adaaa23c789be3313a0e554fbf7beaa8ab261e68 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 16 五月 2024 18:07:01 +0800
Subject: [PATCH] zjh 2024/05/16-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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 94037b0..d525862 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
@@ -72,11 +72,14 @@
@Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId}")
public List<TbTransition> getTbTransitionListByCusIdAndPac(@Param("cusId") String cusId,@Param("pacId") String pacId);
- @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId}")
- public List<TbTransition> getTbTransitionListByCusId(String cusId);
+ @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} and card_id=#{cardId}")
+ public List<TbTransition> getTbTransitionListByCusId(@Param("cusId")String cusId,@Param("cardId")String cardId);
- @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
- public boolean deletedTbTransitionListByCusIdAndPac(String cusId);
+ @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id) and card_id=#{cardId}")
+ public boolean deletedTbTransitionListByCusIdAndPac(@Param("cusId")String cusId,@Param("cardId")String cardId);
+
+ @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(tj_num)and card_id=#{cardId}")
+ public boolean deletedTbTransitionListByCusIdAndTjNum(@Param("cusId")String cusId,@Param("cardId")String cardId);
//鏍规嵁韬唤璇佸彿鍜屽椁恑d鏌ヨ鍜岄」鐩甶d
// @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id) AND pro_id =#{proId}")
@@ -97,9 +100,10 @@
@Update("UPDATE tb_transition a SET \n" +
"a.ord_price=a.now_price,\n" +
- "a.now_price=a.ord_price*#{discount}" +
+ "a.now_price=a.ord_price*#{discount}," +
+ "a.tj_num=#{tjNum}"+
" WHERE a.cus_id=#{cusId} ")
- boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount);
+ boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount,@Param("tjNum")String tjNum);
@Insert("INSERT INTO tb_transition(\n" +
@@ -124,8 +128,8 @@
"\tc.pro_name,\n" +
"\tb.pro_id,\n" +
"\tb.pro_name,\n" +
- "\tTRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),\n" +
- "\tTRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),\n" +
+ "\tTRUNCATE(c.pro_price,2),\n" +
+ " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
"\tSYSDATE(),\n" +
"\tc.pro_check_method,\n" +
"\tIFNULL(c.pro_type,'')\n" +
@@ -186,13 +190,16 @@
boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);
- @Select("SELECT b.price_now FROM \n" +
- "(SELECT a.pac_id FROM tb_transition a WHERE\n" +
- "\ta.cus_id = #{cusId} \n" +
- "GROUP BY\n" +
- "\ta.pac_id) aa \n" +
- "LEFT JOIN tj_package_project b\n" +
- "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
+// @Select("SELECT b.price_now FROM \n" +
+// "(SELECT a.pac_id FROM tb_transition a WHERE\n" +
+// "\ta.cus_id = #{cusId} \n" +
+// "GROUP BY\n" +
+// "\ta.pac_id) aa \n" +
+// "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(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId}")
BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
@@ -201,4 +208,10 @@
" 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);
+
+ @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId} AND !ISNULL(a.pac_id)")
+ String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("cardId")String cardId);
+
+ @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId} and a.card_id=#{cardId} and a.pac_id=#{pacId}")
+ BigDecimal getTbTransitionDxPriceByPac(@Param("cusId")String cusId,@Param("proId")Long proId,@Param("cardId")String cardId,@Param("pacId")Long pacId);
}
--
Gitblit v1.8.0