Commit Graph

120 Commits

Author SHA1 Message Date
dxfeng 5faffc13b6 多语言支持 2024-06-17 10:23:55 +08:00
dxfeng d802a3b200 多语言支持 2024-06-11 14:28:56 +08:00
dxfeng dd19927376 多语言支持 2024-06-03 15:43:47 +08:00
dxfeng f51fd4713e 多语言支持 2024-05-31 11:34:09 +08:00
dxfeng 703de629f9 多语言支持 2024-05-31 09:06:51 +08:00
Chengliang 5da821d653 组织架构图部门详细列表接口修改 (1.增加人员点击信息跳转,2.修复数据加载效率问题导致图展示不全;3.解除默认不展示岗位功能) 2024-05-08 16:34:03 +08:00
Chengliang 06b0d09f92 1.花名册定制列table字段顺序调整无效修复
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
2023-11-27 17:51:07 +08:00
dxfeng ec7bd987b2 人员快捷搜索BUG修复 2023-08-16 17:18:43 +08:00
dxfeng a3380ce0bd 人员快捷搜索BUG修复 2023-08-16 16:40:11 +08:00
Chengliang 8c2a9937f9 修复日期 2023-08-16 15:59:25 +08:00
Chengliang 01dc480720 测试 2023-08-16 13:49:10 +08:00
dxfeng 6bc5db7912 人员快捷搜索 2023-08-15 17:30:20 +08:00
dxfeng 8a3885db76 人员动态列导出 2023-08-07 17:38:01 +08:00
dxfeng 853bf4b006 组织架构树、部门台账优化;岗位同步逻辑重写 2023-08-04 10:07:36 +08:00
Mlin 7417cbac79 虚拟维度表查询bug修复 2023-07-14 10:51:30 +08:00
Chengliang f5275c2148 v3 2023-07-13 15:08:24 +08:00
Chengliang 81f7ecfec9 列表 2023-07-12 16:09:04 +08:00
dxfeng 436decbc85 组织架构图,人员列表显示转换调整 2023-07-06 13:30:39 +08:00
dxfeng 79f64f7f93 组织架构图,列表字段转换、卡片在岗数统计 2023-07-06 10:06:38 +08:00
Chengliang 9ffd5c3cfb 组织架构图 2023-07-05 17:36:04 +08:00
Chengliang 2e58769c8b 组织架构图 2023-07-05 09:16:17 +08:00
dxfeng 0ca51f58ae 花名册列表按钮权限优化 2023-04-03 10:06:02 +08:00
dxfeng f8b60493f8 花名册人员状态查询功能优化 2023-03-01 16:26:10 +08:00
dxfeng 453d4afe97 花名册查询、导出BUG修复 2023-02-14 17:09:22 +08:00
dxfeng 6ac651e8bd 花名册,状态查询功能完善 2023-02-06 09:49:36 +08:00
dxfeng 37ded0a19b 列定制BUG修复 2023-01-17 09:30:51 +08:00
dxfeng 8947e6da3a 列定制BUG修复 2023-01-16 17:19:59 +08:00
dxfeng 5e40c18df1 列定制BUG修复 2023-01-16 15:08:22 +08:00
Mlin 4b4754bd74 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 18:40:39 +08:00
Mlin 2b5acfeb32 花名册模板管理bug修复 2023-01-13 18:40:34 +08:00
dxfeng 7dc6225356 Merge pull request 'BUG修复' (#145) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/145
2023-01-13 18:11:57 +08:00
dxfeng ba2909bac9 BUG修复 2023-01-13 18:10:57 +08:00
Mlin 8ff8340d81 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 18:03:32 +08:00
Mlin 9d36b42da6 花名册模板管理日期优化 2023-01-13 18:03:19 +08:00
dxfeng 0aac4a0c57 BUG修复 2023-01-13 18:01:17 +08:00
dxfeng ec55baf5fe BUG修复 2023-01-13 17:39:52 +08:00
dxfeng 6d8aaf063b BUG修复 2023-01-13 16:50:54 +08:00
Mlin 547264d755 花名册模板列定制优化20230113 2023-01-13 16:37:11 +08:00
Mlin 78682a47c7 花名册模板列定制优化20230113 2023-01-13 16:35:34 +08:00
Mlin 58d5bccddc 花名册模板列定制列名称获取优化20230113 2023-01-13 14:07:33 +08:00
Mlin 07a82baf9c Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 13:44:15 +08:00
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2023-01-13 13:44:05 +08:00
dxfeng 1bb7b67133 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-13 09:47:15 +08:00
dxfeng 1c9dce7c0b BUG修复 2023-01-13 09:46:37 +08:00
Mlin 2fba3b50b9 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
2023-01-13 09:02:11 +08:00
Mlin e3a78a05c7 花名册模板列定制20230113 2023-01-13 08:50:27 +08:00
dxfeng ebb4e88d0d BUG修复 2023-01-12 18:18:44 +08:00
dxfeng f79ad8681f BUG修复 2023-01-12 16:49:54 +08:00
dxfeng 563070a539 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-12 15:46:01 +08:00
dxfeng 15b14cf4b1 显示定制列穿梭框接口开发 2023-01-12 15:45:43 +08:00