拆分员工与亲属资产导入前端链路

2026-03-13 16:49:27 +08:00
parent 109b5220b2
commit d6a791f59f
7 changed files with 114 additions and 17 deletions
--- a/ruoyi-ui/src/api/ccdiBaseStaffAsset.js
+++ b/ruoyi-ui/src/api/ccdiBaseStaffAsset.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 下载员工资产导入模板
+export function importBaseStaffAssetTemplate() {
+  return request({
+    url: '/ccdi/baseStaff/asset/importTemplate',
+    method: 'post'
+  })
+}
+
+// 导入员工资产数据
+export function importBaseStaffAssetData(data) {
+  return request({
+    url: '/ccdi/baseStaff/asset/importData',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询员工资产导入状态
+export function getBaseStaffAssetImportStatus(taskId) {
+  return request({
+    url: '/ccdi/baseStaff/asset/importStatus/' + taskId,
+    method: 'get'
+  })
+}
+
+// 查询员工资产导入失败记录
+export function getBaseStaffAssetImportFailures(taskId, pageNum, pageSize) {
+  return request({
+    url: '/ccdi/baseStaff/asset/importFailures/' + taskId,
+    method: 'get',
+    params: { pageNum, pageSize }
+  })
+}
--- a/ruoyi-ui/src/views/ccdiBaseStaff/index.vue
+++ b/ruoyi-ui/src/views/ccdiBaseStaff/index.vue
@@ -417,7 +417,7 @@
          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline;" @click="importAssetTemplate">下载员工资产模板</el-link>
        </div>
        <div class="el-upload__tip" slot="tip">
-          <span>仅允许导入"xls"或"xlsx"格式文件，系统将根据 personId/person_id 自动识别归属员工。</span>
+          <span>仅支持导入员工本人资产数据，文件需为"xls"或"xlsx"格式，系统将根据 personId/person_id 自动识别归属员工。</span>
        </div>
      </el-upload>
      <div slot="footer" class="dialog-footer">
@@ -520,9 +520,9 @@ import {
  updateBaseStaff
 } from "@/api/ccdiBaseStaff";
 import {
-  getAssetImportFailures,
-  getAssetImportStatus
-} from "@/api/ccdiAssetInfo";
+  getBaseStaffAssetImportFailures,
+  getBaseStaffAssetImportStatus
+} from "@/api/ccdiBaseStaffAsset";
 import {deptTreeSelect} from "@/api/system/user";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -653,7 +653,7 @@ export default {
        title: "",
        isUploading: false,
        headers: { Authorization: "Bearer " + getToken() },
-        url: process.env.VUE_APP_BASE_API + "/ccdi/assetInfo/importData"
+        url: process.env.VUE_APP_BASE_API + "/ccdi/baseStaff/asset/importData"
      },
      assetFailureDialogVisible: false,
      assetFailureList: [],
@@ -1182,7 +1182,7 @@ export default {
      this.download('ccdi/baseStaff/importTemplate', {}, `员工信息模板_${new Date().getTime()}.xlsx`)
    },
    importAssetTemplate() {
-      this.download('ccdi/assetInfo/importTemplate', {}, `员工资产信息模板_${new Date().getTime()}.xlsx`)
+      this.download('ccdi/baseStaff/asset/importTemplate', {}, `员工资产信息模板_${new Date().getTime()}.xlsx`)
    },
    // 文件上传中处理
    handleFileUploadProgress(event, file, fileList) {
@@ -1336,7 +1336,7 @@ export default {
            return;
          }

-          const response = await getAssetImportStatus(taskId);
+          const response = await getBaseStaffAssetImportStatus(taskId);

          if (response.data && response.data.status !== 'PROCESSING') {
            clearInterval(this.assetPollingTimer);
@@ -1466,7 +1466,7 @@ export default {
    },
    getAssetFailureList() {
      this.assetFailureLoading = true;
-      getAssetImportFailures(
+      getBaseStaffAssetImportFailures(
        this.assetCurrentTaskId,
        this.assetFailureQueryParams.pageNum,
        this.assetFailureQueryParams.pageSize
--- a/ruoyi-ui/tests/unit/employee-asset-api-contract.test.js
+++ b/ruoyi-ui/tests/unit/employee-asset-api-contract.test.js
@@ -6,16 +6,19 @@ const baseStaffApiPath = path.resolve(
  __dirname,
  "../../src/api/ccdiBaseStaff.js"
 );
-const assetApiPath = path.resolve(
+const baseStaffAssetApiPath = path.resolve(
  __dirname,
-  "../../src/api/ccdiAssetInfo.js"
+  "../../src/api/ccdiBaseStaffAsset.js"
 );

 assert(fs.existsSync(baseStaffApiPath), "未找到员工 API 文件 ccdiBaseStaff.js");
-assert(fs.existsSync(assetApiPath), "未找到员工资产 API 文件 ccdiAssetInfo.js");
+assert(
+  fs.existsSync(baseStaffAssetApiPath),
+  "未找到员工资产 API 文件 ccdiBaseStaffAsset.js"
+);

 const baseStaffSource = fs.readFileSync(baseStaffApiPath, "utf8");
-const assetSource = fs.readFileSync(assetApiPath, "utf8");
+const assetSource = fs.readFileSync(baseStaffAssetApiPath, "utf8");

 [
  "export function addBaseStaff(data)",
@@ -29,16 +32,25 @@ const assetSource = fs.readFileSync(assetApiPath, "utf8");
 });

 [
-  "export function importAssetTemplate()",
-  "export function importAssetData(data)",
-  "export function getAssetImportStatus(taskId)",
-  "export function getAssetImportFailures(taskId, pageNum, pageSize)",
+  "export function importBaseStaffAssetTemplate()",
+  "export function importBaseStaffAssetData(data)",
+  "export function getBaseStaffAssetImportStatus(taskId)",
+  "export function getBaseStaffAssetImportFailures(taskId, pageNum, pageSize)",
+  "/ccdi/baseStaff/asset/importTemplate",
+  "/ccdi/baseStaff/asset/importData",
+  "/ccdi/baseStaff/asset/importStatus/",
+  "/ccdi/baseStaff/asset/importFailures/",
+].forEach((token) => {
+  assert(assetSource.includes(token), `员工资产 API 缺少关键契约: ${token}`);
+});
+
+[
  "/ccdi/assetInfo/importTemplate",
  "/ccdi/assetInfo/importData",
  "/ccdi/assetInfo/importStatus/",
  "/ccdi/assetInfo/importFailures/",
 ].forEach((token) => {
-  assert(assetSource.includes(token), `员工资产 API 缺少关键契约: ${token}`);
+  assert(!assetSource.includes(token), `员工资产 API 不应再引用旧接口: ${token}`);
 });

 console.log("employee-asset-api-contract test passed");
--- a/ruoyi-ui/tests/unit/employee-asset-import-ui.test.js
+++ b/ruoyi-ui/tests/unit/employee-asset-import-ui.test.js
@@ -17,6 +17,13 @@ const source = fs.readFileSync(componentPath, "utf8");
  "assetFailureDialogVisible",
  "employee_asset_import_last_task",
  "员工资产数据导入",
+  "下载员工资产模板",
+  "@/api/ccdiBaseStaffAsset",
+  "/ccdi/baseStaff/asset/importData",
+  "ccdi/baseStaff/asset/importTemplate",
+  "getBaseStaffAssetImportStatus",
+  "getBaseStaffAssetImportFailures",
+  "仅支持导入员工本人资产数据",
 ].forEach((token) => {
  assert(
    source.includes(token),
@@ -24,4 +31,17 @@ const source = fs.readFileSync(componentPath, "utf8");
  );
 });

+[
+  'from "@/api/ccdiAssetInfo"',
+  "/ccdi/assetInfo/importData",
+  "ccdi/assetInfo/importTemplate",
+  "getAssetImportStatus(taskId)",
+  "getAssetImportFailures(",
+].forEach((token) => {
+  assert(
+    !source.includes(token),
+    `员工资产导入 UI 不应再引用亲属资产接口: ${token}`
+  );
+});
+
 console.log("employee-asset-import-ui test passed");
--- a/ruoyi-ui/tests/unit/staff-family-asset-api-contract.test.js
+++ b/ruoyi-ui/tests/unit/staff-family-asset-api-contract.test.js
@@ -42,4 +42,13 @@ const assetSource = fs.readFileSync(assetApiPath, "utf8");
  assert(assetSource.includes(token), `亲属资产 API 缺少关键契约: ${token}`);
 });

+[
+  "/ccdi/baseStaff/asset/importTemplate",
+  "/ccdi/baseStaff/asset/importData",
+  "/ccdi/baseStaff/asset/importStatus/",
+  "/ccdi/baseStaff/asset/importFailures/",
+].forEach((token) => {
+  assert(!assetSource.includes(token), `亲属资产 API 不应引用员工资产接口: ${token}`);
+});
+
 console.log("staff-family-asset-api-contract test passed");
--- a/ruoyi-ui/tests/unit/staff-family-asset-detail-import-ui.test.js
+++ b/ruoyi-ui/tests/unit/staff-family-asset-detail-import-ui.test.js
@@ -24,6 +24,10 @@ const source = fs.readFileSync(componentPath, "utf8");
  "startAssetImportStatusPolling(taskId)",
  "getAssetFailureList()",
  "clearAssetImportHistory()",
+  'from "@/api/ccdiAssetInfo"',
+  "/ccdi/assetInfo/importData",
+  "ccdi/assetInfo/importTemplate",
+  "亲属资产信息模板_",
 ].forEach((token) => {
  assert(source.includes(token), `亲属资产导入 UI 缺少关键结构或状态: ${token}`);
 });
@@ -37,4 +41,16 @@ const source = fs.readFileSync(componentPath, "utf8");
  assert(source.includes(token), `详情展示或禁改逻辑缺少关键结构: ${token}`);
 });

+[
+  "@/api/ccdiBaseStaffAsset",
+  "/ccdi/baseStaff/asset/importData",
+  "ccdi/baseStaff/asset/importTemplate",
+  "下载员工资产模板",
+].forEach((token) => {
+  assert(
+    !source.includes(token),
+    `亲属资产导入 UI 不应引用员工资产导入实现: ${token}`
+  );
+});
+
 console.log("staff-family-asset-detail-import-ui test passed");