sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
371 Commits 1 Branch 0 Tags
a88ea47b5aaee13bbf406138bf31828ab5d58814
Commit Graph
371 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ye1023 e39f39eba9 yxk-20260702-党委会导入导出功能优化 2026-07-02 10:01:31 +08:00
wsm eb581e069c !64 feat(excel): BgPartymatter/BgTakepulse Controller 适配 ExcelColumn 导入导出 
* feat(excel): BgPartymatter/BgTakepulse Controller 适配 ExcelColumn 导入导出
* feat(excel): BgPartymatter/BgTakepulse 实体补充 ExcelColumn 导入导出注解
 2026-07-01 11:39:33 +00:00
wsm d6baa52d9f !63 fix(bpm): 修复节点默认审批意见 MyBatis 查询缺失列，补充条件变量原始字段返回 
* fix(bpm): 修复节点默认审批意见 MyBatis 查询缺失列，补充条件变量原始字段返回
* feat(bpm): 流程节点支持配置默认审批意见，按条件变量动态选择
 2026-07-01 11:05:50 +00:00
wsmandGitee a062f22aab !62 fix(excel): 修复日期格式不兼容和导入异常未上报的问题 
Merge pull request !62 from wsm/fix/excel_time_import
 2026-06-30 08:25:59 +00:00
wsmandClaude Opus 4.7 9a41d07f14 fix(excel): 修复日期格式不兼容和导入异常未上报的问题 
- 新增弹性日期解析，兼容 yyyy/MM/dd、yyyy/M/d、yyyy.M.d 等 Excel 常见日期变体
- 系统异常时调用 handleError 上报错误，防止前端误报导入成功

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-30 16:25:06 +08:00
陈志浩andGitee 2c8f64b902 !61 czh-20260630-优化计划，增加分页、滚动加载等 
Merge pull request !61 from 陈志浩/refactor/tasklist-20260630
 2026-06-30 08:17:03 +00:00
zhihao 9988423ae7 czh-20260630-优化计划，增加分页、滚动加载等 2026-06-30 16:15:34 +08:00
陈志浩andGitee e18476ce5b !60 czh-20260630-优化查询；防止清空日期 
Merge pull request !60 from 陈志浩/fix/tasklist-20260630
 2026-06-30 06:13:29 +00:00
zhihao 0dde93139f czh-20260630-优化查询；防止清空日期 2026-06-30 12:09:14 +08:00
wsmandGitee 97a2a69001 !59 feat(inspectimprove): 实体添加ExcelColumn注解，新增EasyExcel导入和校验接口 
Merge pull request !59 from wsm/feature/excel_val
 2026-06-30 02:36:46 +00:00
wsmandClaude Opus 4.7 adcb72c3d2 feat(inspectimprove): 实体添加ExcelColumn注解，新增EasyExcel导入和校验接口 
- DjInspectImprove 实体所有@Excel字段补全@ExcelColumn注解
- DjInspectImproveController 新增/importExcelByEasyExcel和/checkExcelByEasyExcel接口

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-30 10:29:46 +08:00
wsmandClaude Opus 4.7 16343d2e99 feat(xispeak): 新增Excel校验接口，只校验不保存到数据库 
- JeecgController 新增 checkExcelByEasyExcel 基类方法，batchHandler 传 null 跳过入库
- ExcelImportListener 支持 batchHandler 为 null 时不攒 batch 内存
- BgXiSpeakController 新增 /checkExcelByEasyExcel 接口

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-30 10:05:13 +08:00
wsmandGitee d59adeeaf7 !58 fix(system): 用户部门查询结果按sortno升序排列 
Merge pull request !58 from wsm/fix/return_peoplo_by_order
 2026-06-29 09:04:24 +00:00
