diff --git a/code/db/pkg/telsale_archievement_dev_pkg.pck b/code/db/pkg/telsale_archievement_dev_pkg.pck index 007a828..5cf6771 100644 --- a/code/db/pkg/telsale_archievement_dev_pkg.pck +++ b/code/db/pkg/telsale_archievement_dev_pkg.pck @@ -112,7 +112,7 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_DEV_PKG IS 2) INTO A_RENEWAL_RATE, A_RENEWAL_RATE_TARGET - FROM BI机构当月个车续保率跟踪表 T + FROM "BI机构续保率跟踪表-24年" T WHERE T.责任部门 = L_DEPARTMENT_NAME; --解决round导致小数缺0的问题 @@ -229,7 +229,7 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_DEV_PKG IS 2) INTO L_ROWNUM, A_RENEWAL_RATE - FROM BI电销坐席续保率跟踪表 T + FROM "BI电销坐席续保率跟踪表-24年" T WHERE T.责任人 = L_CALLER_NAME AND ROWNUM = 1; EXCEPTION diff --git a/code/db/pkg/telsale_archievement_pkg.pck b/code/db/pkg/telsale_archievement_pkg.pck index 4c7eb57..a585372 100644 --- a/code/db/pkg/telsale_archievement_pkg.pck +++ b/code/db/pkg/telsale_archievement_pkg.pck @@ -86,7 +86,7 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_PKG IS 2) INTO A_ATTACHING_RATE, A_ATTACHING_RATE_TARGET - FROM DESKTOP_ARCHIEVEMENT_ADMIN.BI机构渗透率跟踪表 DEPT + FROM BI机构渗透率跟踪表 DEPT WHERE DEPT.部门 = L_DEPARTMENT_NAME; --解决round导致小数缺0的问题 @@ -112,7 +112,7 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_PKG IS 2) INTO A_RENEWAL_RATE, A_RENEWAL_RATE_TARGET - FROM BI机构当月个车续保率跟踪表 T + FROM "BI机构续保率跟踪表-24年" T WHERE T.责任部门 = L_DEPARTMENT_NAME; --解决round导致小数缺0的问题 @@ -229,7 +229,7 @@ CREATE OR REPLACE PACKAGE BODY TELSALE_ARCHIEVEMENT_PKG IS 2) INTO L_ROWNUM, A_RENEWAL_RATE - FROM BI电销坐席续保率跟踪表 T + FROM "BI电销坐席续保率跟踪表-24年" T WHERE T.责任人 = L_CALLER_NAME AND ROWNUM = 1; EXCEPTION diff --git a/code/db/pkg/telsale_bi_utils.pck b/code/db/pkg/telsale_bi_utils.pck index c4381bb..8e2a9fc 100644 --- a/code/db/pkg/telsale_bi_utils.pck +++ b/code/db/pkg/telsale_bi_utils.pck @@ -1,4 +1,4 @@ -CREATE OR REPLACE PACKAGE telsale_bi_utils IS +CREATE OR REPLACE PACKAGE TELSALE_BI_UTILS IS -- Author : WANGWEI-202 -- Created : 2023/10/12 15:31:13 @@ -12,9 +12,9 @@ CREATE OR REPLACE PACKAGE telsale_bi_utils IS PROCEDURE 清理BI部门续保率跟踪表; -END telsale_bi_utils; +END TELSALE_BI_UTILS; / -CREATE OR REPLACE PACKAGE BODY telsale_bi_utils IS +CREATE OR REPLACE PACKAGE BODY TELSALE_BI_UTILS IS PROCEDURE 清理BI电销坐席车非渗透率跟踪表 IS BEGIN @@ -24,6 +24,7 @@ CREATE OR REPLACE PACKAGE BODY telsale_bi_utils IS PROCEDURE 清理BI电销坐席续保率跟踪表 IS BEGIN EXECUTE IMMEDIATE 'truncate table BI电销坐席续保率跟踪表'; + --EXECUTE IMMEDIATE 'truncate table BI电销坐席续保率跟踪表-24年'; END; PROCEDURE 清理BI部门渗透率跟踪表 IS @@ -34,10 +35,11 @@ CREATE OR REPLACE PACKAGE BODY telsale_bi_utils IS PROCEDURE 清理BI部门续保率跟踪表 IS BEGIN EXECUTE IMMEDIATE 'truncate table BI机构当月个车续保率跟踪表'; + --EXECUTE IMMEDIATE 'truncate table BI机构续保率跟踪表-24年'; END; BEGIN -- Initialization NULL; -END telsale_bi_utils; +END TELSALE_BI_UTILS; / diff --git a/code/db/pkg/telsale_bi_utils_dev.pck b/code/db/pkg/telsale_bi_utils_dev.pck new file mode 100644 index 0000000..bcb0257 --- /dev/null +++ b/code/db/pkg/telsale_bi_utils_dev.pck @@ -0,0 +1,45 @@ +CREATE OR REPLACE PACKAGE TELSALE_BI_UTILS_DEV IS + + -- Author : WANGWEI-202 + -- Created : 2023/10/12 15:31:13 + -- Purpose : bi数据报表相关的工具 + + PROCEDURE 清理BI电销坐席车非渗透率跟踪表; + + PROCEDURE 清理BI电销坐席续保率跟踪表; + + PROCEDURE 清理BI部门渗透率跟踪表; + + PROCEDURE 清理BI部门续保率跟踪表; + +END TELSALE_BI_UTILS_DEV; +/ +CREATE OR REPLACE PACKAGE BODY TELSALE_BI_UTILS_DEV IS + + PROCEDURE 清理BI电销坐席车非渗透率跟踪表 IS + BEGIN + EXECUTE IMMEDIATE 'truncate table BI电销坐席车非渗透率跟踪表'; + END; + + PROCEDURE 清理BI电销坐席续保率跟踪表 IS + BEGIN + --EXECUTE IMMEDIATE 'truncate table BI电销坐席续保率跟踪表'; + EXECUTE IMMEDIATE 'truncate table "BI电销坐席续保率跟踪表-24年"'; + END; + + PROCEDURE 清理BI部门渗透率跟踪表 IS + BEGIN + EXECUTE IMMEDIATE 'truncate table BI机构渗透率跟踪表'; + END; + + PROCEDURE 清理BI部门续保率跟踪表 IS + BEGIN + --EXECUTE IMMEDIATE 'truncate table BI机构当月个车续保率跟踪表'; + EXECUTE IMMEDIATE 'truncate table "BI机构续保率跟踪表-24年"'; + END; + +BEGIN + -- Initialization + NULL; +END TELSALE_BI_UTILS_DEV; +/ diff --git a/code/db/甯哥敤璇彞.sql b/code/db/甯哥敤璇彞.sql index fe5903f..fca5e89 100644 --- a/code/db/甯哥敤璇彞.sql +++ b/code/db/甯哥敤璇彞.sql @@ -1,30 +1,30 @@ SELECT * - FROM reward_gainers + FROM REWARD_GAINERS FOR UPDATE; -SELECT b.reward_name, - a.* - FROM reward_gainers a, - reward_projects b - WHERE a.reward_index = b.reward_index; +SELECT B.REWARD_NAME, + A.* + FROM REWARD_GAINERS A, + REWARD_PROJECTS B + WHERE A.REWARD_INDEX = B.REWARD_INDEX; --坐席工号 -SELECT DISTINCT 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 = '61136'; +SELECT DISTINCT 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 = '61136'; SELECT * - FROM tele_saler_team t - WHERE t.team_code = '107077' + FROM TELE_SALER_TEAM T + WHERE T.TEAM_CODE = '107077' SELECT * FROM 坐席车非每日保费 @@ -35,7 +35,7 @@ SELECT * SELECT 部门, SUM(已续保累计) 已续保, SUM(到期数) 到期保单, - round((SUM(已续保累计) / SUM(到期数)) * 100, + ROUND((SUM(已续保累计) / SUM(到期数)) * 100, 0) || '%' 续保率 FROM 坐席续保统计 GROUP BY 部门; @@ -46,7 +46,7 @@ SELECT 坐席名称, SUM(车险个人客户保费), SUM(车非融合保费), - round(SUM(车非融合保费) / SUM(车险个人客户保费) * 100, + ROUND(SUM(车非融合保费) / SUM(车险个人客户保费) * 100, 2) 车非渗透率 FROM 坐席车非每日保费 GROUP BY 月份, @@ -57,7 +57,7 @@ HAVING 车非渗透率 DESC; SELECT 坐席名称, - round(SUM(车非融合保费) / SUM(车险个人客户保费) * 100, + ROUND(SUM(车非融合保费) / SUM(车险个人客户保费) * 100, 2) 车非渗透率 FROM 坐席车非每日保费 WHERE 部门代码 = 'QDI' @@ -68,37 +68,37 @@ SELECT --续保率 SELECT 坐席名称, - round(nvl(SUM(已续保累计) / SUM(到期数) * 100, + ROUND(NVL(SUM(已续保累计) / SUM(到期数) * 100, 0), 2) 续保率 - FROM 坐席续保统计 xb - WHERE xb.部门 = '续保业务部' + FROM 坐席续保统计 XB + WHERE XB.部门 = '续保业务部' GROUP BY 坐席名称 ORDER BY 坐席名称 DESC; ------------------------------------- -SELECT zx.saler_name, - bm.department_name - FROM tele_saler zx, - tele_saler_team team, - idst0.bm_t bm - WHERE zx.saler_name = '张楚沂' - AND zx.team_code = team.team_code - AND team.department_code = bm.department_code; +SELECT ZX.SALER_NAME, + BM.DEPARTMENT_NAME + FROM TELE_SALER ZX, + TELE_SALER_TEAM TEAM, + IDST0.BM_T BM + WHERE ZX.SALER_NAME = '张楚沂' + AND ZX.TEAM_CODE = TEAM.TEAM_CODE + AND TEAM.DEPARTMENT_CODE = BM.DEPARTMENT_CODE; ---------------------------------------- /* truncate table BI机构渗透率跟踪表; */ SELECT * - FROM BI电销坐席车非渗透率跟踪表 t - WHERE t.经办 = '杨苗'; + FROM BI电销坐席车非渗透率跟踪表 T + WHERE T.经办 = '杨苗'; SELECT * - FROM BI电销坐席续保率跟踪表 + FROM "BI电销坐席续保率跟踪表-24年" WHERE 责任人 = '杨苗'; SELECT * FROM BI机构渗透率跟踪表; SELECT * - FROM BI机构当月个车续保率跟踪表; + FROM "BI机构续保率跟踪表-24年"; diff --git a/code/web/task_schedule/package-lock.json b/code/web/task_schedule/package-lock.json index 6e18e5d..913db80 100644 --- a/code/web/task_schedule/package-lock.json +++ b/code/web/task_schedule/package-lock.json @@ -14,7 +14,7 @@ "mitt": "^3.0.1", "moment": "^2.30.1", "sass-loader": "^13.3.3", - "vue": "^3.4.6", + "vue": "^3.4.7", "vue-router": "^4.2.5", "vuex": "^4.1.0" }, @@ -22,7 +22,7 @@ "@babel/eslint-parser": "^7.23.3", "@rushstack/eslint-patch": "^1.6.1", "@typescript-eslint/eslint-plugin": "^6.18.1", - "@vitejs/plugin-vue": "^5.0.2", + "@vitejs/plugin-vue": "^5.0.3", "@vue/cli-plugin-eslint": "^5.0.8", "@vue/eslint-config-typescript": "^12.0.0", "axios": "^1.6.5", @@ -32,7 +32,7 @@ "eslint-plugin-vue": "^9.19.2", "node-sass": "^9.0.0", "sass": "^1.69.7", - "style-loader": "^3.3.3", + "style-loader": "^3.3.4", "ts-node": "^10.9.2", "vue-eslint-parser": "^9.4.0" } @@ -2284,9 +2284,9 @@ } }, "node_modules/@vitejs/plugin-vue": { - "version": "5.0.2", - "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.0.2.tgz", - "integrity": "sha512-kEjJHrLb5ePBvjD0SPZwJlw1QTRcjjCA9sB5VyfonoXVBxTS7TMnqL6EkLt1Eu61RDeiuZ/WN9Hf6PxXhPI2uA==", + "version": "5.0.3", + "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.0.3.tgz", + "integrity": "sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==", "dev": true, "engines": { "node": "^18.0.0 || >=20.0.0" @@ -2561,12 +2561,12 @@ "dev": true }, "node_modules/@vue/compiler-core": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.6.tgz", - "integrity": "sha512-9SmkpHsXqhHGMIOp4cawUqp0AxLN2fJJfxh3sR2RaouVx/Y/ww5ts3dfpD9SCvD0n8cdO/Xw+kWEpa6EkH/vTQ==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.7.tgz", + "integrity": "sha512-hhCaE3pTMrlIJK7M/o3Xf7HV8+JoNTGOQ/coWS+V+pH6QFFyqtoXqQzpqsNp7UK17xYKua/MBiKj4e1vgZOBYw==", "dependencies": { "@babel/parser": "^7.23.6", - "@vue/shared": "3.4.6", + "@vue/shared": "3.4.7", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" @@ -2581,24 +2581,24 @@ } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.6.tgz", - "integrity": "sha512-i39ZuyHPzPb0v5yXZbvODGwLr+T7lS1rYSjMd1oCTa14aDP80kYpWXrWPF1JVD4QJJNyLgFnJ2hxvFLM7dy9NQ==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.7.tgz", + "integrity": "sha512-qDKBAIurCTub4n/6jDYkXwgsFuriqqmmLrIq1N2QDfYJA/mwiwvxi09OGn28g+uDdERX9NaKDLji0oTjE3sScg==", "dependencies": { - "@vue/compiler-core": "3.4.6", - "@vue/shared": "3.4.6" + "@vue/compiler-core": "3.4.7", + "@vue/shared": "3.4.7" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.6.tgz", - "integrity": "sha512-kTFOiyMtuetFqi5yEPA4hR6FTD36zKKY3qaBonxGb4pgj0yK1eACqH+iycTAsEqr2u4cOhcGkx3Yjecpgh6FTQ==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.7.tgz", + "integrity": "sha512-Gec6CLkReVswDYjQFq79O5rktri4R7TsD/VPCiUoJw40JhNNxaNJJa8mrQrWoJluW4ETy6QN0NUyC/JO77OCOw==", "dependencies": { "@babel/parser": "^7.23.6", - "@vue/compiler-core": "3.4.6", - "@vue/compiler-dom": "3.4.6", - "@vue/compiler-ssr": "3.4.6", - "@vue/shared": "3.4.6", + "@vue/compiler-core": "3.4.7", + "@vue/compiler-dom": "3.4.7", + "@vue/compiler-ssr": "3.4.7", + "@vue/shared": "3.4.7", "estree-walker": "^2.0.2", "magic-string": "^0.30.5", "postcss": "^8.4.32", @@ -2606,12 +2606,12 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.6.tgz", - "integrity": "sha512-XqeojjDitjMLyOogDePNSxw9XL4FAXchO9oOfqdzLVEtYES5j+AEilPJyP0KhQPfGecY2mJ3Y7/e6kkiJQLKvg==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.7.tgz", + "integrity": "sha512-PvYeSOvnCkST5mGS0TLwEn5w+4GavtEn6adcq8AspbHaIr+mId5hp7cG3ASy3iy8b+LuXEG2/QaV/nj5BQ/Aww==", "dependencies": { - "@vue/compiler-dom": "3.4.6", - "@vue/shared": "3.4.6" + "@vue/compiler-dom": "3.4.7", + "@vue/shared": "3.4.7" } }, "node_modules/@vue/component-compiler-utils": { @@ -2710,48 +2710,48 @@ } }, "node_modules/@vue/reactivity": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.6.tgz", - "integrity": "sha512-/VuOxdWDyAeKFHjOuSKEtH9jEVPRgsXxu84utBP1SiXFcFRx2prwiC9cSR8hKOfj5nBwhLXYb6XEU69mLpuk0w==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.7.tgz", + "integrity": "sha512-F539DO0ogH0+L8F9Pnw7cjqibcmSOh5UTk16u5f4MKQ8fraqepI9zdh+sozPX6VmEHOcjo8qw3Or9ZcFFw4SZA==", "dependencies": { - "@vue/shared": "3.4.6" + "@vue/shared": "3.4.7" } }, "node_modules/@vue/runtime-core": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.6.tgz", - "integrity": "sha512-XDOx8iiNmP66p+goUHT5XL1AnV8406VVFQARbylqmSCBZEtxchfu2ZoQk7U07ze8G/E0/BtX/C5o29zB1W4o5A==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.7.tgz", + "integrity": "sha512-QMMsWRQaD3BpGyjjChthpl4Mji4Fjx1qfdufsXlDkKU3HV+hWNor2z+29F+E1MmVcP0ZfRZUfqYgtsQoL7IGwQ==", "dependencies": { - "@vue/reactivity": "3.4.6", - "@vue/shared": "3.4.6" + "@vue/reactivity": "3.4.7", + "@vue/shared": "3.4.7" } }, "node_modules/@vue/runtime-dom": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.6.tgz", - "integrity": "sha512-8bdQR5CLfzClGvAOfbbCF8adE9oko0pRfe+dj297i0JCdCJ8AuyUMsXkt6vGPcRPqIKX4Z8f/bDPrwl+c7e4Wg==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.7.tgz", + "integrity": "sha512-XwegyUY1rw8zxsX1Z36vwYcqo+uOgih5ti7y9vx+pPFhNdSQmN4LqK2RmSeAJG1oKV8NqSUmjpv92f/x6h0SeQ==", "dependencies": { - "@vue/runtime-core": "3.4.6", - "@vue/shared": "3.4.6", + "@vue/runtime-core": "3.4.7", + "@vue/shared": "3.4.7", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.6.tgz", - "integrity": "sha512-0LS+GXf3M93KloaK/S0ZPq5PnKERgPAV5iNCCpjyBLhAQGGEeqfJojs3yXOAMQLSvXi9FLYDHzDEOLWoLaYbTQ==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.7.tgz", + "integrity": "sha512-3bWnYLEkLLhkDWqvNk7IvbQD4UcxvFKxELBiOO2iG3m6AniFIsBWfHOO5tLVQnjdWkODu4rq0GipmfEenVAK5Q==", "dependencies": { - "@vue/compiler-ssr": "3.4.6", - "@vue/shared": "3.4.6" + "@vue/compiler-ssr": "3.4.7", + "@vue/shared": "3.4.7" }, "peerDependencies": { - "vue": "3.4.6" + "vue": "3.4.7" } }, "node_modules/@vue/shared": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.6.tgz", - "integrity": "sha512-O16vewA05D0IwfG2N/OFEuVeb17pieaI32mmYXp36V8lp+/pI1YV04rRL9Eyjndj3xQO5SNjAxTh6ul4IlBa3A==" + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.7.tgz", + "integrity": "sha512-G+i4glX1dMJk88sbJEcQEGWRQnVm9eIY7CcQbO5dpdsD9SF8jka3Mr5OqZYGjczGN1+D6EUwdu6phcmcx9iuPA==" }, "node_modules/@vue/vue-loader-v15": { "name": "vue-loader", @@ -13889,9 +13889,9 @@ } }, "node_modules/style-loader": { - "version": "3.3.3", - "resolved": "https://registry.npmmirror.com/style-loader/-/style-loader-3.3.3.tgz", - "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==", + "version": "3.3.4", + "resolved": "https://registry.npmmirror.com/style-loader/-/style-loader-3.3.4.tgz", + "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==", "dev": true, "engines": { "node": ">= 12.13.0" @@ -14665,15 +14665,15 @@ } }, "node_modules/vue": { - "version": "3.4.6", - "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.6.tgz", - "integrity": "sha512-gAzw5oP0/h34/yq1LjLNpn4wrCKYMuWp2jbs/JirFiZAFWYhd9jTkXp4wIi5ApgMJrMgD6YFyyXwKsqFYR31IQ==", + "version": "3.4.7", + "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.7.tgz", + "integrity": "sha512-4urmkWpudekq0CPNMO7p6mBGa9qmTXwJMO2r6CT4EzIJVG7WoSReiysiNb7OSi/WI113oX0Srn9Rz1k/DCXKFQ==", "dependencies": { - "@vue/compiler-dom": "3.4.6", - "@vue/compiler-sfc": "3.4.6", - "@vue/runtime-dom": "3.4.6", - "@vue/server-renderer": "3.4.6", - "@vue/shared": "3.4.6" + "@vue/compiler-dom": "3.4.7", + "@vue/compiler-sfc": "3.4.7", + "@vue/runtime-dom": "3.4.7", + "@vue/server-renderer": "3.4.7", + "@vue/shared": "3.4.7" }, "peerDependencies": { "typescript": "*" diff --git a/code/web/task_schedule/package.json b/code/web/task_schedule/package.json index 7b83d7c..d3d7782 100644 --- a/code/web/task_schedule/package.json +++ b/code/web/task_schedule/package.json @@ -15,7 +15,7 @@ "mitt": "^3.0.1", "moment": "^2.30.1", "sass-loader": "^13.3.3", - "vue": "^3.4.6", + "vue": "^3.4.7", "vue-router": "^4.2.5", "vuex": "^4.1.0" }, @@ -23,7 +23,7 @@ "@babel/eslint-parser": "^7.23.3", "@rushstack/eslint-patch": "^1.6.1", "@typescript-eslint/eslint-plugin": "^6.18.1", - "@vitejs/plugin-vue": "^5.0.2", + "@vitejs/plugin-vue": "^5.0.3", "@vue/cli-plugin-eslint": "^5.0.8", "@vue/eslint-config-typescript": "^12.0.0", "axios": "^1.6.5", @@ -33,7 +33,7 @@ "eslint-plugin-vue": "^9.19.2", "node-sass": "^9.0.0", "sass": "^1.69.7", - "style-loader": "^3.3.3", + "style-loader": "^3.3.4", "ts-node": "^10.9.2", "vue-eslint-parser": "^9.4.0" } diff --git a/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/BIDepartmentRenewalRateRecord.java b/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/BIDepartmentRenewalRateRecord.java index f45b44f..9c463aa 100644 --- a/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/BIDepartmentRenewalRateRecord.java +++ b/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/mybatis/pojo/BIDepartmentRenewalRateRecord.java @@ -19,14 +19,14 @@ public class BIDepartmentRenewalRateRecord private double 涓溅缁繚鐜囧叏鏈; private double 鐜瘮鏄ㄦ棩; private double 鐜瘮涓婃湀; - private int 骞冲潎鎻愬墠绛惧崟澶╂暟; - private double 鐜瘮; + // private int 骞冲潎鎻愬墠绛惧崟澶╂暟; + // private double 鐜瘮; public BIDepartmentRenewalRateRecord() {} public BIDepartmentRenewalRateRecord( String 璐ｄ换閮ㄩ棬, double 鏈烘瀯鐩爣鍊, int 鍒版湡鏁板叏鏈, double 搴忔椂鍒版湡鏁板崰姣, - double 涓溅缁繚鐜囧簭鏃, double 涓溅缁繚鐜囧叏鏈, double 鐜瘮鏄ㄦ棩, double 鐜瘮涓婃湀, int 骞冲潎鎻愬墠绛惧崟澶╂暟, double 鐜瘮 ) + double 涓溅缁繚鐜囧簭鏃, double 涓溅缁繚鐜囧叏鏈, double 鐜瘮鏄ㄦ棩, double 鐜瘮涓婃湀 ) { this.璐ｄ换閮ㄩ棬 = 璐ｄ换閮ㄩ棬; this.鏈烘瀯鐩爣鍊 = 鏈烘瀯鐩爣鍊; @@ -36,8 +36,8 @@ public class BIDepartmentRenewalRateRecord this.涓溅缁繚鐜囧叏鏈 = 涓溅缁繚鐜囧叏鏈; this.鐜瘮鏄ㄦ棩 = 鐜瘮鏄ㄦ棩; this.鐜瘮涓婃湀 = 鐜瘮涓婃湀; - this.骞冲潎鎻愬墠绛惧崟澶╂暟 = 骞冲潎鎻愬墠绛惧崟澶╂暟; - this.鐜瘮 = 鐜瘮; + // this.骞冲潎鎻愬墠绛惧崟澶╂暟 = 骞冲潎鎻愬墠绛惧崟澶╂暟; + // this.鐜瘮 = 鐜瘮; } public String get璐ｄ换閮ㄩ棬() @@ -120,25 +120,6 @@ public class BIDepartmentRenewalRateRecord this.鐜瘮涓婃湀 = 鐜瘮涓婃湀; } - public int get骞冲潎鎻愬墠绛惧崟澶╂暟() - { - return 骞冲潎鎻愬墠绛惧崟澶╂暟; - } - - public void set骞冲潎鎻愬墠绛惧崟澶╂暟( int 骞冲潎鎻愬墠绛惧崟澶╂暟 ) - { - this.骞冲潎鎻愬墠绛惧崟澶╂暟 = 骞冲潎鎻愬墠绛惧崟澶╂暟; - } - - public double get鐜瘮() - { - return 鐜瘮; - } - - public void set鐜瘮( double 鐜瘮 ) - { - this.鐜瘮 = 鐜瘮; - } @Override public int hashCode() @@ -160,9 +141,6 @@ public class BIDepartmentRenewalRateRecord result = prime * result + (int) (temp ^ (temp >>> 32)); temp = Double.doubleToLongBits( 鐜瘮涓婃湀 ); result = prime * result + (int) (temp ^ (temp >>> 32)); - result = prime * result + 骞冲潎鎻愬墠绛惧崟澶╂暟; - temp = Double.doubleToLongBits( 鐜瘮 ); - result = prime * result + (int) (temp ^ (temp >>> 32)); return result; } @@ -197,10 +175,6 @@ public class BIDepartmentRenewalRateRecord return false; if ( Double.doubleToLongBits( 鐜瘮涓婃湀 ) != Double.doubleToLongBits( other.鐜瘮涓婃湀 ) ) return false; - if ( 骞冲潎鎻愬墠绛惧崟澶╂暟 != other.骞冲潎鎻愬墠绛惧崟澶╂暟 ) - return false; - if ( Double.doubleToLongBits( 鐜瘮 ) != Double.doubleToLongBits( other.鐜瘮 ) ) - return false; return true; } @@ -209,7 +183,6 @@ public class BIDepartmentRenewalRateRecord { return "BIDepartmentRenewalRateRecord [璐ｄ换閮ㄩ棬=" + 璐ｄ换閮ㄩ棬 + ", 鏈烘瀯鐩爣鍊=" + 鏈烘瀯鐩爣鍊 + ", 鍒版湡鏁板叏鏈=" + 鍒版湡鏁板叏鏈 + ", 搴忔椂鍒版湡鏁板崰姣=" + 搴忔椂鍒版湡鏁板崰姣 + ", 涓溅缁繚鐜囧簭鏃=" + 涓溅缁繚鐜囧簭鏃 + ", 涓溅缁繚鐜囧叏鏈=" + 涓溅缁繚鐜囧叏鏈 - + ", 鐜瘮鏄ㄦ棩=" + 鐜瘮鏄ㄦ棩 + ", 鐜瘮涓婃湀=" + 鐜瘮涓婃湀 + ", 骞冲潎鎻愬墠绛惧崟澶╂暟=" + 骞冲潎鎻愬墠绛惧崟澶╂暟 + ", 鐜瘮=" + 鐜瘮 - + "]"; + + ", 鐜瘮鏄ㄦ棩=" + 鐜瘮鏄ㄦ棩 + ", 鐜瘮涓婃湀=" + 鐜瘮涓婃湀 + "]"; } } diff --git a/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/data/ImportBIExcelData.java b/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/data/ImportBIExcelData.java index 866965d..329d84e 100644 --- a/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/data/ImportBIExcelData.java +++ b/code/鍚庣/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/data/ImportBIExcelData.java @@ -34,18 +34,21 @@ public final class ImportBIExcelData { private static Logger logger = LoggerFactory.getLogger( ImportBIExcelData.class ); + // 鍧愬腑 娓楅忕巼 private static String[] TelsalerAttachingRateExcelTitle = new String[] { "閮ㄩ棬", "缁忓姙", "杞﹂櫓淇濊垂(涓)", "杞﹂櫓淇濊垂鍗犳瘮", "闈炶溅淇濊垂(涓)", "褰撴湀淇濊垂娓楅忕巼", "淇濊垂娓楅忕巼鐜瘮涓婃湀", "褰撴湀瀹㈡埛娓楅忕巼", "瀹㈡埛娓楅忕巼鐜瘮涓婃湀", "褰撴湀杞﹂潪瀹㈠潎淇濊垂", "瀹㈠潎淇濊垂鐜瘮涓婃湀"}; + // 鍧愬腑 缁繚鐜 private static String[] TelSalerRenewalRateExcelTitle = new String[] { "璐ｄ换閮ㄩ棬", "璐ｄ换浜", "鏈烘瀯鐩爣鍊1(%)", "鍒版湡鏁-鍏ㄦ湀", "搴忔椂鍒版湡鏁板崰姣(%)", "涓溅缁繚鐜囷紙搴忔椂锛(%)", "涓溅缁繚鐜囷紙鍏ㄦ湀锛(%)", "鐜瘮鏄ㄦ棩(%)", - "鐜瘮涓婃湀(%)", "骞冲潎鎻愬墠绛惧崟澶╂暟", "鐜瘮"}; + "鐜瘮涓婃湀(%)", "搴忔椂-閮ㄩ棬鍐", "鍏ㄦ湀-閮ㄩ棬鍐"}; + // 鏈烘瀯 娓楅忕巼 private static String[] DepartmentAttachingRateExcelTitle = new String[] { "閮ㄩ棬", "鐩爣鍊-鏈烘瀯", "鐩爣宸窛", "杞﹂櫓淇濊垂(涓)", "杞﹂櫓淇濊垂鍗犳瘮", "闈炶溅淇濊垂(涓)", "褰撴湀淇濊垂娓楅忕巼", "淇濊垂娓楅忕巼鐜瘮涓婃湀", "杞﹂櫓瀹㈡埛鏁", "褰撴湀瀹㈡埛娓楅忕巼", "瀹㈡埛娓楅忕巼鐜瘮涓婃湀", "褰撴湀杞﹂潪瀹㈠潎淇濊垂", "瀹㈠潎淇濊垂鐜瘮涓婃湀"}; - + // 鏈烘瀯 缁繚鐜 private static String[] DepartmentRenewalRateExcelTitle = new String[] { "璐ｄ换閮ㄩ棬", "鏈烘瀯鐩爣鍊1(%)", "鍒版湡鏁-鍏ㄦ湀", "搴忔椂鍒版湡鏁板崰姣(%)", "涓溅缁繚鐜囷紙搴忔椂锛(%)", "涓溅缁繚鐜囷紙鍏ㄦ湀锛(%)", "鐜瘮鏄ㄦ棩(%)", "鐜瘮涓婃湀(%)", "搴忔椂-閮ㄩ棬鍐", "鍏ㄦ湀-閮ㄩ棬鍐",}; @@ -499,11 +502,11 @@ public final class ImportBIExcelData double 涓溅缁繚鐜囧叏鏈 = MyPOIUtils.getNumbericCellValue( row, 5 ) * 100; double 鐜瘮鏄ㄦ棩 = MyPOIUtils.getNumbericCellValue( row, 6 ) * 100; double 鐜瘮涓婃湀 = MyPOIUtils.getNumbericCellValue( row, 7 ) * 100; - int 骞冲潎鎻愬墠绛惧崟澶╂暟 = (int) MyPOIUtils.getNumbericCellValue( row, 8 ); - double 鐜瘮 = MyPOIUtils.getNumbericCellValue( row, 9 ) * 100; + // int 骞冲潎鎻愬墠绛惧崟澶╂暟 = (int) MyPOIUtils.getNumbericCellValue( row, 8 ); + // double 鐜瘮 = MyPOIUtils.getNumbericCellValue( row, 9 ) * 100; BIDepartmentRenewalRateRecord record = new BIDepartmentRenewalRateRecord( 璐ｄ换閮ㄩ棬, - 鏈烘瀯鐩爣鍊, 鍒版湡鏁板叏鏈, 搴忔椂鍒版湡鏁板崰姣, 涓溅缁繚鐜囧簭鏃, 涓溅缁繚鐜囧叏鏈, 鐜瘮鏄ㄦ棩, 鐜瘮涓婃湀, 骞冲潎鎻愬墠绛惧崟澶╂暟, 鐜瘮 ); + 鏈烘瀯鐩爣鍊, 鍒版湡鏁板叏鏈, 搴忔椂鍒版湡鏁板崰姣, 涓溅缁繚鐜囧簭鏃, 涓溅缁繚鐜囧叏鏈, 鐜瘮鏄ㄦ棩, 鐜瘮涓婃湀 ); records.add( record ); } diff --git a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/ImportBIArchievementDataMapper.xml b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/ImportBIArchievementDataMapper.xml index 530fde0..29caed3 100644 --- a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/ImportBIArchievementDataMapper.xml +++ b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/ImportBIArchievementDataMapper.xml @@ -29,24 +29,23 @@ - insert into BI鏈烘瀯褰撴湀涓溅缁繚鐜囪窡韪〃( "璐ｄ换閮ㄩ棬","鏈烘瀯鐩爣鍊1(%)","鍒版湡鏁-鍏ㄦ湀" ,"搴忔椂鍒版湡鏁板崰姣(%)","涓溅缁繚鐜囷紙搴忔椂锛(%)", - "涓溅缁繚鐜囷紙鍏ㄦ湀锛(%)","鐜瘮鏄ㄦ棩(%)","鐜瘮涓婃湀(%)","骞冲潎鎻愬墠绛惧崟澶╂暟","鐜瘮") + insert into "BI鏈烘瀯缁繚鐜囪窡韪〃-24骞"( "璐ｄ换閮ㄩ棬","鏈烘瀯鐩爣鍊1(%)","鍒版湡鏁-鍏ㄦ湀" ,"搴忔椂鍒版湡鏁板崰姣(%)","涓溅缁繚鐜囷紙搴忔椂锛(%)", + "涓溅缁繚鐜囷紙鍏ㄦ湀锛(%)","鐜瘮鏄ㄦ棩(%)","鐜瘮涓婃湀(%)") values (#{璐ｄ换閮ㄩ棬},#{鏈烘瀯鐩爣鍊紏,#{鍒版湡鏁板叏鏈坿,#{搴忔椂鍒版湡鏁板崰姣攠, - #{涓溅缁繚鐜囧簭鏃秨,#{涓溅缁繚鐜囧叏鏈坿,#{鐜瘮鏄ㄦ棩},#{鐜瘮涓婃湀}, - #{骞冲潎鎻愬墠绛惧崟澶╂暟},#{鐜瘮}) + #{涓溅缁繚鐜囧簭鏃秨,#{涓溅缁繚鐜囧叏鏈坿,#{鐜瘮鏄ㄦ棩},#{鐜瘮涓婃湀} ) \ No newline at end of file diff --git a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml index edd30a5..5901d58 100644 --- a/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml +++ b/code/鍚庣/desktop_archievement_backend/src/main/resources/mybatis/mapper/QueryBIArchievementDataMapper.xml @@ -105,7 +105,7 @@ t."鐜瘮涓婃湀(%)" as 鐜瘮涓婃湀, t.骞冲潎鎻愬墠绛惧崟澶╂暟, t.鐜瘮 - from BI鏈烘瀯褰撴湀涓溅缁繚鐜囪窡韪〃 t + from "BI鏈烘瀯缁繚鐜囪窡韪〃-24骞" t @@ -116,7 +116,7 @@ - - + + \ No newline at end of file diff --git a/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/BatchInsertTest.java b/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/BatchInsertTest.java index 7bba7cb..45d52e9 100644 --- a/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/BatchInsertTest.java +++ b/code/鍚庣/desktop_archievement_backend/src/test/java/com/cpic/xim/DesktopArchievement/test/BatchInsertTest.java @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.cpic.xim.mybatis.mapper.ImportBIArchievementDataMapper; import com.cpic.xim.mybatis.pojo.BIDepartmentAttachingRateRecord; +import com.cpic.xim.mybatis.pojo.BIDepartmentRenewalRateRecord; import com.cpic.xim.mybatis.pojo.BITelsalerRenewalRateRecord; import com.cpic.xim.mybatis.utils.MybatisUtils; import com.cpic.xim.utils.data.ImportBIExcelData; @@ -74,7 +75,7 @@ public class BatchInsertTest @Test public void testBatchInsertBITeslsalerRenewalRate() { - String filePath = "D:/develop/cpicxim/deskop_task_schedule/鏁版嵁/娴嬭瘯鐢/鍧愬腑-缁繚.xlsx"; + String filePath = "D:\\develop\\cpicxim\\deskop_task_schedule\\鏁版嵁\\娴嬭瘯鐢╘\24骞存姤琛╘\鍧愬腑-缁繚.xlsx"; ArrayList records = null; SqlSession session = null; ImportBIArchievementDataMapper mapper = null; @@ -114,7 +115,7 @@ public class BatchInsertTest @Test public void testBatchInsertBIDepartmentAttachingRateToDB() { - String filePath = "D:/develop/cpicxim/deskop_task_schedule/鏁版嵁/娴嬭瘯鐢/鏈烘瀯娓楅.xlsx"; + String filePath = "D:\\develop\\cpicxim\\deskop_task_schedule\\鏁版嵁\\娴嬭瘯鐢╘\24骞存姤琛╘\鏈烘瀯-缁繚.xlsx"; ArrayList records = null; SqlSession session = null; @@ -148,4 +149,42 @@ public class BatchInsertTest assert( false ); } } + + @Test + public void testBatchInsertBIDepartmentRenewalRateToDB() + { + String filePath = "D:\\develop\\cpicxim\\deskop_task_schedule\\鏁版嵁\\娴嬭瘯鐢╘\24骞存姤琛╘\鏈烘瀯-缁繚.xlsx"; + + ArrayList records = null; + SqlSession session = null; + ImportBIArchievementDataMapper mapper = null; + + try + { + records = + ImportBIExcelData.importBIDepartmentRenewalRateRecordsFromXlsx( filePath, 0, 1 ); + session = MybatisUtils.getSqlSessionBatch(); + mapper = session.getMapper( ImportBIArchievementDataMapper.class ); + + mapper.cleanDepartmentRenewalRateData(); + + for ( BIDepartmentRenewalRateRecord record : records ) + { + mapper.insertDepartmentRenewalRateDataToDB( record ); + } + + session.commit(); + } + catch ( Exception error ) + { + if ( session != null ) + { + session.rollback(); + } + + logger.error("閿欒", error); + + assert( false ); + } + } } diff --git a/鏁版嵁/娴嬭瘯鐢/24骞存姤琛/鍧愬腑-缁繚.xlsx b/鏁版嵁/娴嬭瘯鐢/24骞存姤琛/鍧愬腑-缁繚.xlsx new file mode 100644 index 0000000..8005cae Binary files /dev/null and b/鏁版嵁/娴嬭瘯鐢/24骞存姤琛/鍧愬腑-缁繚.xlsx differ diff --git a/鏁版嵁/娴嬭瘯鐢/24骞存姤琛/鏈烘瀯-缁繚.xlsx b/鏁版嵁/娴嬭瘯鐢/24骞存姤琛/鏈烘瀯-缁繚.xlsx new file mode 100644 index 0000000..99011fa Binary files /dev/null and b/鏁版嵁/娴嬭瘯鐢/24骞存姤琛/鏈烘瀯-缁繚.xlsx differ