Commit Graph

215 Commits

Author SHA1 Message Date
Chengliang 4b6c4d5c3d ”测试“ 2023-09-21 15:15:18 +08:00
Chengliang 33c3b0ccaf 组织架构图改造 2023-09-13 18:04:09 +08:00
Chengliang 3c43bfa465 组织架构图人数统计 2023-09-12 11:20:20 +08:00
Chengliang 7cb3b019a8 编制模块 2023-09-06 17:17:10 +08:00
Chengliang d8d69381ea 编制模块 2023-09-04 17:52:02 +08:00
Chengliang 498da847b3 编制模块修改 2023-09-01 17:13:41 +08:00
Chengliang 51dc953766 企通学配置 2023-08-22 18:07:08 +08:00
Chengliang a94cdc7e37 企通学配置自定义 2023-08-21 18:11:50 +08:00
Chengliang bb68a3bc7a 企通学单点 2023-08-18 17:33:16 +08:00
dxfeng 4438f3937a 快捷搜索条件表单 2023-08-15 09:07:41 +08:00
dxfeng dc0c823caf 快捷搜索自定义接口BUG修复 2023-08-11 09:47:33 +08:00
dxfeng dacd9b180e 快捷搜索基本代码提交 2023-08-09 09:39:37 +08:00
dxfeng 8a3885db76 人员动态列导出 2023-08-07 17:38:01 +08:00
Mlin 63491e9906 部门拖拽转移优化 2023-08-01 11:20:28 +08:00
Mlin 32029788c4 部门拖拽转移 2023-08-01 09:41:43 +08:00
dxfeng 1280b3c6b9 组织管理,TreeSelect组件全量接口开发 2023-07-27 14:32:07 +08:00
dxfeng 9610361733 组织管理,移动树接口提交 2023-07-26 10:52:10 +08:00
dxfeng fab01583ad 组织架构图,部门选择树 2023-07-24 16:38:17 +08:00
Mlin 10a9a350b4 组织管理版本记录数据同步 2023-07-12 18:00:47 +08:00
dxfeng e760eae9a0 组织架构图,人员卡片 2023-07-05 17:41:30 +08:00
Chengliang 2e58769c8b 组织架构图 2023-07-05 09:16:17 +08:00
dxfeng a2247ddb12 TODO注释清理 2023-07-03 10:50:07 +08:00
Chengliang b963913d62 架构图 2023-06-29 17:37:05 +08:00
Chengliang 2667ab8a60 修复条件 2023-06-28 17:58:12 +08:00
Chengliang 53a295a468 虚拟组织暂存 2023-06-27 16:58:45 +08:00
dxfeng e8d6f2ea73 组织架构图搜索条件优化 2023-06-27 09:12:41 +08:00
dxfeng 0148d99314 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-26 17:03:51 +08:00
Chengliang 35d7a045e2 组织架构图V3 2023-06-26 17:00:12 +08:00
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2023-06-21 11:42:21 +08:00
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2023-01-13 13:44:05 +08:00
dxfeng f79ad8681f BUG修复 2023-01-12 16:49:54 +08:00
Mlin a677da06a6 花名册模板管理查询、编辑保存20230112 2023-01-12 15:17:38 +08:00
Mlin 044f963f31 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/HrmResourceService.java
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
#	src/com/engine/organization/web/HrmResourceController.java
#	src/com/engine/organization/wrapper/HrmResourceWrapper.java
2023-01-12 11:33:23 +08:00
Mlin 8750850dfa 花名册列定制模板查询20230112 2023-01-12 11:30:25 +08:00
Mlin 09d4dbddd5 花名册列定制模板查询20230112 2023-01-12 09:41:58 +08:00
dxfeng d5ca665f2f 显示定制列穿梭框接口开发 2023-01-11 15:42:41 +08:00
dxfeng 6e1f70ef82 花名册高级搜索BUG修复 2023-01-10 18:25:53 +08:00
dxfeng 1d053a0437 花名册高级搜索BUG修复 2023-01-10 17:31:22 +08:00
dxfeng 832fb2b9c4 花名册高级搜索BUG修复 2023-01-10 16:52:40 +08:00
dxfeng f7ce6b028a 花名册高级搜索BUG修复 2023-01-10 15:13:33 +08:00
dxfeng 4ba6d5c21e 花名册高级搜索BUG修复 2023-01-10 11:37:28 +08:00
dxfeng cfe08ddf4c 花名册动态查询SQL 2023-01-09 18:06:57 +08:00
dxfeng 01c042ebbc 高级搜索表单完善 2023-01-09 10:27:30 +08:00
dxfeng 3e0d3a1b2e 花名册高级搜索相关接口 2023-01-06 17:20:29 +08:00
dxfeng 4d43e0605b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-06 15:35:56 +08:00
dxfeng 92c51cfe18 花名册高级搜索相关接口 2023-01-06 15:35:38 +08:00
Mlin 0ef350c902 人员简历合并导出日志(20230105) 2023-01-05 16:00:28 +08:00
Mlin 95a6b388c4 修复人员简历合并图片重复问题(20230105) 2023-01-05 15:34:39 +08:00
Mlin ab881b8d8f Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/PersonnelResumeService.java
#	src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
#	src/com/engine/organization/web/PersonnelResumeController.java
#	src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
2023-01-05 14:02:46 +08:00
Mlin 5450b99e37 人员简历导出下载(20230105) 2023-01-05 13:57:52 +08:00