wsmandClaude Opus 4.7 4965f180f6 fix(system): 用户部门查询结果按sortno升序排列 
queryUserByDepCode方法在去重后按sortno升序排序，越小优先级越高。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-29 17:03:07 +08:00
wsmandGitee 770b125023 !57 fix(system): 用户部门查询改用LinkedHashMap保持插入顺序 
Merge pull request !57 from wsm/fix/return_peoplo_by_order
 2026-06-29 08:13:55 +00:00
wsmandClaude Opus 4.7 fd5492175d fix(system): 用户部门查询改用LinkedHashMap保持插入顺序 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-29 16:11:52 +08:00
wsmandGitee a73db8b58c !56 fix(bpm): 修复variablesMap在lambda中非effectively final的编译错误 
Merge pull request !56 from wsm/feature/dept_filter
 2026-06-29 07:58:14 +00:00
wsmandClaude Opus 4.7 f40b8348e6 fix(bpm): 修复variablesMap在lambda中非effectively final的编译错误 
去除冗余的=null初始化，使得try-catch中仅赋值一次，满足effectively final要求。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-29 15:56:07 +08:00
wsm c061d09935 !55 feat(dqinspecttask): 分页查询VO及Mapper XML补充completedStage字段 
* feat(dqinspecttask): 分页查询VO及Mapper XML补充completedStage字段
* feat(dqinspecttask): 新增completedStage字段及流程结束阶段递增监听器
 2026-06-26 07:57:32 +00:00
陈志浩andGitee accad4456e !54 czh-20260626-修复我的已办历史流程无法删除 
Merge pull request !54 from 陈志浩/fix/historyServer-20260626
 2026-06-26 00:29:50 +00:00
zhihao 0e4caedf57 czh-20260626-修复我的已办历史流程无法删除 2026-06-26 08:28:31 +08:00
ye1023 f34bf9ebb6 yxk-20260625-bug修复：巡视整改提升工作台账 问题责任领导、问题责任部门的选人选部门组件替换 2026-06-25 10:22:52 +08:00
wsmandClaude Opus 4.7 6b022cdce8 feat(dqinspecttask): 巡检任务新增EasyExcel导入导出接口，Controller继承JeecgController 
- DqInspectTask 实体添加 @ExcelColumn 注解，与旧 @Excel 共存
- Controller 重构继承 JeecgController，复用 importExcelByEasyExcel 等统一入口
- 新增 /importExcelByEasyExcel /exportXlsByEasyExcel /exportXlsHeaders 三个接口

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-24 15:23:01 +08:00
wsm a9a8028b59 Merge remote-tracking branch 'origin/master' 2026-06-24 14:55:44 +08:00
new_new_new a7915177a0 !53 refactor(excel): 提取Excel工具包为独立模块jeecg-module-tools，支持跨项目复用 
* refactor(excel): 提取Excel工具包为独立模块jeecg-module-tools，支持跨项目复用
* fix(excel): 校验错误详情返回前端，ColumnMeta重构为Record，避免字典错后重复报NotBlank
* Merge remote-tracking branch 'origin/master'
* chore: 添加easyexcel依赖
 2026-06-24 03:36:58 +00:00
wsm 9a640f867f Merge remote-tracking branch 'origin/master' 2026-06-23 18:38:01 +08:00
new_new_new 9aec8dbbbe !52 feat(excel): 新增EasyExcel分批导入，支持字典校验和Hibernate Validator 
* feat(excel): 新增EasyExcel分批导入，支持字典校验和Hibernate Validator
* feat(excel): 新增EasyExcel导出工具类，基于@Excel注解解析并支持模板表头下载
* chore: 添加easyexcel依赖
 2026-06-23 10:36:56 +00:00
ye1023 8b3dd7fb8f yxk-20260622-bug修复：把把脉导出时增加字典翻译 2026-06-22 16:20:20 +08:00
ye1023 46709f9bbe yxk-20260622-bug修复：党委会导出时增加字典翻译 2026-06-22 16:03:02 +08:00
wsmandClaude Opus 4.7 18063834a1 chore: 添加easyexcel依赖 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-22 15:55:06 +08:00
new_new_newandGitee ad84b989a7 !51 refactor(supervision): 优化Excel导出字段,隐藏内部字段并补充字典翻译 
Merge pull request !51 from new_new_new/feature/20260622
 2026-06-22 07:03:52 +00:00
