From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 ddb735e..7eff9b1 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
@@ -8,6 +8,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 杩囨浮Mapper鎺ュ彛
@@ -76,7 +77,8 @@
public boolean delTbBycusCardIdAndProId(@Param("cdId") String cdId,@Param("proId")String proId);
@Update("UPDATE tb_transition a SET "+
- "a.tj_num=null" +
+ "a.tj_num=null," +
+ "a.card_id=0" +
" WHERE a.tj_num=#{tjNum}")
boolean updateTbTransitionByTjNum(String tjNum);
@@ -331,6 +333,18 @@
})
BigDecimal getLisPriceByTjNumAndInParentProId(@Param("tjNum") String tjNum, @Param("parentProId") List<String> parentProId);
+ @Select({
+ "<script>",
+ "SELECT SUM(now_price) FROM `tb_transition`",
+ "WHERE `tj_num` = #{tjNum}",
+ "AND `pro_id` IN",
+ "<foreach item='item' index='index' collection='proId' open='(' separator=',' close=')'>",
+ "#{item}",
+ "</foreach>",
+ "</script>"
+ })
+ BigDecimal getLisPriceByTjNumAndInProId(@Param("tjNum") String tjNum, @Param("proId") List<Long> parentProId);
+
@Select("SELECT GROUP_CONCAT(c.pro_name SEPARATOR ' ; ' ) FROM tj_package_project b JOIN tj_project c ON c.pro_id=b.pro_id\n" +
@@ -376,4 +390,24 @@
@Select("SELECT SUM(a.ord_price) FROM tb_transition a WHERE a.tj_num=#{tjNum} AND a.parent_pro_id=#{proId}")
BigDecimal getTbTransitionOrdPriceByTjNumAndParentId(@Param("tjNum")String tjNum,@Param("proId")String proId);
+
+ @Select("SELECT SUM(a.ord_price) FROM tb_transition a WHERE a.tj_num=#{tjNum} ")
+ BigDecimal sumTbTransitionOrdPriceByTjNum(@Param("tjNum")String tjNum);
+
+ @Select("SELECT SUM(a.ord_price) FROM tb_transition a WHERE a.cus_id=#{tjNum} and isnull(a.tj_num)")
+ BigDecimal sumTbTransitionOrdPriceByTjNumIsNull(@Param("tjNum")String tjNum);
+
+ @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.tj_num=#{tjNum}")
+ BigDecimal sumTbTransitionNowPriceByTjNum(@Param("tjNum")String tjNum);
+
+ @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{tjNum} and isnull(a.tj_num)")
+ BigDecimal sumTbTransitionNowPriceByTjNumIsNull(@Param("tjNum")String tjNum);
+
+ @Select("SELECT aa.parent_pro_id xmid,(g.price_now-aa.ys)cj FROM tj_package_project g JOIN (\n" +
+ " SELECT a.parent_pro_id,SUM(a.now_price)ys FROM tb_transition a WHERE a.cus_id=#{cusIdCard} " +
+ " AND pac_id=#{pacId} AND ISNULL(a.tj_num) GROUP BY a.parent_pro_id)aa\n" +
+ "ON\n" +
+ "trim(g.pro_id)=trim(aa.parent_pro_id ) where g.pac_id=#{pacId} AND (g.price_now-aa.ys)>0;")
+ List<Map<String,Object>> addTbhuoquxiangmuchajia(@Param("pacId") String pacId, @Param("cusIdCard") String cusIdCard);
+
}
--
Gitblit v1.8.0