From cc25bc0eec2d50da39d62f9896ed4d5e66805366 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 七月 2025 18:04:05 +0800
Subject: [PATCH] zjh20250711
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 005dcb2..dd93ba0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -233,28 +233,58 @@
// List<Map<String ,String >> selectDjdInfo(@Param("tjNumber")String tjNumber);
+// @Select("SELECT \n" +
+// " ROW_NUMBER() OVER (ORDER BY d.djd_num) AS xh, " +
+// " REPLACE(d.dept_name, '闂ㄨ瘖', '') AS ksmc,\n" +
+// " ifnull(d.official_web,'') AS ksdz,\n" +
+// " e.tjxm,\n" +
+// " e.tjjg\n" +
+// "FROM sys_dept d\n" +
+// "JOIN (\n" +
+// " SELECT\n" +
+// " c.dept_id,\n" +
+// " GROUP_CONCAT(DISTINCT c1.pro_name ORDER BY c1.pro_name DESC SEPARATOR ';') AS tjxm,\n" +
+// " SUM(b.ord_price) AS tjjg\n" +
+// " FROM tb_transition b\n" +
+// " JOIN tj_project c ON c.pro_id = b.parent_pro_id\n" +
+// " JOIN tj_project c1 ON c1.pro_id = b.parent_pro_id\n" +
+// " WHERE trim(b.tj_num) = #{tjNumber} \n" +
+// " AND c.pro_parent_id = 0\n" +
+// " AND c1.pro_name NOT IN ('涓讳换鍖诲笀璇婃煡', '(tj)浣撴璐�(鐗╃悊妫�鏌�)')\n" +
+// " AND c1.pro_name NOT LIKE '%涓讳换鍖诲笀璇婃煡%'\n" +
+// " GROUP BY c.dept_id\n" +
+// ") e ON e.dept_id = d.dept_id\n" +
+// "ORDER BY d.djd_num")
@Select("SELECT \n" +
- " ROW_NUMBER() OVER (ORDER BY d.djd_num) AS xh, " +
- " REPLACE(d.dept_name, '闂ㄨ瘖', '') AS ksmc,\n" +
- " ifnull(d.official_web,'') AS ksdz,\n" +
- " e.tjxm,\n" +
- " e.tjjg\n" +
- "FROM sys_dept d\n" +
- "JOIN (\n" +
- " SELECT\n" +
- " c.dept_id,\n" +
- " GROUP_CONCAT(DISTINCT c1.pro_name ORDER BY c1.pro_name DESC SEPARATOR ';') AS tjxm,\n" +
- " SUM(b.ord_price) AS tjjg\n" +
- " FROM tb_transition b\n" +
- " JOIN tj_project c ON c.pro_id = b.parent_pro_id\n" +
- " JOIN tj_project c1 ON c1.pro_id = b.parent_pro_id\n" +
- " WHERE trim(b.tj_num) = #{tjNumber} \n" +
- " AND c.pro_parent_id = 0\n" +
- " AND c1.pro_name NOT IN ('涓讳换鍖诲笀璇婃煡', '(tj)浣撴璐�(鐗╃悊妫�鏌�)')\n" +
- " AND c1.pro_name NOT LIKE '%涓讳换鍖诲笀璇婃煡%'\n" +
- " GROUP BY c.dept_id\n" +
- ") e ON e.dept_id = d.dept_id\n" +
- "ORDER BY d.djd_num")
+ " @rownum := @rownum + 1 AS xh,\n" +
+ " t.ksmc,\n" +
+ " t.ksdz,\n" +
+ " t.tjxm,\n" +
+ " t.tjjg\n" +
+ "FROM (\n" +
+ " SELECT \n" +
+ " REPLACE(d.dept_name, '闂ㄨ瘖', '') AS ksmc,\n" +
+ " IFNULL(d.official_web, '') AS ksdz,\n" +
+ " e.tjxm,\n" +
+ " e.tjjg,\n" +
+ " d.djd_num\n" +
+ " FROM sys_dept d\n" +
+ " JOIN (\n" +
+ " SELECT\n" +
+ " c.dept_id,\n" +
+ " GROUP_CONCAT(DISTINCT c1.pro_name ORDER BY c1.pro_name DESC SEPARATOR ';') AS tjxm,\n" +
+ " SUM(b.ord_price) AS tjjg\n" +
+ " FROM tb_transition b\n" +
+ " JOIN tj_project c ON c.pro_id = b.parent_pro_id\n" +
+ " JOIN tj_project c1 ON c1.pro_id = b.parent_pro_id\n" +
+ " WHERE TRIM(b.tj_num) = #{tjNumber} \n" +
+ " AND c.pro_parent_id = 0\n" +
+ " AND c1.pro_name NOT IN ('涓讳换鍖诲笀璇婃煡', '(tj)浣撴璐�(鐗╃悊妫�鏌�)')\n" +
+ " AND c1.pro_name NOT LIKE '%涓讳换鍖诲笀璇婃煡%'\n" +
+ " GROUP BY c.dept_id\n" +
+ " ) e ON e.dept_id = d.dept_id\n" +
+ ") t, (SELECT @rownum := 0) r\n" +
+ "ORDER BY t.djd_num;\n")
List<Map<String ,Object >> selectDjdInfo(@Param("tjNumber")String tjNumber);
/**
@@ -401,4 +431,9 @@
@Select("SELECT count(*) FROM tj_order WHERE tj_number = #{tjNum}")
int getOrderCountByTjNum(String tjNum);
+
+
+
+ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鎬绘)
+ List<List<?>> getEsjCunChuGuoChengCustomerList(Map<String,Object> map);
}
--
Gitblit v1.8.0