ye1023 8566c0a699 yxk-20260622-bug修复：党委会、把把脉新增时设置del_flag为0，删除时去掉级联删除注解 2026-06-22 15:01:20 +08:00
ye1023 bb1f5978b7 yxk-20260622-bug修复：写入审批历史的部门为当前用户登录所在部门 2026-06-22 15:00:39 +08:00
陈志浩andGitee 33df2e6dc4 !50 czh-20260622-修复sortno报错 
Merge pull request !50 from 陈志浩/fix/sortno-20260622
 2026-06-22 06:47:30 +00:00
zhihao 06b3c0caae czh-20260622-修复sortno报错 2026-06-22 14:46:38 +08:00
wsmandClaude Opus 4.7 d22d229a3d refactor(supervision): 优化Excel导出字段,隐藏内部字段并补充字典翻译 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-22 14:42:29 +08:00
new_new_newandGitee 58d82dd2ba !49 refactor(flow): 统一管理部门ID和角色ID至 OrgConfig 
Merge pull request !49 from new_new_new/feature/20260618
 2026-06-22 06:35:31 +00:00
new_new_newandGitee 80c958d474 !48 feat(system): 用户选择列表按sortno升序排序 
Merge pull request !48 from new_new_new/feature/select_user_with_sort
 2026-06-22 02:38:18 +00:00
wsmandClaude Opus 4.7 b64f38f3b8 feat(system): 用户选择列表按sortno升序排序 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-18 15:29:12 +08:00
new_new_new b9eb8cd99f !47 refactor(flow): 统一管理部门ID和角色ID至 OrgConfig 
* refactor(flow): 统一管理部门ID和角色ID至 OrgConfig
 2026-06-18 02:19:26 +00:00
wsmandClaude Opus 4.7 09f0f77e77 refactor(flow): 统一管理部门ID和角色ID至 OrgConfig 
抽取各部门模块中散落的 dept/role ID 硬编码和配置项，统一管理到
OrgConfig(flow-biz.org)，避免同一 ID 多处重复定义。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-18 09:26:39 +08:00
陈志浩andGitee 42c7b6f035 !46 czh-20260618-优化后端返回显示 
Merge pull request !46 from 陈志浩/fix/ui-20260618
 2026-06-18 01:16:09 +00:00
zhihao d8a18389df czh-20260618-优化后端返回显示 2026-06-18 09:15:31 +08:00
ye1023 2e029306b2 Merge remote-tracking branch 'origin/master' 2026-06-17 10:47:29 +08:00
ye1023 d0d625d77a yxk-20260617-我为四所把把脉-新增的时候加上del_flag为0 2026-06-17 10:47:20 +08:00
new_new_newandGitee 2f0bd10971 !45 fix(system): 选人组件查询增加 ORDER BY 排序 
Merge pull request !45 from new_new_new/fix/order_by
 2026-06-17 02:34:38 +00:00
wsmandClaude Opus 4.7 9627128477 fix(system): 选人组件查询增加 ORDER BY 排序 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-17 10:31:51 +08:00
new_new_newandGitee f5f9e32d66 !44 fix(system): 修复选人组件 GROUP BY 不兼容问题 
Merge pull request !44 from new_new_new/fix/select_group_by
 2026-06-16 03:19:44 +00:00
wsmandClaude Opus 4.7 d45e7bff9d fix(system): 修复选人组件 GROUP BY 不兼容问题 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-16 11:18:18 +08:00
陈志浩andGitee 9df037ac48 !43 czh-20250615-选人组件增加排序 
Merge pull request !43 from 陈志浩/feature/user-sortno-ip-sort
 2026-06-15 07:57:27 +00:00