Commit Graph

769 Commits

Author SHA1 Message Date
wangjie 433d3fabbe #处理花名册页面 部门展示部门全路径,导出支持勾选数据导出 2023-06-27 16:13:54 +08:00
dxfeng 52f7695866 医博肛肠:花名册开发事项 2023-06-02 10:12:28 +08:00
dxfeng 361f35aa3b 医博:花名册开发事项 2023-06-02 09:25:30 +08:00
Mlin f04216a113 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-06-01 09:01:18 +08:00
Mlin 6cea2706df 人员简历表格动态生成 2023-06-01 09:00:55 +08:00
dxfeng 3a8aa2449a 兼容PostgreSQL,简历按钮BUG修复 2023-05-29 11:35:45 +08:00
dxfeng e138489c34 兼容PostgreSQL 2023-05-25 08:59:51 +08:00
dxfeng db990ce227 兼容PostgreSQL 2023-05-16 16:42:28 +08:00
dxfeng 0ca51f58ae 花名册列表按钮权限优化 2023-04-03 10:06:02 +08:00
Mlin 472cc4ab9a 人大金仓版本bug处理 2023-03-24 14:24:55 +08:00
dxfeng f8b60493f8 花名册人员状态查询功能优化 2023-03-01 16:26:10 +08:00
dxfeng f5f5c26133 人员身份证号码导入BUG修复 2023-03-01 09:54:22 +08:00
dxfeng 2d63ca20a7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-20 14:33:39 +08:00
dxfeng cb41ff1f8c 岗位浏览按钮SQL完善 2023-02-20 14:28:25 +08:00
Mlin 41fdd36997 透视图在岗数bug修复 2023-02-14 18:06:00 +08:00
dxfeng 453d4afe97 花名册查询、导出BUG修复 2023-02-14 17:09:22 +08:00
dxfeng 4113df1708 简历树,聚才林岗位搜索BUG修复 2023-02-08 14:05:33 +08:00
dxfeng eaca9535d5 分部、部门导入BUG修复 2023-02-07 14:41:31 +08:00
dxfeng 559ea407ab 岗位分权,部门列表BUG修复 2023-02-07 11:29:13 +08:00
dxfeng 6ac651e8bd 花名册,状态查询功能完善 2023-02-06 09:49:36 +08:00
dxfeng ec7ff05616 列定制BUG修复 2023-01-17 14:52:45 +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
Mlin a395024010 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-12 15:17:58 +08:00
Mlin a677da06a6 花名册模板管理查询、编辑保存20230112 2023-01-12 15:17:38 +08:00
dxfeng cb814ef077 显示定制列穿梭框接口开发 2023-01-12 14:14:25 +08:00
dxfeng b93a3d7b1c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-12 14:10:10 +08:00