diff --git a/code/db/pkg/Telsaler_twr_pkg.pck b/code/db/pkg/Telsaler_twr_pkg.pck
new file mode 100644
index 0000000..6f756a6
--- /dev/null
+++ b/code/db/pkg/Telsaler_twr_pkg.pck
@@ -0,0 +1,23 @@
+create or replace package Telsaler_twr_pkg is
+
+ -- Author : KANE
+ -- Created : 2023/11/26 18:19:22
+ -- Purpose : TWR系统导出报表相关的pkg
+
+ procedure 清理TWR电销坐席员工表;
+
+end Telsaler_twr_pkg;
+/
+create or replace package body Telsaler_twr_pkg is
+
+ procedure 清理TWR电销坐席员工表
+ is
+ begin
+ execute immediate 'truncate table twr_telsaler';
+ end;
+
+begin
+ -- Initialization
+ null;
+end Telsaler_twr_pkg;
+/
diff --git a/code/db/pkg/telsale_archievement_pkg.pck b/code/db/pkg/telsale_archievement_pkg.pck
index 6e16c7a..1e0a1af 100644
--- a/code/db/pkg/telsale_archievement_pkg.pck
+++ b/code/db/pkg/telsale_archievement_pkg.pck
@@ -154,20 +154,26 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_PKG IS
BEGIN
--查询坐席名称,和部门名称,验证代码
BEGIN
- SELECT zx.saler_name,
+ /*SELECT zx.saler_name,
+ bm.department_name
+ INTO l_caller_name,
+ l_department_name
+ FROM tele_saler zx,
+ tele_saler_team team,
+ idst0.bm_t bm
+ WHERE zx.saler_code = a_caller_code
+ AND zx.team_code = team.team_code
+ AND team.department_code = bm.department_code;*/
+ SELECT ry.人员姓名,
bm.department_name
INTO l_caller_name,
l_department_name
- FROM tele_saler zx,
- tele_saler_team team,
- idst0.bm_t bm
- WHERE zx.saler_code = a_caller_code
- AND zx.team_code = team.team_code
- AND team.department_code = bm.department_code;
- /* SELECT saler_name
- INTO l_caller_name
- FROM tele_saler
- WHERE saler_code = a_caller_code;*/
+ FROM twr_telsaler ry,
+ twr_telsaler_team team,
+ idst0.bm_t bm
+ WHERE ry.团队名称 = team.team_name
+ AND team.department_code = bm.department_code
+ AND ry.人员工号 = a_caller_code;
EXCEPTION
-- 如果没有查询到坐席名称,说明代码有误,抛出异常
WHEN no_data_found THEN
diff --git a/code/db/twr_甯哥敤.sql b/code/db/twr_甯哥敤.sql
new file mode 100644
index 0000000..b21bb53
--- /dev/null
+++ b/code/db/twr_甯哥敤.sql
@@ -0,0 +1,17 @@
+select *
+from twr_telsaler_team;
+
+
+
+SELECT ry.人员工号,
+ ry.人员姓名,
+ team.team_code,
+ team.team_name,
+ bm.department_code,
+ bm.department_name
+ FROM twr_telsaler ry,
+ twr_telsaler_team team,
+ idst0.bm_t bm
+ WHERE ry.团队名称 = team.team_name
+ AND team.department_code = bm.department_code
+ AND (ry.人员工号 = '何小红' OR ry.人员姓名 = '何小红');
diff --git a/code/db/寤鸿〃/TWr鍧愬腑.sql b/code/db/寤鸿〃/TWr鍧愬腑.sql
index 165ec3e..dffdd10 100644
--- a/code/db/寤鸿〃/TWr鍧愬腑.sql
+++ b/code/db/寤鸿〃/TWr鍧愬腑.sql
@@ -1,5 +1,5 @@
-drop table telsaler;
-create table telsaler
+drop table twr_telsaler;
+create table twr_telsaler
(
人员姓名 varchar2(40),
人员工号 varchar2(40),
diff --git a/code/db/寤鸿〃/TWr鍧愬腑鍥㈤槦.sql b/code/db/寤鸿〃/TWr鍧愬腑鍥㈤槦.sql
new file mode 100644
index 0000000..394df35
--- /dev/null
+++ b/code/db/寤鸿〃/TWr鍧愬腑鍥㈤槦.sql
@@ -0,0 +1,7 @@
+drop table twr_telsaler_team;
+create table twr_telsaler_team
+(
+ team_name varchar2(40) not null,
+ team_code varchar2(20),
+ department_code varchar2(6) not null
+);
diff --git a/code/鍚庣/desktop_archievement_backend/pom.xml b/code/鍚庣/desktop_archievement_backend/pom.xml
index 9d40aa5..7c77797 100644
--- a/code/鍚庣/desktop_archievement_backend/pom.xml
+++ b/code/鍚庣/desktop_archievement_backend/pom.xml
@@ -13,7 +13,7 @@
UTF-8
17
17
- 5.3.24
+ 5.3.30
2.20.0
diff --git a/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/TeleSalerInfo.java b/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/TeleSalerInfo.java
index 0c3e071..bbbbd86 100644
--- a/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/TeleSalerInfo.java
+++ b/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/TeleSalerInfo.java
@@ -60,22 +60,32 @@ public final class TeleSalerInfo
PreparedStatement statement = null;
ResultSet result = null;
- String sql = """
- SELECT s.saler_code,
- s.saler_name,
- t.team_code,
- t.team,
- bm.department_code,
- bm.department_name
- FROM tele_saler s,
- tele_saler_team t,
- idst0.bm_t bm
- WHERE s.team_code = t.team_code
- AND t.department_code = bm.department_code
- AND (s.saler_code = ? or s.saler_name = ?) """;
+ // String sql = """
+ // SELECT s.saler_code,
+ // s.saler_name,
+ // t.team_code,
+ // t.team,
+ // bm.department_code,
+ // bm.department_name
+ // FROM tele_saler s,
+ // tele_saler_team t,
+ // idst0.bm_t bm
+ // WHERE s.team_code = t.team_code
+ // AND t.department_code = bm.department_code
+ // AND (s.saler_code = ? or s.saler_name = ?) """;
String sql2 = """
-
- """;
+ select ry.浜哄憳宸ュ彿 ,
+ ry.浜哄憳濮撳悕,
+ team.team_code,
+ team.team_name,
+ bm.department_code,
+ bm.department_name
+ from twr_telsaler ry,
+ twr_telsaler_team team,
+ idst0.bm_t bm
+ where trim(ry.鍥㈤槦鍚嶇О) = trim(team.team_name)
+ and team.department_code = bm.department_code
+ AND (ry.浜哄憳宸ュ彿 = ? or ry.浜哄憳濮撳悕 = ?)""";
// String sql = "SELECT DISTINCT s.saler_code, s.saler_name, \n"
// + " t.team_code, t.team, \n"
// + " bm.department_code, bm.department_name \n"
@@ -87,7 +97,7 @@ public final class TeleSalerInfo
{
Class.forName( "oracle.jdbc.driver.OracleDriver" );
connection = DriverManager.getConnection( jdbcURL, userName, password );
- statement = connection.prepareStatement( sql );
+ statement = connection.prepareStatement( sql2 );
statement.setString( 1, telsaler );
statement.setString( 2, telsaler );
diff --git a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/TWrTelsalerMapper.xml b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/TWrTelsalerMapper.xml
index 2797af3..7d5fe47 100644
--- a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/TWrTelsalerMapper.xml
+++ b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/TWrTelsalerMapper.xml
@@ -50,31 +50,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/鏁版嵁/鍧愬腑/TWr涓氬姟鍛樹汉鍔涙煡璇 (1).xlsx b/鏁版嵁/鍧愬腑/TWr涓氬姟鍛樹汉鍔涙煡璇 (1).xlsx
index 18ff823..26b2dd5 100644
Binary files a/鏁版嵁/鍧愬腑/TWr涓氬姟鍛樹汉鍔涙煡璇 (1).xlsx and b/鏁版嵁/鍧愬腑/TWr涓氬姟鍛樹汉鍔涙煡璇 (1).xlsx differ
diff --git a/鏁版嵁/鍧愬腑/TWr鍥㈤槦.xlsx b/鏁版嵁/鍧愬腑/TWr鍥㈤槦.xlsx
index 781031a..15a808d 100644
Binary files a/鏁版嵁/鍧愬腑/TWr鍥㈤槦.xlsx and b/鏁版嵁/鍧愬腑/TWr鍥㈤槦.xlsx differ