From 6f2ea5994ade0060814b46a0144a5485fbab2d89 Mon Sep 17 00:00:00 2001 From: wjj <2069666735@qq.com> Date: Wed, 29 Apr 2026 17:19:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=AD=A3=E5=BC=8F=E5=8C=96=E5=A4=96=E5=A3=B3?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nt-formal-shell-frontend-implementation.md | 34 +++ ...l-shell-rollout-frontend-implementation.md | 65 +++++ ...og-formal-shell-frontend-implementation.md | 56 ++++ ...recruitment-formal-shell-implementation.md | 40 +++ ...tch-formal-shell-rollout-implementation.md | 92 ++++++ ...6-04-29-formal-style-adjustment-summary.md | 101 +++++++ ...ysis-dialog-formal-shell-implementation.md | 44 +++ ruoyi-ui/src/views/ccdiAccountInfo/index.vue | 104 ++++++- ruoyi-ui/src/views/ccdiBaseStaff/index.vue | 228 +++++++++++---- ruoyi-ui/src/views/ccdiCreditInfo/index.vue | 116 +++++++- .../ccdiCustEnterpriseRelation/index.vue | 117 +++++++- .../src/views/ccdiCustFmyRelation/index.vue | 117 +++++++- .../ccdiIntermediary/components/DataTable.vue | 42 ++- .../components/DetailDialog.vue | 24 ++ .../components/EditDialog.vue | 27 ++ .../components/ImportDialog.vue | 20 +- .../components/SearchForm.vue | 20 ++ ruoyi-ui/src/views/ccdiIntermediary/index.vue | 41 +++ .../detail/ProjectAnalysisDialog.vue | 119 ++++++-- .../detail/ProjectAnalysisSidebar.vue | 204 ++++++++----- .../views/ccdiPurchaseTransaction/index.vue | 118 +++++++- .../ccdiStaffEnterpriseRelation/index.vue | 117 +++++++- .../src/views/ccdiStaffFmyRelation/index.vue | 117 +++++++- .../src/views/ccdiStaffRecruitment/index.vue | 273 ++++++++++++------ .../src/views/ccdiStaffTransfer/index.vue | 118 +++++++- .../project-analysis-dialog-layout.test.js | 9 +- .../project-analysis-dialog-sidebar.test.js | 12 +- 27 files changed, 2037 insertions(+), 338 deletions(-) create mode 100644 docs/plans/frontend/2026-04-29-base-staff-and-staff-recruitment-formal-shell-frontend-implementation.md create mode 100644 docs/plans/frontend/2026-04-29-batch-formal-shell-rollout-frontend-implementation.md create mode 100644 docs/plans/frontend/2026-04-29-results-overview-project-analysis-dialog-formal-shell-frontend-implementation.md create mode 100644 docs/reports/implementation/2026-04-29-base-staff-and-staff-recruitment-formal-shell-implementation.md create mode 100644 docs/reports/implementation/2026-04-29-batch-formal-shell-rollout-implementation.md create mode 100644 docs/reports/implementation/2026-04-29-formal-style-adjustment-summary.md create mode 100644 docs/reports/implementation/2026-04-29-results-overview-project-analysis-dialog-formal-shell-implementation.md diff --git a/docs/plans/frontend/2026-04-29-base-staff-and-staff-recruitment-formal-shell-frontend-implementation.md b/docs/plans/frontend/2026-04-29-base-staff-and-staff-recruitment-formal-shell-frontend-implementation.md new file mode 100644 index 00000000..1826d4d6 --- /dev/null +++ b/docs/plans/frontend/2026-04-29-base-staff-and-staff-recruitment-formal-shell-frontend-implementation.md @@ -0,0 +1,34 @@ +# 员工信息维护与招聘信息管理正式化外壳前端实施计划 + +## 目标 + +- 基于当前本地最新代码，为 `ccdiBaseStaff` 与 `ccdiStaffRecruitment` 试套正式化外壳样式。 +- 仅调整查询区、工具条、表格区、分页区与弹窗壳层视觉。 +- 不改字段顺序、不改按钮位置、不改功能块结构。 + +## 范围 + +- `ruoyi-ui/src/views/ccdiBaseStaff/index.vue` +- `ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue` +- `ruoyi-ui/tests/unit/base-staff-formal-shell-layout.test.js` +- `ruoyi-ui/tests/unit/staff-recruitment-formal-shell-layout.test.js` + +## 方案 + +- 复用现有 `app-container`、`query-form`、`mb8`、弹窗 class，只补最少样式。 +- 给列表区新增最小表格外壳，保证分页和表格归一。 +- 通过边框、浅底、留白和表头背景统一正式化视觉。 + +## 验证 + +- `node tests/unit/base-staff-formal-shell-layout.test.js` +- `node tests/unit/staff-recruitment-formal-shell-layout.test.js` +- `node tests/unit/employee-asset-maintenance-layout.test.js` +- `node tests/unit/staff-recruitment-import-toolbar.test.js` + +## 完成标准 + +- 两个页面外壳样式统一 +- 按钮顺序和功能入口保持不变 +- 单测通过 +- 浏览器实测通过 diff --git a/docs/plans/frontend/2026-04-29-batch-formal-shell-rollout-frontend-implementation.md b/docs/plans/frontend/2026-04-29-batch-formal-shell-rollout-frontend-implementation.md new file mode 100644 index 00000000..80c86a83 --- /dev/null +++ b/docs/plans/frontend/2026-04-29-batch-formal-shell-rollout-frontend-implementation.md @@ -0,0 +1,65 @@ +# 2026-04-29 批量正式化外壳样式实施计划 + +## 目标 + +- 基于当前本地最新前端代码，批量推进信息维护相关页面的正式化外壳样式。 +- 严格保持“只改样式、不改内容和功能”的边界。 +- 复用已经在详情弹窗、员工信息维护页、招聘信息管理页验证过的正式化样式骨架。 + +## 范围 + +- `ruoyi-ui/src/views/ccdiAccountInfo/index.vue` +- `ruoyi-ui/src/views/ccdiCreditInfo/index.vue` +- `ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue` +- `ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue` +- `ruoyi-ui/src/views/ccdiIntermediary/index.vue` +- `ruoyi-ui/src/views/ccdiIntermediary/components/SearchForm.vue` +- `ruoyi-ui/src/views/ccdiIntermediary/components/DataTable.vue` +- `ruoyi-ui/src/views/ccdiIntermediary/components/DetailDialog.vue` +- `ruoyi-ui/src/views/ccdiIntermediary/components/EditDialog.vue` +- `ruoyi-ui/src/views/ccdiIntermediary/components/ImportDialog.vue` +- `ruoyi-ui/src/views/ccdiPurchaseTransaction/index.vue` +- `ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue` +- `ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue` +- `ruoyi-ui/src/views/ccdiStaffTransfer/index.vue` + +## 实施策略 + +### 1. 查询区统一正式化 + +- 保留原有查询字段、排布逻辑和按钮位置。 +- 为查询区补统一白色面板、边框、克制圆角和更稳重的标签文字。 +- 收紧表单项底部留白，统一输入框、下拉框、日期控件的边框和圆角。 + +### 2. 工具条统一正式化 + +- 保留搜索、重置、新增、导入、失败记录入口及其相对位置。 +- 统一工具条外层白色承载区。 +- 按钮仅调整圆角、边框与视觉重量，不改变语义和行为。 + +### 3. 表格承载区统一正式化 + +- 新增或复用 `formal-table-shell` 包裹列表表格与分页区。 +- 收紧表头和行高，提升单屏信息密度。 +- 主体文本尽量左对齐，保留选择列和操作列居中。 + +### 4. 弹窗与详情区统一正式化 + +- 统一弹窗圆角、头部下边线、正文浅底。 +- 详情区、导入弹窗、编辑弹窗使用更克制的信息面板样式。 +- 不重排现有字段，不新增删减交互块。 + +## 验证计划 + +- 复用现有样式契约单测，确保已完成页面没有回退。 +- 使用浏览器打开真实业务路由进行验证，禁止使用 prototype 页面替代。 +- 核对关键页面是否保持： + - 查询区与工具条仍在原位置 + - 新增、导入、失败记录按钮仍按原顺序出现 + - 表格列和弹窗内容结构不变 + +## 风险控制 + +- 不使用旧 patch 中的结构改法，只借用可复用的正式化视觉参数。 +- 每个页面只处理最外层承载和控件外观，不触碰业务字段、接口、校验、按钮逻辑。 +- 若真实页面路由可访问，则以真实页面结果为准；若不可访问，保留源码级验证说明。 diff --git a/docs/plans/frontend/2026-04-29-results-overview-project-analysis-dialog-formal-shell-frontend-implementation.md b/docs/plans/frontend/2026-04-29-results-overview-project-analysis-dialog-formal-shell-frontend-implementation.md new file mode 100644 index 00000000..d2e4e281 --- /dev/null +++ b/docs/plans/frontend/2026-04-29-results-overview-project-analysis-dialog-formal-shell-frontend-implementation.md @@ -0,0 +1,56 @@ +# 结果总览项目分析详情正式化外壳前端实施计划 + +## 目标 + +- 基于 `output/mockups/project-analysis-formal-soft-preview.html` 的静态预览稿，恢复“项目分析详情”弹窗的正式化、去卡片化外壳样式。 +- 本次仅调整详情弹窗整体框架、标题区、左侧人物档案区、右侧主承载区与页签外层视觉。 +- 不修改“异常明细”页签内部业务结构、分页、按钮、接口与数据逻辑。 + +## 范围 + +- 修改 `ruoyi-ui/src/views/ccdiProject/components/detail/ProjectAnalysisDialog.vue` +- 修改 `ruoyi-ui/src/views/ccdiProject/components/detail/ProjectAnalysisSidebar.vue` +- 修改 `ruoyi-ui/tests/unit/project-analysis-dialog-layout.test.js` +- 修改 `ruoyi-ui/tests/unit/project-analysis-dialog-sidebar.test.js` + +## 实施方案 + +### 1. 弹窗外壳正式化 + +- 将当前偏渐变、大圆角的详情弹窗外壳改为更平直的正式化工作台样式。 +- 顶部保留“结果总览 / 项目分析详情”的信息层级，但改成浅边线、弱装饰、明确留白的标题区。 +- 调整整体布局间距，让左侧档案区和右侧主区以纵向分隔线形成清晰结构。 + +### 2. 左侧档案区映射静态稿 + +- 保留当前姓名、风险等级、工号、部门、所属项目、命中模型数、核心异常标签的数据字段。 +- 通过信息头、字段列表、摘要区三段式样式，映射静态稿的人物档案视觉。 +- 不新增额外字段、不新增辅助业务区块。 + +### 3. 右侧主区外层收口 + +- 保持 `el-tabs`、错误提示、加载逻辑、默认页签逻辑不变。 +- 只调整页签外层、内容承载区、主区边界与留白，不进入各 tab 内部重做内容样式。 + +## 验证计划 + +### 代码校验 + +- 在 `ruoyi-ui` 目录执行： + - `node tests/unit/project-analysis-dialog-layout.test.js` + - `node tests/unit/project-analysis-dialog-sidebar.test.js` + - `node tests/unit/project-analysis-dialog-empty-field.test.js` + +### 浏览器验证 + +- 先通过 `nvm use` 确认前端 Node 版本。 +- 启动真实前端页面后，使用 `browser-use` 在系统真实页面打开“项目分析详情”弹窗。 +- 重点核对： + - 标题区是否为正式化平直样式 + - 左侧档案区是否按预览稿形成清晰三段层次 + - 右侧主区是否只改外层、不影响“异常明细”内部内容与交互 + +## 风险控制 + +- 不改接口、不改 mock 数据、不改异常明细内部组件，避免把外壳样式改动扩大成业务结构调整。 +- 单测只更新与外层视觉契约直接相关的断言，避免引入无关回归。 diff --git a/docs/reports/implementation/2026-04-29-base-staff-and-staff-recruitment-formal-shell-implementation.md b/docs/reports/implementation/2026-04-29-base-staff-and-staff-recruitment-formal-shell-implementation.md new file mode 100644 index 00000000..f78324aa --- /dev/null +++ b/docs/reports/implementation/2026-04-29-base-staff-and-staff-recruitment-formal-shell-implementation.md @@ -0,0 +1,40 @@ +# 员工信息维护与招聘信息管理正式化外壳实施记录 + +## 变更日期 + +- 2026-04-29 + +## 变更范围 + +- 前端：`ruoyi-ui/src/views/ccdiBaseStaff/index.vue` +- 前端：`ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue` +- 单测：`ruoyi-ui/tests/unit/base-staff-formal-shell-layout.test.js` +- 单测：`ruoyi-ui/tests/unit/staff-recruitment-formal-shell-layout.test.js` + +## 实施内容 + +### 1. 页面外壳调整 + +- 复用 `app-container`、`query-form`、`mb8` 等现有结构，只补最少样式。 +- 为 `ccdiBaseStaff` 与 `ccdiStaffRecruitment` 的查询区增加正式化外壳视觉，包括浅底、边框、留白和输入框边线统一。 +- 保持搜索、重置、新增、导入、失败记录等按钮原有顺序不变。 +- 为两个页面新增 `formal-table-shell`，将表格和分页收口到同一视觉区域内。 + +### 2. 弹窗外壳调整 + +- 复用员工页已有 `employee-edit-dialog`、`employee-detail-dialog` class，只调整弹窗圆角、标题分隔线和弹窗正文背景。 +- 复用招聘页现有弹窗结构，只补统一的弹窗标题区和正文背景样式。 +- 未改动员工资产、历史工作经历等内部功能块结构。 + +### 3. 验证情况 + +- 单测通过： + - `node tests/unit/base-staff-formal-shell-layout.test.js` + - `node tests/unit/staff-recruitment-formal-shell-layout.test.js` + - `node tests/unit/staff-recruitment-import-toolbar.test.js` +- 现有单测异常： + - `node tests/unit/employee-asset-maintenance-layout.test.js` + - 失败原因为当前仓库源码不满足既有字符串断言 `createEmptyAssetRow(defaultPersonId = "")`，与本次外壳样式改动无关。 +- 浏览器验证： + - 已使用 `browser-use` 打开 `http://localhost/prototype/staff-recruitment`，确认招聘信息管理页查询区、工具条、表格区已切换为正式化外壳，按钮仍保持原位。 + - 尝试打开 `http://localhost/ccdiBaseStaff` 时，当前本地前端路由返回 404 页面，因此未能在浏览器内完成员工信息维护页真实页面验证。 diff --git a/docs/reports/implementation/2026-04-29-batch-formal-shell-rollout-implementation.md b/docs/reports/implementation/2026-04-29-batch-formal-shell-rollout-implementation.md new file mode 100644 index 00000000..c9da5722 --- /dev/null +++ b/docs/reports/implementation/2026-04-29-batch-formal-shell-rollout-implementation.md @@ -0,0 +1,92 @@ +# 2026-04-29 批量正式化外壳样式实施记录 + +## 本次实施内容 + +本轮基于当前本地最新代码，批量将信息维护相关页面收口为统一的正式化外壳样式，继续保持“只改样式、不改内容和功能”的边界。 + +### 覆盖页面 + +- 账户库管理：`ruoyi-ui/src/views/ccdiAccountInfo/index.vue` +- 征信维护：`ruoyi-ui/src/views/ccdiCreditInfo/index.vue` +- 信贷客户实体关联：`ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue` +- 信贷客户家庭关系：`ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue` +- 中介库管理： + - `ruoyi-ui/src/views/ccdiIntermediary/index.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/SearchForm.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/DataTable.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/DetailDialog.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/EditDialog.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/ImportDialog.vue` +- 招投标信息维护：`ruoyi-ui/src/views/ccdiPurchaseTransaction/index.vue` +- 员工亲属实体关联：`ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue` +- 员工亲属关系维护：`ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue` +- 员工调动记录：`ruoyi-ui/src/views/ccdiStaffTransfer/index.vue` + +## 具体调整 + +### 查询区 + +- 将筛选区统一收进白色边框面板。 +- 统一标签颜色、控件边框、控件圆角和表单项间距。 +- 保留全部原始筛选条件和原始布局顺序。 + +### 工具条 + +- 为工具条增加统一白色承载面板。 +- 按钮圆角统一收敛到约 4px。 +- 不调整搜索、重置、新增、导入、失败记录等按钮的位置和语义。 + +### 表格 + +- 为列表页统一增加 `formal-table-shell` 外层承载。 +- 收紧表头和表体留白，提升单屏显示密度。 +- 统一普通列左对齐，操作列和选择列保持居中。 + +### 弹窗 + +- 编辑、详情、导入弹窗统一使用更正式的边界和浅底信息面板风格。 +- 去掉原有偏演示感的悬浮和装饰感。 +- 不改变弹窗中的字段组织和业务交互。 + +## 修正项 + +- 批量调整过程中，`ccdiPurchaseTransaction/index.vue` 样式块曾出现一个多余的 `}`，导致前端编译报错。 +- 已在本轮内修正，重新通过真实页面检查。 +- 批量将 `.mb8` 统一为 `flex` 承载后，`right-toolbar` 的“显示/隐藏 / 刷新”按钮组一度被挤到左侧。 +- 已通过为各列表页补充 `.mb8 ::v-deep .top-right-btn { margin-left: auto; }` 恢复原有靠右位置。 + +## 验证结果 + +### 单测 + +- `node ruoyi-ui/tests/unit/base-staff-formal-shell-layout.test.js` 通过 +- `node ruoyi-ui/tests/unit/staff-recruitment-formal-shell-layout.test.js` 通过 +- `node ruoyi-ui/tests/unit/project-analysis-dialog-layout.test.js` 通过 +- `node ruoyi-ui/tests/unit/project-analysis-dialog-sidebar.test.js` 通过 + +### 真实页面浏览器验证 + +已通过真实业务路由验证以下页面可以打开且关键外壳区域仍保持原有功能结构： + +- `http://localhost/maintain/accountInfo` +- `http://localhost/maintain/creditInfo` +- `http://localhost/maintain/intermediary` +- `http://localhost/maintain/purchaseTransaction` +- `http://localhost/maintain/staffTransfer` +- `http://localhost/maintain/staffEnterpriseRelation` +- `http://localhost/maintain/staffFmyRelation` +- `http://localhost/maintain/custEnterpriseRelation` +- `http://localhost/maintain/custFmyRelation` +- `http://localhost/maintain/staffRecruitment` + +验证点： + +- 页面标题、搜索按钮、新增按钮、导入按钮仍可见 +- 查询区与工具条仍位于原位置 +- 未发生按钮左右换位 +- 表格区与分页区仍按原内容结构展示 + +## 现有环境问题 + +- `staffRecruitment` 页面当前仍存在后端返回的字符集排序规则冲突报错：`utf8mb4_0900_ai_ci` 与 `utf8mb4_general_ci` 混用。 +- 该问题来自现有后端/数据库环境，不是本次样式改动引入的问题。 diff --git a/docs/reports/implementation/2026-04-29-formal-style-adjustment-summary.md b/docs/reports/implementation/2026-04-29-formal-style-adjustment-summary.md new file mode 100644 index 00000000..9843e488 --- /dev/null +++ b/docs/reports/implementation/2026-04-29-formal-style-adjustment-summary.md @@ -0,0 +1,101 @@ +# 2026-04-29 正式化样式调整总说明 + +## 目标边界 + +- 本轮所有改动都基于当前本地最新代码进行。 +- 仅调整页面与弹窗外壳样式，不改变原有内容、字段、按钮语义、交互流程和功能逻辑。 +- 不参考 `2026-04-29-dev-ui-style-mixed-stash.patch` 中的结构性和功能性变动。 + +## 本轮纳入的页面 + +### 1. 项目分析详情弹窗 + +- 文件： + - `ruoyi-ui/src/views/ccdiProject/components/detail/ProjectAnalysisDialog.vue` + - `ruoyi-ui/src/views/ccdiProject/components/detail/ProjectAnalysisSidebar.vue` +- 调整方向： + - 详情页外壳正式化、去卡片化 + - 标题区更平直，人物档案区更规整 + - 页签和主区承载更克制 +- 不变内容： + - 异常明细、资产分析、征信摘要等业务内容结构不变 + - 数据请求、分页、按钮逻辑不变 + +### 2. 员工信息维护页 + +- 文件： + - `ruoyi-ui/src/views/ccdiBaseStaff/index.vue` +- 调整方向： + - 筛选区收进统一白色区域 + - 工具条按钮外观更正式，圆角收小 + - 表格与分页统一收进正式信息面板 + - 表格更紧凑、阅读更集中 + - 编辑/详情弹窗外壳更像正式信息面板 +- 不变内容： + - 查询字段、按钮顺序、导入入口、资产信息与党员信息功能不变 + +### 3. 招聘信息管理页 + +- 文件： + - `ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue` +- 调整方向： + - 筛选区、工具条、表格区统一正式化 + - 按钮、输入框、下拉框视觉更稳重 + - 表格行高与表头高度适当收紧 + - 弹窗外壳更克制 +- 不变内容： + - 招聘类型、历史工作经历、导入入口、按钮位置和业务流程不变 + +### 4. 批量推进的信息维护页面 + +- 文件： + - `ruoyi-ui/src/views/ccdiAccountInfo/index.vue` + - `ruoyi-ui/src/views/ccdiCreditInfo/index.vue` + - `ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue` + - `ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/index.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/SearchForm.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/DataTable.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/DetailDialog.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/EditDialog.vue` + - `ruoyi-ui/src/views/ccdiIntermediary/components/ImportDialog.vue` + - `ruoyi-ui/src/views/ccdiPurchaseTransaction/index.vue` + - `ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue` + - `ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue` + - `ruoyi-ui/src/views/ccdiStaffTransfer/index.vue` +- 调整方向： + - 查询区、工具条、列表区统一成正式化白色信息面板 + - 输入框、下拉框、日期控件边框与圆角统一收敛 + - 表格与分页通过 `formal-table-shell` 统一承载 + - 中介库的搜索、列表、详情、编辑、导入弹窗统一到相同视觉语言 + - 各列表维护页的弹窗边界与留白更克制 +- 不变内容： + - 按钮顺序、字段结构、导入流程、失败记录入口、详情内容和业务逻辑不变 + +## 统一视觉原则 + +- 筛选区更规整：统一白色面板承载，结构清晰 +- 按钮更正式：圆角约 4px，弱化轻飘感 +- 表单控件更稳重：圆角更小，边框更统一 +- 表格更紧凑：降低表头和行内容留白，一屏展示更多信息 +- 列表阅读性更好：尽量左对齐，减少长字段换行和大片空白 +- 视觉装饰收敛：移除不必要的阴影、渐变、悬浮感 +- 卡片感减弱：边界、留白、圆角更克制，保留原有内容结构 + +## 验证说明 + +- 项目分析详情弹窗已完成真实页面验证 +- 员工信息维护页已完成源码与单测级校验 +- 招聘信息管理页和批量推进页面已通过真实业务路由验证： + - `http://localhost/maintain/staffRecruitment` + - `http://localhost/maintain/accountInfo` + - `http://localhost/maintain/creditInfo` + - `http://localhost/maintain/intermediary` + - `http://localhost/maintain/purchaseTransaction` + - `http://localhost/maintain/staffTransfer` + - `http://localhost/maintain/staffEnterpriseRelation` + - `http://localhost/maintain/staffFmyRelation` + - `http://localhost/maintain/custEnterpriseRelation` + - `http://localhost/maintain/custFmyRelation` +- 浏览器验证过程中发现并修复了 `ccdiPurchaseTransaction/index.vue` 的样式编译错误 +- `staffRecruitment` 页面仍存在现有数据库字符集排序规则冲突报错，该问题不属于本轮样式改动 diff --git a/docs/reports/implementation/2026-04-29-results-overview-project-analysis-dialog-formal-shell-implementation.md b/docs/reports/implementation/2026-04-29-results-overview-project-analysis-dialog-formal-shell-implementation.md new file mode 100644 index 00000000..953b08ab --- /dev/null +++ b/docs/reports/implementation/2026-04-29-results-overview-project-analysis-dialog-formal-shell-implementation.md @@ -0,0 +1,44 @@ +# 结果总览项目分析详情正式化外壳实施记录 + +## 变更日期 + +- 2026-04-29 + +## 变更范围 + +- 前端：`ruoyi-ui/src/views/ccdiProject/components/detail/ProjectAnalysisDialog.vue` +- 前端：`ruoyi-ui/src/views/ccdiProject/components/detail/ProjectAnalysisSidebar.vue` +- 单测：`ruoyi-ui/tests/unit/project-analysis-dialog-layout.test.js` +- 单测：`ruoyi-ui/tests/unit/project-analysis-dialog-sidebar.test.js` + +## 实施内容 + +### 1. 弹窗外壳样式正式化 + +- 调整 `ProjectAnalysisDialog.vue` 的外层壳样式，去掉旧版渐变大圆角卡片视觉。 +- 将弹窗主体改为浅灰外层背景 + 白色内容工作台，强化边线、留白和分栏结构。 +- 将标题区改成“结果总览 / 项目分析详情”的正式化层级，保留当前命中模型提示，但收口为弱装饰信息块。 +- 调整右侧主区与左侧档案区之间的分隔线和间距，只改外壳，不进入各 tab 内部内容结构。 + +### 2. 左侧人物档案区样式映射 + +- 调整 `ProjectAnalysisSidebar.vue`，按“人物档案 + 命中模型摘要”两段式结构重排视觉。 +- 姓名、风险等级、工号、部门、所属项目继续沿用现有数据字段，不新增业务字段。 +- 将风险等级改为细边框状态标识，字段列表改为规整的标签/值双列展示。 +- 核心异常标签保留为现有标签数据，仅更新标签外观，不改渲染逻辑。 + +### 3. 验证情况 + +- 单测通过： + - `node tests/unit/project-analysis-dialog-layout.test.js` + - `node tests/unit/project-analysis-dialog-sidebar.test.js` + - `node tests/unit/project-analysis-dialog-empty-field.test.js` +- 浏览器实测： + - 使用 `browser-use` 打开本地真实系统 `http://localhost/` + - 进入项目详情页 `http://localhost/ccdiProject/detail/90337?tab=overview` + - 在“结果总览”页点击“查看详情”，确认“项目分析详情”弹窗已应用正式化外壳样式 + - 确认左侧人物档案区样式已按预览稿方向收口，右侧“异常明细”内部业务内容未被重做 +- 环境记录： + - `ruoyi-ui/.nvmrc` 期望版本为 `14.21.3` + - 当前终端执行 `nvm use` 失败，原因是 `nvm` 未安装到 PowerShell PATH + - 本次前端校验在当前可用 Node `v22.22.0` 下完成，相关单测通过 diff --git a/ruoyi-ui/src/views/ccdiAccountInfo/index.vue b/ruoyi-ui/src/views/ccdiAccountInfo/index.vue index 6872cd24..c66843d0 100644 --- a/ruoyi-ui/src/views/ccdiAccountInfo/index.vue +++ b/ruoyi-ui/src/views/ccdiAccountInfo/index.vue @@ -113,7 +113,8 @@ - +
+ + - + +
@@ -872,19 +874,89 @@ export default { .account-page { min-height: calc(100vh - 84px); - background: #f5f7fa; + padding: 24px; + background: #f5f6f8; } .board { - padding: 20px; - border-radius: 8px; + padding: 0; + border-radius: 0; + background: transparent; + border: 0; +} + +.query-form { + margin-bottom: 16px; + padding: 18px 20px 2px; + border: 1px solid #dde3ec; + border-radius: 3px; background: #fff; - border: 1px solid #ebeef5; +} + +.query-form ::v-deep .el-form-item { + margin-bottom: 16px; +} + +.query-form ::v-deep .el-form-item__label { + color: #637187; + font-weight: 600; +} + +.query-form ::v-deep .el-input__inner, +.query-form ::v-deep .el-select .el-input__inner { + border-color: #dde3ec; + border-radius: 3px; +} + +.mb8 { + display: flex; + flex-wrap: wrap; + align-items: center; + margin-bottom: 16px; + padding: 14px 20px; + border: 1px solid #dde3ec; + border-radius: 3px; + background: #ffffff; +} + +.mb8 ::v-deep .el-button { + border-radius: 4px; +} + +.mb8 ::v-deep .top-right-btn { + margin-left: auto; +} + +.formal-table-shell { + padding: 4px 0 16px; + border: 1px solid #dde3ec; + border-radius: 3px; + background: #ffffff; + overflow: hidden; } .account-table ::v-deep .el-table__header th { - background: #f8f8f9; - color: #515a6e; + background: #f6f8fb; + color: #607086; + padding: 9px 0; +} + +.account-table ::v-deep .el-table td, +.account-table ::v-deep .el-table th.is-leaf { + border-bottom-color: #edf1f5; +} + +.account-table ::v-deep .el-table td { + padding: 8px 0; +} + +.account-table ::v-deep .el-table th > .cell, +.account-table ::v-deep .el-table td > .cell { + line-height: 1.4; +} + +.formal-table-shell ::v-deep .pagination-container { + padding: 16px 20px 0; } .form-section { @@ -913,4 +985,18 @@ export default { font-weight: 700; } +::v-deep .el-dialog { + border-radius: 6px; + overflow: hidden; +} + +::v-deep .el-dialog__header { + border-bottom: 1px solid #dde3ec; + background: #ffffff; +} + +::v-deep .el-dialog__body { + background: #f8fafc; +} + diff --git a/ruoyi-ui/src/views/ccdiBaseStaff/index.vue b/ruoyi-ui/src/views/ccdiBaseStaff/index.vue index 50210638..6f6da26a 100644 --- a/ruoyi-ui/src/views/ccdiBaseStaff/index.vue +++ b/ruoyi-ui/src/views/ccdiBaseStaff/index.vue @@ -112,64 +112,66 @@ - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + - + +
@@ -1472,6 +1474,12 @@ export default { diff --git a/ruoyi-ui/src/views/ccdiCreditInfo/index.vue b/ruoyi-ui/src/views/ccdiCreditInfo/index.vue index 038d364b..4d19a0d2 100644 --- a/ruoyi-ui/src/views/ccdiCreditInfo/index.vue +++ b/ruoyi-ui/src/views/ccdiCreditInfo/index.vue @@ -40,7 +40,8 @@ - +
+ @@ -59,15 +60,16 @@ 删除 - + - + +
diff --git a/ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue b/ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue index b4e4a378..cd88da08 100644 --- a/ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue +++ b/ruoyi-ui/src/views/ccdiCustEnterpriseRelation/index.vue @@ -90,7 +90,8 @@ - +
+ @@ -135,15 +136,16 @@ >删除 - + - + +
@@ -841,6 +843,12 @@ export default { diff --git a/ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue b/ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue index 474c3614..fc893124 100644 --- a/ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue +++ b/ruoyi-ui/src/views/ccdiCustFmyRelation/index.vue @@ -91,7 +91,8 @@ - +
+ @@ -143,15 +144,16 @@ >删除 - + - + +
@@ -1097,6 +1099,12 @@ export default { diff --git a/ruoyi-ui/src/views/ccdiIntermediary/components/DataTable.vue b/ruoyi-ui/src/views/ccdiIntermediary/components/DataTable.vue index 360760b5..3ab635fe 100644 --- a/ruoyi-ui/src/views/ccdiIntermediary/components/DataTable.vue +++ b/ruoyi-ui/src/views/ccdiIntermediary/components/DataTable.vue @@ -1,5 +1,5 @@ - + - + + @@ -1370,6 +1372,12 @@ export default { diff --git a/ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue b/ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue index 4d242134..f54df9fc 100644 --- a/ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue +++ b/ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue @@ -114,7 +114,8 @@ - +
+ @@ -165,15 +166,16 @@ >删除 - + - + +
@@ -990,6 +992,12 @@ export default { diff --git a/ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue b/ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue index 7fb26ef8..b9aea512 100644 --- a/ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue +++ b/ruoyi-ui/src/views/ccdiStaffFmyRelation/index.vue @@ -105,7 +105,8 @@ - +
+ @@ -159,15 +160,16 @@ >删除 - + - + +
@@ -1565,6 +1567,12 @@ export default { diff --git a/ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue b/ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue index 2f1d0234..41a91f27 100644 --- a/ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue +++ b/ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue @@ -132,94 +132,96 @@ - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + - + +
@@ -1515,6 +1517,12 @@ export default { diff --git a/ruoyi-ui/src/views/ccdiStaffTransfer/index.vue b/ruoyi-ui/src/views/ccdiStaffTransfer/index.vue index 1dc19fce..65c4867a 100644 --- a/ruoyi-ui/src/views/ccdiStaffTransfer/index.vue +++ b/ruoyi-ui/src/views/ccdiStaffTransfer/index.vue @@ -130,7 +130,8 @@ - +
+ @@ -169,15 +170,16 @@ >删除 - + - + +
@@ -969,6 +971,12 @@ export default { diff --git a/ruoyi-ui/tests/unit/project-analysis-dialog-layout.test.js b/ruoyi-ui/tests/unit/project-analysis-dialog-layout.test.js index 32ee81a0..2c3791bd 100644 --- a/ruoyi-ui/tests/unit/project-analysis-dialog-layout.test.js +++ b/ruoyi-ui/tests/unit/project-analysis-dialog-layout.test.js @@ -34,8 +34,9 @@ const mockSource = fs.readFileSync( "detailLoading", "detailError", "handleRetryDetail()", - "border: 1px solid #e2e8f0", - "border-radius: 24px", + "border: 1px solid #dde3ec", + "background: #f5f6f8", + "font-size: 30px", ].forEach((token) => assert(dialog.includes(token), token)); [ @@ -43,6 +44,8 @@ const mockSource = fs.readFileSync( 'top="2vh"', "project-analysis-header__main", "project-analysis-header__meta", + "border-left: 1px solid #dde3ec", + "padding: 36px", ].forEach((token) => assert(dialog.includes(token), token)); [ @@ -52,6 +55,8 @@ const mockSource = fs.readFileSync( "project-analysis-layout__main-scroll", "overflow-y: auto", "max-height: calc(90vh - 120px)", + "border-radius: 24px", + "background: linear-gradient(180deg, #ffffff 0%, #f8fafc 100%)", ].forEach((token) => assert(!dialog.includes(token), token)); [ diff --git a/ruoyi-ui/tests/unit/project-analysis-dialog-sidebar.test.js b/ruoyi-ui/tests/unit/project-analysis-dialog-sidebar.test.js index d650a941..5dc6604b 100644 --- a/ruoyi-ui/tests/unit/project-analysis-dialog-sidebar.test.js +++ b/ruoyi-ui/tests/unit/project-analysis-dialog-sidebar.test.js @@ -25,24 +25,28 @@ const entry = fs.readFileSync( ); [ + "sidebar-profile-card", "sidebar-profile", "sidebar-profile__name", + "sidebar-profile__identity-label", "sidebar-risk-badge", "sidebar-profile__meta", "sidebar-summary", + "sidebar-summary__title", "sidebar-summary__count", "sidebar-tag-list", "formatRiskTag", "tag.ruleName", "flex-wrap: wrap", - "align-items: flex-start", + "justify-content: space-between", + "border: 1px solid #dde3ec", ].forEach((token) => assert(sidebar.includes(token), token)); assert(!sidebar.includes("当前命中模型"), "命中模型摘要应移除当前命中模型字段"); assert(!sidebar.includes("排查记录摘要"), "侧栏应移除排查记录摘要"); assert(!sidebar.includes("position: sticky"), "左侧整卡不应保持固定"); -assert(!sidebar.includes("border: 1px solid #e2e8f0"), "左右区域合并后左侧不应保留独立卡片边框"); -assert(!sidebar.includes("justify-content: space-between"), "不应继续以表单式左右对齐作为主体布局"); +assert(!sidebar.includes("border-radius: 20px"), "侧栏不应继续保留旧圆角卡片样式"); +assert(!sidebar.includes("background: rgba(255, 255, 255, 0.9)"), "侧栏不应继续保留旧半透明卡片底色"); assert(!sidebar.includes("关系人画像"), "侧栏不应扩展到额外区块"); assert(!sidebar.includes("资产分布"), "侧栏不应扩展到额外区块"); @@ -50,7 +54,7 @@ assert(!sidebar.includes("资产分布"), "侧栏不应扩展到额外区块"); [ "this.detailData && this.detailData.basicInfo", "...(this.modelSummary || {})", - "align-items: flex-start", + "align-items: flex-end", ].forEach((token) => assert(dialog.includes(token), token)); assert(entry.includes(':model-summary="projectAnalysisModelSummary"'), "入口页应继续透传模型摘要"); From 369c6825648e433eb5473c3fe0cb788f39d33833 Mon Sep 17 00:00:00 2001 From: wjj <2069666735@qq.com> Date: Thu, 30 Apr 2026 16:01:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=80=BB=E8=A7=88=E4=B8=80=E9=94=AE=E5=AF=BC=E5=87=BA=E6=8A=A5?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ccdi-project/pom.xml | 6 + .../CcdiProjectOverviewController.java | 11 + ...diProjectOverviewReportModelSummaryVO.java | 20 + .../vo/CcdiProjectOverviewReportParamVO.java | 20 + ...OverviewReportSuspiciousTransactionVO.java | 35 + ...iProjectOverviewReportUploadSubjectVO.java | 22 + .../vo/CcdiProjectOverviewReportVO.java | 33 + .../mapper/CcdiProjectOverviewMapper.java | 37 ++ .../service/ICcdiProjectOverviewService.java | 9 + .../CcdiProjectOverviewReportPdfExporter.java | 603 ++++++++++++++++++ .../impl/CcdiProjectOverviewServiceImpl.java | 68 ++ .../project/CcdiProjectOverviewMapper.xml | 147 +++++ ...ProjectOverviewControllerContractTest.java | 22 + ...iProjectOverviewReportPdfExporterTest.java | 152 +++++ pom.xml | 8 + ruoyi-ui/src/api/ccdi/projectOverview.js | 9 + .../components/detail/PreliminaryCheck.vue | 26 + .../preliminary-check-summary-actions.test.js | 14 + .../tests/unit/project-overview-api.test.js | 14 + 19 files changed, 1256 insertions(+) create mode 100644 ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportModelSummaryVO.java create mode 100644 ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportParamVO.java create mode 100644 ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportSuspiciousTransactionVO.java create mode 100644 ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportUploadSubjectVO.java create mode 100644 ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportVO.java create mode 100644 ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewReportPdfExporter.java create mode 100644 ccdi-project/src/test/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewReportPdfExporterTest.java diff --git a/ccdi-project/pom.xml b/ccdi-project/pom.xml index 77febc35..37eb6a99 100644 --- a/ccdi-project/pom.xml +++ b/ccdi-project/pom.xml @@ -49,6 +49,12 @@ easyexcel + + + org.apache.pdfbox + pdfbox + + org.springframework.boot diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/controller/CcdiProjectOverviewController.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/controller/CcdiProjectOverviewController.java index 605fe824..2bbc9e4d 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/controller/CcdiProjectOverviewController.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/controller/CcdiProjectOverviewController.java @@ -29,6 +29,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -181,4 +182,14 @@ public class CcdiProjectOverviewController extends BaseController { public void exportRiskDetails(HttpServletResponse response, Long projectId) { overviewService.exportRiskDetails(response, projectId); } + + /** + * 一键导出结果总览报告 + */ + @RequestMapping(value = "/report/export", method = { RequestMethod.GET, RequestMethod.POST }) + @Operation(summary = "一键导出结果总览报告") + @PreAuthorize("@ss.hasPermi('ccdi:project:query')") + public void exportOverviewReport(HttpServletResponse response, Long projectId) { + overviewService.exportOverviewReport(response, projectId); + } } diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportModelSummaryVO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportModelSummaryVO.java new file mode 100644 index 00000000..792cef84 --- /dev/null +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportModelSummaryVO.java @@ -0,0 +1,20 @@ +package com.ruoyi.ccdi.project.domain.vo; + +import lombok.Data; + +/** + * 结果总览报告风险模型汇总 + */ +@Data +public class CcdiProjectOverviewReportModelSummaryVO { + + private String modelCode; + + private String modelName; + + private Integer warningCount; + + private Integer peopleCount; + + private String peopleNames; +} diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportParamVO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportParamVO.java new file mode 100644 index 00000000..4fce77d3 --- /dev/null +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportParamVO.java @@ -0,0 +1,20 @@ +package com.ruoyi.ccdi.project.domain.vo; + +import lombok.Data; + +/** + * 结果总览报告参数配置项 + */ +@Data +public class CcdiProjectOverviewReportParamVO { + + private String modelName; + + private String paramName; + + private String paramValue; + + private String paramUnit; + + private String paramDesc; +} diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportSuspiciousTransactionVO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportSuspiciousTransactionVO.java new file mode 100644 index 00000000..44d28923 --- /dev/null +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportSuspiciousTransactionVO.java @@ -0,0 +1,35 @@ +package com.ruoyi.ccdi.project.domain.vo; + +import java.math.BigDecimal; +import lombok.Data; + +/** + * 结果总览报告涉疑交易明细 + */ +@Data +public class CcdiProjectOverviewReportSuspiciousTransactionVO { + + private Long bankStatementId; + + private String trxDate; + + private String leAccountNo; + + private String leAccountName; + + private String customerAccountName; + + private String customerAccountNo; + + private String relatedStaffName; + + private String relatedStaffCode; + + private String userMemo; + + private String cashType; + + private String hitTags; + + private BigDecimal displayAmount; +} diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportUploadSubjectVO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportUploadSubjectVO.java new file mode 100644 index 00000000..98da9f5b --- /dev/null +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportUploadSubjectVO.java @@ -0,0 +1,22 @@ +package com.ruoyi.ccdi.project.domain.vo; + +import lombok.Data; + +/** + * 结果总览报告上传主体汇总 + */ +@Data +public class CcdiProjectOverviewReportUploadSubjectVO { + + private String subjectName; + + private String accountNos; + + private String minTrxDate; + + private String maxTrxDate; + + private Integer fileCount; + + private String dataPeriod; +} diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportVO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportVO.java new file mode 100644 index 00000000..fa7b0576 --- /dev/null +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiProjectOverviewReportVO.java @@ -0,0 +1,33 @@ +package com.ruoyi.ccdi.project.domain.vo; + +import com.ruoyi.ccdi.project.domain.CcdiProject; +import com.ruoyi.ccdi.project.domain.excel.CcdiProjectAbnormalAccountExcel; +import com.ruoyi.ccdi.project.domain.excel.CcdiProjectEmployeeCreditNegativeExcel; +import java.util.ArrayList; +import java.util.List; +import lombok.Data; + +/** + * 结果总览一键导出报告 + */ +@Data +public class CcdiProjectOverviewReportVO { + + private CcdiProject project; + + private List uploadSubjects = new ArrayList<>(); + + private List params = new ArrayList<>(); + + private CcdiProjectOverviewDashboardVO dashboard = new CcdiProjectOverviewDashboardVO(); + + private List modelSummaries = new ArrayList<>(); + + private List riskPeople = new ArrayList<>(); + + private List suspiciousTransactions = new ArrayList<>(); + + private List illegalPeople = new ArrayList<>(); + + private List abnormalAccounts = new ArrayList<>(); +} diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiProjectOverviewMapper.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiProjectOverviewMapper.java index 496d145c..4fb4b43a 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiProjectOverviewMapper.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiProjectOverviewMapper.java @@ -13,6 +13,9 @@ import com.ruoyi.ccdi.project.domain.vo.CcdiProjectEmployeeCreditNegativeItemVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectEmployeeRiskAggregateVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectPersonAnalysisBasicInfoVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectPersonAnalysisObjectRecordVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportModelSummaryVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportSuspiciousTransactionVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportUploadSubjectVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectRiskHitTagVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectRiskModelCardVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectRiskModelPeopleItemVO; @@ -72,6 +75,40 @@ public interface CcdiProjectOverviewMapper { */ List selectRiskModelCardsByProjectId(@Param("projectId") Long projectId); + /** + * 查询报告上传主体汇总 + * + * @param projectId 项目ID + * @return 上传主体汇总 + */ + List selectReportUploadSubjects(@Param("projectId") Long projectId); + + /** + * 查询报告风险模型汇总 + * + * @param projectId 项目ID + * @return 风险模型汇总 + */ + List selectReportRiskModelSummaries(@Param("projectId") Long projectId); + + /** + * 查询报告风险人员与异常点 + * + * @param projectId 项目ID + * @return 风险人员与异常点 + */ + List selectReportRiskPeople(@Param("projectId") Long projectId); + + /** + * 查询报告涉疑交易明细 + * + * @param query 查询条件 + * @return 涉疑交易明细 + */ + List selectReportSuspiciousTransactionList( + @Param("query") CcdiProjectSuspiciousTransactionQueryDTO query + ); + /** * 分页查询风险模型命中人员 * diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/ICcdiProjectOverviewService.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/ICcdiProjectOverviewService.java index 854906b4..4c53fc5f 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/ICcdiProjectOverviewService.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/ICcdiProjectOverviewService.java @@ -125,6 +125,15 @@ public interface ICcdiProjectOverviewService { default void exportRiskDetails(HttpServletResponse response, Long projectId) { } + /** + * 一键导出结果总览报告 + * + * @param response 响应流 + * @param projectId 项目ID + */ + default void exportOverviewReport(HttpServletResponse response, Long projectId) { + } + /** * 导出项目员工负面征信 * diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewReportPdfExporter.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewReportPdfExporter.java new file mode 100644 index 00000000..9310d10f --- /dev/null +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewReportPdfExporter.java @@ -0,0 +1,603 @@ +package com.ruoyi.ccdi.project.service.impl; + +import com.ruoyi.ccdi.project.domain.excel.CcdiProjectAbnormalAccountExcel; +import com.ruoyi.ccdi.project.domain.excel.CcdiProjectEmployeeCreditNegativeExcel; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportModelSummaryVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportParamVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportSuspiciousTransactionVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportUploadSubjectVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewStatVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectRiskHitTagVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectRiskModelPeopleItemVO; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.file.FileUtils; +import jakarta.servlet.http.HttpServletResponse; +import java.awt.Color; +import java.io.File; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; +import org.apache.fontbox.ttf.TrueTypeCollection; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.pdmodel.PDPageContentStream; +import org.apache.pdfbox.pdmodel.common.PDRectangle; +import org.apache.pdfbox.pdmodel.font.PDType0Font; +import org.springframework.stereotype.Component; + +/** + * 结果总览PDF报告导出器 + */ +@Component +public class CcdiProjectOverviewReportPdfExporter { + + private static final String CONTENT_TYPE = "application/pdf"; + private static final DateTimeFormatter EXPORT_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + private static final DecimalFormat MONEY_FORMAT = new DecimalFormat("#,##0.00"); + + public void export(HttpServletResponse response, CcdiProjectOverviewReportVO report) throws IOException { + response.setContentType(CONTENT_TYPE); + FileUtils.setAttachmentResponseHeader( + response, + safeFileName(report.getProject().getProjectName()) + "_初核结果报告.pdf" + ); + + try (PDDocument document = new PDDocument()) { + PDType0Font font = loadChineseFont(document); + PdfPageWriter writer = new PdfPageWriter(document, font); + writer.newPage(); + writeCover(writer, report); + writeUploadSubjects(writer, report.getUploadSubjects()); + writeParams(writer, report.getParams()); + writeRiskModels(writer, report); + writeRiskDetails(writer, report); + writer.close(); + document.save(response.getOutputStream()); + } + } + + private void writeCover(PdfPageWriter writer, CcdiProjectOverviewReportVO report) throws IOException { + writer.title("初核结果报告"); + writer.text("项目名称：" + safeText(report.getProject().getProjectName()), 12, Color.GRAY); + writer.text("导出时间：" + LocalDateTime.now().format(EXPORT_TIME_FORMATTER), 12, Color.GRAY); + writer.separator(); + } + + private void writeUploadSubjects( + PdfPageWriter writer, + List rows + ) throws IOException { + writer.section("一、上传文件"); + writer.table( + List.of("序号", "主体名称", "主体账号", "数据周期", "文件数"), + indexedRows(rows).stream() + .map(item -> List.of( + item.index(), + safeText(item.row().getSubjectName()), + maskAccountList(item.row().getAccountNos()), + safeText(item.row().getDataPeriod()), + formatCount(item.row().getFileCount(), "个") + )) + .collect(Collectors.toList()), + new float[] { 0.07F, 0.2F, 0.45F, 0.14F, 0.14F }, + "暂无上传文件数据" + ); + } + + private void writeParams(PdfPageWriter writer, List rows) throws IOException { + writer.section("二、参数配置"); + writer.table( + List.of("模型名称", "监测项", "参数值", "单位", "描述"), + rows.stream() + .map(item -> List.of( + safeText(item.getModelName()), + safeText(item.getParamName()), + safeText(item.getParamValue()), + safeText(item.getParamUnit()), + safeText(item.getParamDesc()) + )) + .collect(Collectors.toList()), + new float[] { 0.18F, 0.26F, 0.14F, 0.12F, 0.3F }, + "暂无参数配置数据" + ); + } + + private void writeRiskModels(PdfPageWriter writer, CcdiProjectOverviewReportVO report) throws IOException { + writer.section("三、风险模型"); + writer.metrics(report.getDashboard().getStats()); + writer.subsection("风险模型汇总"); + writer.table( + List.of("模型名称", "预警数量", "涉及人员"), + report.getModelSummaries().stream() + .map(item -> List.of( + safeText(item.getModelName()), + String.valueOf(defaultZero(item.getWarningCount())), + formatPeopleSummary(item) + )) + .collect(Collectors.toList()), + new float[] { 0.26F, 0.14F, 0.6F }, + "暂无风险模型汇总数据" + ); + + writer.subsection("风险人员与异常点"); + writer.table( + List.of("姓名", "工号", "身份证号", "所属部门", "命中模型", "异常标签"), + report.getRiskPeople().stream() + .map(item -> List.of( + safeText(item.getStaffName()), + safeText(item.getStaffCode()), + maskIdCard(item.getIdNo()), + safeText(item.getDepartment()), + joinText(item.getModelNames()), + formatHitTags(item.getHitTagList()) + )) + .collect(Collectors.toList()), + new float[] { 0.1F, 0.11F, 0.16F, 0.14F, 0.24F, 0.25F }, + "暂无风险人员与异常点数据" + ); + } + + private void writeRiskDetails(PdfPageWriter writer, CcdiProjectOverviewReportVO report) throws IOException { + writer.section("四、风险明细"); + writer.subsection("1. 涉疑交易明细表（共" + report.getSuspiciousTransactions().size() + "条）"); + writer.table( + List.of("交易时间", "本方账户", "对方账户", "关联员工", "摘要/交易类型", "异常标签", "交易金额"), + report.getSuspiciousTransactions().stream() + .map(item -> List.of( + safeText(item.getTrxDate()), + formatAccount(item.getLeAccountNo(), item.getLeAccountName()), + formatAccount(item.getCustomerAccountNo(), item.getCustomerAccountName()), + formatRelatedStaff(item.getRelatedStaffName(), item.getRelatedStaffCode()), + formatSummaryAndCashType(item.getUserMemo(), item.getCashType()), + safeText(item.getHitTags()), + formatMoney(item.getDisplayAmount()) + )) + .collect(Collectors.toList()), + new float[] { 0.14F, 0.16F, 0.16F, 0.12F, 0.17F, 0.16F, 0.09F }, + "暂无涉疑交易明细" + ); + + writer.subsection("2. 违法信息人员表（共" + report.getIllegalPeople().size() + "人）"); + writer.table( + List.of("姓名", "身份证号", "最近查询日期", "民事案件笔数", "民事案件金额", "强制执行笔数", "强制执行金额", "行政处罚笔数", "行政处罚金额"), + report.getIllegalPeople().stream() + .map(item -> List.of( + safeText(item.getPersonName()), + maskIdCard(item.getPersonId()), + safeText(item.getQueryDate()), + String.valueOf(defaultZero(item.getCivilCnt())), + formatMoney(item.getCivilLmt()), + String.valueOf(defaultZero(item.getEnforceCnt())), + formatMoney(item.getEnforceLmt()), + String.valueOf(defaultZero(item.getAdmCnt())), + formatMoney(item.getAdmLmt()) + )) + .collect(Collectors.toList()), + new float[] { 0.09F, 0.15F, 0.12F, 0.1F, 0.11F, 0.1F, 0.11F, 0.1F, 0.12F }, + "暂无违法信息人员数据" + ); + + writer.subsection("3. 异常账户信息表（共" + report.getAbnormalAccounts().size() + "条）"); + writer.table( + List.of("账号", "开户人", "银行", "异常类型", "异常发生时间", "状态"), + report.getAbnormalAccounts().stream() + .map(item -> List.of( + maskAccount(item.getAccountNo()), + safeText(item.getAccountName()), + safeText(item.getBankName()), + safeText(item.getAbnormalType()), + safeText(item.getAbnormalTime()), + safeText(item.getStatus()) + )) + .collect(Collectors.toList()), + new float[] { 0.18F, 0.13F, 0.2F, 0.23F, 0.14F, 0.12F }, + "暂无异常账户信息" + ); + } + + private PDType0Font loadChineseFont(PDDocument document) throws IOException { + List candidates = List.of( + "C:/Windows/Fonts/NotoSansSC-VF.ttf", + "C:/Windows/Fonts/simhei.ttf", + "C:/Windows/Fonts/simsunb.ttf", + "/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttf", + "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttf", + "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc" + ); + for (String path : candidates) { + File file = new File(path); + if (!file.exists() || !file.isFile()) { + continue; + } + String lowerPath = path.toLowerCase(); + if (lowerPath.endsWith(".ttf")) { + return PDType0Font.load(document, file); + } + if (lowerPath.endsWith(".ttc")) { + PDType0Font font = loadFirstCollectionFont(document, file); + if (font != null) { + return font; + } + } + } + throw new ServiceException("未找到可用中文字体，无法导出PDF报告"); + } + + private PDType0Font loadFirstCollectionFont(PDDocument document, File file) throws IOException { + AtomicReference font = new AtomicReference<>(); + try (TrueTypeCollection collection = new TrueTypeCollection(file)) { + collection.processAllFonts(typeFont -> { + if (font.get() == null) { + font.set(PDType0Font.load(document, typeFont, true)); + } + }); + } + return font.get(); + } + + private List indexedRows(List rows) { + List result = new ArrayList<>(); + for (int i = 0; i < rows.size(); i++) { + result.add(new IndexedUploadSubject(String.valueOf(i + 1), rows.get(i))); + } + return result; + } + + private String formatPeopleSummary(CcdiProjectOverviewReportModelSummaryVO item) { + String names = safeText(item.getPeopleNames()); + if ("-".equals(names)) { + return names; + } + List people = Arrays.stream(names.split("、")) + .filter(value -> value != null && !value.isBlank()) + .distinct() + .toList(); + if (people.size() <= 4) { + return String.join("、", people); + } + return String.join("、", people.subList(0, 4)) + "等" + defaultZero(item.getPeopleCount()) + "人"; + } + + private String formatHitTags(List tags) { + if (tags == null || tags.isEmpty()) { + return "-"; + } + String text = tags.stream() + .map(CcdiProjectRiskHitTagVO::getRuleName) + .filter(Objects::nonNull) + .filter(value -> !value.isBlank()) + .distinct() + .collect(Collectors.joining("、")); + return text.isBlank() ? "-" : text; + } + + private String joinText(List values) { + if (values == null || values.isEmpty()) { + return "-"; + } + String text = values.stream() + .filter(Objects::nonNull) + .filter(value -> !value.isBlank()) + .distinct() + .collect(Collectors.joining("、")); + return text.isBlank() ? "-" : text; + } + + private String formatRelatedStaff(String name, String code) { + if (name == null || name.isBlank()) { + return "-"; + } + if (code == null || code.isBlank()) { + return name; + } + return name + "(" + code + ")"; + } + + private String formatSummaryAndCashType(String summary, String cashType) { + return safeText(summary) + "/" + safeText(cashType); + } + + private String formatAccount(String accountNo, String accountName) { + String masked = maskAccount(accountNo); + String name = safeText(accountName); + if ("-".equals(name)) { + return masked; + } + return masked + "\n" + name; + } + + private String maskAccountList(String value) { + if (value == null || value.isBlank()) { + return "-"; + } + return Arrays.stream(value.split("、|,|，")) + .map(String::trim) + .filter(item -> !item.isBlank()) + .map(this::maskAccount) + .distinct() + .collect(Collectors.joining("、")); + } + + private String maskAccount(String value) { + if (value == null || value.isBlank()) { + return "-"; + } + String text = value.trim().replaceAll("\\s+", ""); + if (text.length() <= 8) { + return text.length() <= 4 ? text : text.substring(0, 2) + "****" + text.substring(text.length() - 2); + } + return text.substring(0, 4) + "****" + text.substring(text.length() - 4); + } + + private String maskIdCard(String value) { + if (value == null || value.isBlank()) { + return "-"; + } + String text = value.trim(); + if (text.length() < 10) { + return text; + } + return text.substring(0, 3) + "***********" + text.substring(text.length() - 4); + } + + private String formatCount(Integer value, String unit) { + return defaultZero(value) + unit; + } + + private String formatMoney(BigDecimal value) { + if (value == null) { + return "-"; + } + return MONEY_FORMAT.format(value); + } + + private Integer defaultZero(Integer value) { + return value == null ? 0 : value; + } + + private String safeText(String value) { + return value == null || value.isBlank() ? "-" : value; + } + + private String safeFileName(String value) { + String text = safeText(value); + return text.replaceAll("[\\\\/:*?\"<>|]", "_"); + } + + private record IndexedUploadSubject(String index, CcdiProjectOverviewReportUploadSubjectVO row) { + } + + private static class PdfPageWriter { + + private static final float MARGIN = 36F; + private static final PDRectangle LANDSCAPE_A4 = new PDRectangle( + PDRectangle.A4.getHeight(), + PDRectangle.A4.getWidth() + ); + private static final float CONTENT_WIDTH = LANDSCAPE_A4.getWidth() - MARGIN * 2; + private static final float PAGE_TOP = LANDSCAPE_A4.getHeight() - MARGIN; + private static final float PAGE_BOTTOM = MARGIN; + private static final float BODY_FONT_SIZE = 9F; + private static final float HEADER_FONT_SIZE = 9F; + private static final float TITLE_FONT_SIZE = 22F; + private static final float SECTION_FONT_SIZE = 15F; + private static final float SUBSECTION_FONT_SIZE = 12F; + private static final float LINE_HEIGHT = 12F; + private static final float CELL_PADDING = 5F; + + private final PDDocument document; + private final PDType0Font font; + private PDPageContentStream content; + private float y; + + PdfPageWriter(PDDocument document, PDType0Font font) { + this.document = document; + this.font = font; + } + + void newPage() throws IOException { + close(); + PDPage page = new PDPage(LANDSCAPE_A4); + document.addPage(page); + content = new PDPageContentStream(document, page); + y = PAGE_TOP; + } + + void close() throws IOException { + if (content != null) { + content.close(); + content = null; + } + } + + void title(String text) throws IOException { + writeLine(text, TITLE_FONT_SIZE, new Color(18, 56, 93), 0F, 28F); + } + + void text(String text, float fontSize, Color color) throws IOException { + writeLine(text, fontSize, color, 0F, 18F); + } + + void section(String text) throws IOException { + ensureSpace(32F); + writeLine(text, SECTION_FONT_SIZE, new Color(18, 56, 93), 0F, 26F); + } + + void subsection(String text) throws IOException { + ensureSpace(26F); + writeLine(text, SUBSECTION_FONT_SIZE, new Color(51, 65, 85), 0F, 22F); + } + + void separator() throws IOException { + ensureSpace(16F); + content.setStrokingColor(new Color(31, 78, 121)); + content.setLineWidth(1.4F); + content.moveTo(MARGIN, y); + content.lineTo(MARGIN + CONTENT_WIDTH, y); + content.stroke(); + y -= 22F; + } + + void metrics(List stats) throws IOException { + ensureSpace(58F); + float cellWidth = CONTENT_WIDTH / Math.max(stats.size(), 1); + float x = MARGIN; + float rowHeight = 50F; + for (CcdiProjectOverviewStatVO stat : stats) { + drawRect(x, y - rowHeight, cellWidth, rowHeight, null); + drawCenteredText(String.valueOf(stat.getValue()), x, y - 18F, cellWidth, 18F, new Color(31, 78, 121)); + drawCenteredText(stat.getLabel(), x, y - 36F, cellWidth, 10F, Color.GRAY); + x += cellWidth; + } + y -= rowHeight + 18F; + } + + void table( + List headers, + List> rows, + float[] widthRatios, + String emptyText + ) throws IOException { + List> safeRows = rows.isEmpty() + ? List.of(List.of(emptyText)) + : rows; + List safeHeaders = rows.isEmpty() + ? List.of(headers.get(0)) + : headers; + float[] widths = rows.isEmpty() + ? new float[] { CONTENT_WIDTH } + : calculateWidths(widthRatios); + + drawHeader(safeHeaders, widths); + for (List row : safeRows) { + drawRow(row, widths, false); + } + y -= 8F; + } + + private float[] calculateWidths(float[] ratios) { + float[] widths = new float[ratios.length]; + for (int i = 0; i < ratios.length; i++) { + widths[i] = CONTENT_WIDTH * ratios[i]; + } + return widths; + } + + private void drawHeader(List headers, float[] widths) throws IOException { + drawRow(headers, widths, true); + } + + private void drawRow(List cells, float[] widths, boolean header) throws IOException { + List> wrappedCells = new ArrayList<>(); + float rowHeight = 0F; + for (int i = 0; i < widths.length; i++) { + String text = i < cells.size() ? cells.get(i) : ""; + List lines = wrapText(text, widths[i] - CELL_PADDING * 2, header ? HEADER_FONT_SIZE : BODY_FONT_SIZE); + wrappedCells.add(lines); + rowHeight = Math.max(rowHeight, lines.size() * LINE_HEIGHT + CELL_PADDING * 2); + } + rowHeight = Math.max(rowHeight, 24F); + ensureSpace(rowHeight + 4F); + + float x = MARGIN; + for (int i = 0; i < widths.length; i++) { + Color background = header ? new Color(234, 241, 248) : null; + drawRect(x, y - rowHeight, widths[i], rowHeight, background); + drawCellText(wrappedCells.get(i), x + CELL_PADDING, y - CELL_PADDING - (header ? HEADER_FONT_SIZE : BODY_FONT_SIZE), header); + x += widths[i]; + } + y -= rowHeight; + } + + private void drawRect(float x, float bottomY, float width, float height, Color fill) throws IOException { + if (fill != null) { + content.setNonStrokingColor(fill); + content.addRect(x, bottomY, width, height); + content.fill(); + } + content.setStrokingColor(new Color(205, 217, 229)); + content.setLineWidth(0.5F); + content.addRect(x, bottomY, width, height); + content.stroke(); + } + + private void drawCellText(List lines, float x, float startY, boolean header) throws IOException { + content.beginText(); + content.setNonStrokingColor(header ? new Color(24, 59, 90) : new Color(31, 41, 55)); + content.setFont(font, header ? HEADER_FONT_SIZE : BODY_FONT_SIZE); + content.newLineAtOffset(x, startY); + for (int i = 0; i < lines.size(); i++) { + if (i > 0) { + content.newLineAtOffset(0, -LINE_HEIGHT); + } + content.showText(lines.get(i)); + } + content.endText(); + } + + private void drawCenteredText(String text, float x, float baselineY, float width, float fontSize, Color color) + throws IOException { + float textWidth = textWidth(text, fontSize); + content.beginText(); + content.setNonStrokingColor(color); + content.setFont(font, fontSize); + content.newLineAtOffset(x + (width - textWidth) / 2F, baselineY); + content.showText(text); + content.endText(); + } + + private void writeLine(String text, float fontSize, Color color, float indent, float advance) throws IOException { + ensureSpace(advance); + content.beginText(); + content.setNonStrokingColor(color); + content.setFont(font, fontSize); + content.newLineAtOffset(MARGIN + indent, y); + content.showText(text); + content.endText(); + y -= advance; + } + + private void ensureSpace(float height) throws IOException { + if (y - height < PAGE_BOTTOM) { + newPage(); + } + } + + private List wrapText(String text, float maxWidth, float fontSize) throws IOException { + String safeText = text == null || text.isBlank() ? "-" : text; + List result = new ArrayList<>(); + for (String part : safeText.split("\\n")) { + wrapPart(part, maxWidth, fontSize, result); + } + return result.isEmpty() ? List.of("-") : result; + } + + private void wrapPart(String text, float maxWidth, float fontSize, List result) throws IOException { + StringBuilder current = new StringBuilder(); + for (int i = 0; i < text.length(); i++) { + String next = String.valueOf(text.charAt(i)); + if (textWidth(current + next, fontSize) > maxWidth && current.length() > 0) { + result.add(current.toString()); + current.setLength(0); + } + current.append(next); + } + if (current.length() > 0) { + result.add(current.toString()); + } + } + + private float textWidth(String text, float fontSize) throws IOException { + return font.getStringWidth(text) / 1000F * fontSize; + } + } +} diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java index ab6570f8..2747e5e1 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectOverviewServiceImpl.java @@ -26,6 +26,8 @@ import com.ruoyi.ccdi.project.domain.vo.CcdiProjectPersonAnalysisBasicInfoVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectPersonAnalysisObjectRecordVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectEmployeeRiskAggregateVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewDashboardVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportParamVO; +import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewReportVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewEmployeeHitRowVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectOverviewStatVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectRiskModelCardsVO; @@ -37,15 +39,18 @@ import com.ruoyi.ccdi.project.domain.vo.CcdiProjectSuspiciousTransactionItemVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectSuspiciousTransactionPageVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectTopRiskPeopleItemVO; import com.ruoyi.ccdi.project.domain.vo.CcdiProjectTopRiskPeopleVO; +import com.ruoyi.ccdi.project.domain.vo.ModelParamAllVO; import com.ruoyi.ccdi.project.mapper.CcdiProjectMapper; import com.ruoyi.ccdi.project.mapper.CcdiBankTagResultMapper; import com.ruoyi.ccdi.project.mapper.CcdiProjectOverviewEmployeeResultMapper; import com.ruoyi.ccdi.project.mapper.CcdiProjectOverviewMapper; +import com.ruoyi.ccdi.project.service.ICcdiModelParamService; import com.ruoyi.ccdi.project.service.ICcdiProjectOverviewService; import com.ruoyi.common.exception.ServiceException; import jakarta.servlet.http.HttpServletResponse; import jakarta.annotation.Resource; import java.io.IOException; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; @@ -81,6 +86,12 @@ public class CcdiProjectOverviewServiceImpl implements ICcdiProjectOverviewServi @Resource private CcdiProjectRiskDetailWorkbookExporter workbookExporter; + @Resource + private CcdiProjectOverviewReportPdfExporter reportPdfExporter; + + @Resource + private ICcdiModelParamService modelParamService; + @Override public CcdiProjectOverviewDashboardVO getDashboard(Long projectId) { CcdiProject project = overviewMapper.selectDashboardBaseByProjectId(projectId); @@ -303,6 +314,38 @@ public class CcdiProjectOverviewServiceImpl implements ICcdiProjectOverviewServi } } + @Override + public void exportOverviewReport(HttpServletResponse response, Long projectId) { + CcdiProject project = getRequiredProject(projectId); + + CcdiProjectSuspiciousTransactionQueryDTO suspiciousQuery = new CcdiProjectSuspiciousTransactionQueryDTO(); + suspiciousQuery.setProjectId(projectId); + suspiciousQuery.setSuspiciousType("ALL"); + + CcdiProjectOverviewReportVO report = new CcdiProjectOverviewReportVO(); + report.setProject(project); + report.setDashboard(getDashboard(projectId)); + report.setUploadSubjects(defaultList(overviewMapper.selectReportUploadSubjects(projectId)).stream() + .peek(item -> item.setDataPeriod(formatDataPeriod(item.getMinTrxDate(), item.getMaxTrxDate()))) + .toList()); + report.setParams(buildReportParams(projectId)); + report.setModelSummaries(defaultList(overviewMapper.selectReportRiskModelSummaries(projectId))); + report.setRiskPeople(defaultList(overviewMapper.selectReportRiskPeople(projectId)).stream() + .peek(item -> item.setActionLabel(ACTION_LABEL)) + .toList()); + report.setSuspiciousTransactions(defaultList( + overviewMapper.selectReportSuspiciousTransactionList(suspiciousQuery) + )); + report.setIllegalPeople(exportEmployeeCreditNegative(projectId)); + report.setAbnormalAccounts(exportAbnormalAccountPeople(projectId)); + + try { + reportPdfExporter.export(response, report); + } catch (IOException e) { + throw new ServiceException("导出结果总览报告失败"); + } + } + @Override public List exportEmployeeCreditNegative(Long projectId) { ensureProjectExists(projectId); @@ -511,6 +554,31 @@ public class CcdiProjectOverviewServiceImpl implements ICcdiProjectOverviewServi return row; } + private List buildReportParams(Long projectId) { + ModelParamAllVO response = modelParamService.selectAllParams(projectId); + return defaultList(response == null ? null : response.getModels()).stream() + .flatMap(model -> defaultList(model.getParams()).stream().map(param -> { + CcdiProjectOverviewReportParamVO row = new CcdiProjectOverviewReportParamVO(); + row.setModelName(model.getModelName()); + row.setParamName(param.getParamName()); + row.setParamValue(param.getParamValue()); + row.setParamUnit(param.getParamUnit()); + row.setParamDesc(param.getParamDesc()); + return row; + })) + .toList(); + } + + private String formatDataPeriod(String minTrxDate, String maxTrxDate) { + if (minTrxDate == null || minTrxDate.isBlank() || maxTrxDate == null || maxTrxDate.isBlank()) { + return "-"; + } + LocalDate start = LocalDate.parse(minTrxDate); + LocalDate end = LocalDate.parse(maxTrxDate); + int months = (end.getYear() - start.getYear()) * 12 + end.getMonthValue() - start.getMonthValue() + 1; + return Math.max(months, 1) + "个月"; + } + private String formatRelatedStaff(String relatedStaffName, String relatedStaffCode) { if (relatedStaffName == null || relatedStaffName.isBlank()) { return null; diff --git a/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml index 68d9fe13..84344fdd 100644 --- a/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml +++ b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml @@ -57,6 +57,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select 0 as digit union all select 1 @@ -338,6 +372,87 @@ order by warning_count desc, model_code asc + + + + + + + +