liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,679 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

404 Commits

Author SHA1 Message Date
Mlin 1bdc7e2fa4 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-09 16:04:50 +08:00
Mlin 13ae136872 部门版本控制写入逻辑 2022-12-09 16:04:35 +08:00
dxfeng 06c9912d21 BUG修复,岗位关联关系调整 2022-12-09 15:07:34 +08:00
dxfeng 3470ba04cd 岗位关联关系调整 2022-12-09 14:29:20 +08:00
Mlin 73dbaf75ac 分部版本控制写入逻辑 2022-12-09 08:50:23 +08:00
dxfeng c1c812596d BUG修复 2022-12-08 17:10:31 +08:00
dxfeng f89ebdb965 分部、部门联调。BUG修复 2022-12-08 14:16:58 +08:00
Chengliang d345a5fe66 版本管理 2022-12-08 09:56:25 +08:00
dxfeng 64af65cad3 部门导入新增、更新 2022-12-06 17:11:48 +08:00
dxfeng 54c3676c07 分部BUG修复，导入接口逻辑重写 2022-12-06 14:47:50 +08:00
dxfeng 85ec966813 人员卡片查看页面逻辑重写 2022-12-05 17:57:33 +08:00
dxfeng bd33075e14 部门管理功能逻辑调整 2022-11-30 16:06:40 +08:00
dxfeng 40a6540a1d 部门管理功能逻辑调整 2022-11-30 15:55:27 +08:00
dxfeng 238d8e6f75 部门接口逻辑调整 2022-11-29 17:00:31 +08:00
dxfeng 9a2eabc8bd 部门切换数据源、实体类更新 2022-11-29 09:54:18 +08:00
dxfeng aa3d0742ff 分部接口整理、代码优化 2022-11-28 11:15:54 +08:00
dxfeng 416471a283 分部列表、新增、删除、转移功能重写 2022-11-24 17:56:32 +08:00
dxfeng f7758e5298 人员导入提示信息优化 2022-11-23 09:34:06 +08:00
dxfeng ae2e5bb5a4 人员Mapper整合 2022-11-21 10:58:12 +08:00
dxfeng 7d1fc84fad 组织架构树排序、人员卡片BUG修复 2022-11-18 16:28:02 +08:00
dxfeng a273008715 导入BUG，提示信息优化 2022-11-17 11:36:52 +08:00
dxfeng 81943df058 编制、分部树排序 2022-11-16 17:39:58 +08:00
dxfeng 9b20c6838a 人事卡片按钮权限BUG 2022-11-16 16:09:32 +08:00
dxfeng 17f4789e33 BUG修复 2022-11-16 14:59:22 +08:00
dxfeng 05364f9265 BUG修复 2022-11-16 13:39:56 +08:00
dxfeng 10bb8159aa 明细表BUG修复 2022-11-14 19:13:35 +08:00
dxfeng 7b5a4905dc BUG修复、卡片按钮排序 2022-11-14 11:19:08 +08:00
dxfeng 4a0ddd8adc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-11 17:24:55 +08:00
dxfeng cd11f06b7f 卡片按钮新增、删除 2022-11-11 17:24:22 +08:00
‘ml’ 091f202eac 职务导入 2022-11-11 16:50:35 +08:00
dxfeng 854a40b7cd 人员卡片按钮自定义 2022-11-11 14:11:34 +08:00
dxfeng d16f13405c 人员卡片按钮自定义 2022-11-11 13:59:45 +08:00
dxfeng 57d788d807 人员卡片按钮权限 2022-11-11 09:09:53 +08:00
‘ml’ 0da123fcef Merge branch 'feature/ml' into develop 
# Conflicts:
#	src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
 2022-11-10 10:58:00 +08:00
‘ml’ ec8be58a45 职等职级导入接口 2022-11-10 10:55:56 +08:00
Chengliang eeefde07ed 接口 2022-11-10 10:29:03 +08:00
dxfeng 466ba43b31 人员卡片类别展示权限控制 2022-11-09 16:58:09 +08:00
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-09 11:13:55 +08:00
dxfeng b0021dae20 字段允许个人修改 2022-11-09 11:07:55 +08:00
Chengliang 99f849f350 bug修复 2022-11-09 09:45:19 +08:00
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2022-11-08 17:26:59 +08:00
Chengliang dc347c755d 人员卡片菜单权限接口 2022-11-08 09:23:53 +08:00
dxfeng 31645b34fe 分权BUG修复 2022-11-03 16:45:02 +08:00
dxfeng 47aafefa5a 分权BUG修复 2022-11-03 11:06:36 +08:00
dxfeng 18767b722c 聚才林岗位分权 2022-11-02 14:30:22 +08:00
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/35
 2022-11-02 11:31:54 +08:00
Chengliang b636dc2b82 人员卡片类型权限 2022-11-02 11:29:40 +08:00
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 2022-11-01 10:05:43 +08:00
dxfeng 0b3cd0641b 分权开发 2022-10-28 17:43:46 +08:00
dxfeng 40f1f097e6 代码合并 2022-10-28 10:35:33 +08:00
Chengliang ef392f4d0a 模块管理分权 2022-10-27 15:00:12 +08:00
‘ml’ 939e6c7607 分部转移、部门转移、岗位合并修复1021 2022-10-27 14:59:57 +08:00
Chengliang 96cefec891 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang f6ea4425cf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 4c74b583bf 模块管理分权 2022-10-27 14:58:44 +08:00
dxfeng 92b246b5d5 组织架构图相关BUG修复 2022-10-27 14:39:35 +08:00
dxfeng 679c77f732 组织架构图相关BUG修复 2022-10-26 20:12:14 +08:00
dxfeng b2fc9d3e0c 人员编号、岗位部门、自定义下拉框BUG修复 2022-10-25 15:43:02 +08:00
‘ml’ f2c5d1227b 分部、部门、岗位禁用、合并修复1025 2022-10-25 10:47:08 +08:00
‘ml’ f30998351f Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/thread/CompanyTriggerRunnable.java
#	src/com/engine/organization/thread/DepartmentTriggerRunnable.java
 2022-10-24 16:01:51 +08:00
‘ml’ 65ccecce56 分部、部门、岗位禁用修复1024 2022-10-24 16:00:00 +08:00
dxfeng dca18ea5b1 编制导入模板、人员卡片、组织架构图Oracle 2022-10-24 15:57:08 +08:00
dxfeng 2515121d83 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-21 15:58:13 +08:00
dxfeng 11a4a85ff1 人员关联调整 2022-10-21 15:57:55 +08:00
‘ml’ 05fe14b5e1 分部转移、部门转移、岗位合并修复1021 2022-10-21 15:53:15 +08:00
‘ml’ 9a9b79cff0 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-20 17:31:23 +08:00
‘ml’ a0660a7857 分部转移、部门转移、岗位合并修复1020 2022-10-20 17:30:34 +08:00
dxfeng b7e34c1d31 人员关联调整 2022-10-20 09:07:32 +08:00
dxfeng eb007f5b23 人事卡片BUG修复 2022-10-18 16:35:08 +08:00
‘ml’ 5005243758 部门合并在岗数优化 2022-10-18 12:17:11 +08:00
dxfeng 63b6b88a96 人员管理BUG修复 2022-10-17 17:16:26 +08:00
dxfeng 396a4570d0 BUG修复 2022-10-17 11:35:46 +08:00
dxfeng f36756e1fd 分部、岗位 禁用功能限制 2022-10-14 14:56:35 +08:00
dxfeng f9c33da655 人员管理完善 2022-10-14 09:13:28 +08:00
dxfeng 46068ab008 编制Action 添加提示信息，BUG修复 2022-10-13 13:59:41 +08:00
dxfeng f26159506a 岗位浏览按钮、编制action BUG修复 2022-10-12 15:23:24 +08:00
dxfeng 9df3349715 兼容EC岗位名称重复 2022-10-09 15:36:53 +08:00
dxfeng 231addfda1 人事卡片接口开发 2022-10-09 11:42:26 +08:00
dxfeng 284f778963 人员调整,在岗数关联优化 2022-09-30 15:19:22 +08:00
dxfeng acee0bad51 人员调整,在岗数关联优化 2022-09-30 11:05:42 +08:00
dxfeng c6fb0d129b 组织架构图编制、在岗,数据优化 2022-09-29 15:57:00 +08:00
dxfeng 02836ce37d 岗位名称校验、编制展示优化、BUG修复 2022-09-23 15:53:37 +08:00
dxfeng 92d9a17d8c 组织架构图编制显示优化 2022-09-23 09:19:42 +08:00
dxfeng 106d7e8bb8 更新人员、编制 同步组织架构图 2022-09-21 16:23:09 +08:00
dxfeng a847a4efef 兼容Oracle,达梦 2022-09-21 10:43:41 +08:00
dxfeng 8a9370ee9e BUG修复 2022-09-20 18:46:05 +08:00
dxfeng 2632f6c857 BUG修复 2022-09-20 10:25:13 +08:00
dxfeng fe668c37e7 BUG修复 2022-09-19 13:27:50 +08:00
dxfeng 35439a442f BUG 修复 2022-09-15 10:41:04 +08:00
dxfeng 5c66744468 部门合并、组织导入 2022-09-08 17:54:46 +08:00
dxfeng f6c41a3467 部门合并重写 2022-09-08 15:36:47 +08:00
dxfeng 34af4f95c9 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-06 17:23:57 +08:00
dxfeng 79c5f94862 导入问题处理 2022-09-06 17:23:44 +08:00
dxfeng 120b4efdba 不同等级方案、编号可重复 2022-09-06 15:38:16 +08:00
Chengliang ba0b31f086 fixed 2022-09-06 14:26:09 +08:00
dxfeng 6c04ffd384 编制管理 2022-09-06 10:33:46 +08:00
dxfeng 6415ee3eb7 编制方案 2022-09-06 09:45:56 +08:00
dxfeng b1b2a9a88a 部门管理，更新为EC 2022-09-05 17:25:11 +08:00
dxfeng 4fa38f704c 分部管理，更新为EC 2022-09-05 15:58:46 +08:00
Chengliang 0ffb0bac33 fix 2022-09-02 17:48:14 +08:00
Chengliang 819a053aa3 fixed 2022-09-02 16:17:01 +08:00
dxfeng b49a25742a 触发器、非标开关 2022-09-01 16:57:06 +08:00
dxfeng 1f7f299368 分部、部门、岗位触发器 2022-08-31 14:24:00 +08:00
dxfeng 56ed6aa197 BUG修复 2022-08-30 10:46:42 +08:00
dxfeng 21dc07dd40 BUG修复 2022-08-29 17:07:34 +08:00
dxfeng b6caffc74f 人员信息分类 删除接口 2022-08-29 14:12:06 +08:00
dxfeng 2744f85eff BUG修复 2022-08-29 11:07:10 +08:00
dxfeng 6351109b79 人员信息分类 2022-08-26 17:36:26 +08:00
dxfeng f82e679837 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-08-26 15:36:33 +08:00
dxfeng 8968e44e09 分部、部门、岗位同步EC重写 2022-08-26 15:36:06 +08:00
Chengliang 6bfc6eae27 人员信息管理 2022-08-26 15:27:51 +08:00
Chengliang ca7d34a5bd 人员信息模块 2022-08-24 17:57:04 +08:00
dxfeng 564b30eed8 BUG修复 2022-08-22 15:04:38 +08:00
dxfeng 477a2f3bce 自定义字段BUG修复 2022-08-22 13:35:21 +08:00
dxfeng ff8660a586 BUG修复 2022-08-22 09:10:00 +08:00
dxfeng 3acec4730d BUG修复，权限控制 2022-08-17 19:29:46 +08:00
dxfeng e4d9d80fee 兼容Oracle 2022-08-12 10:12:55 +08:00
dxfeng 1318fc1aba BUG修复 2022-08-12 09:34:19 +08:00
dxfeng 05c24b5e98 Oracle BUG修复 2022-08-11 15:14:54 +08:00
dxfeng f27612db94 Oracle BUG修复 2022-08-11 10:43:52 +08:00
dxfeng 6576335c6c BUG修复 2022-08-10 15:37:23 +08:00
dxfeng 08a9ab7b0d BUG修复 2022-08-10 15:25:34 +08:00
dxfeng 1c9b1abe69 编制方案需求完善 2022-08-02 14:42:25 +08:00
dxfeng 7b88ba5a78 编制方案需求完善 2022-08-02 13:39:47 +08:00
dxfeng 46ab51ee18 人员导入、CusFieldData触发器调整 2022-08-01 17:03:13 +08:00
dxfeng ceba6b5d62 BUG修复 2022-08-01 09:09:39 +08:00
dxfeng 0a47b3548d 人员导入 2022-07-29 16:20:59 +08:00
dxfeng d5447c8e59 岗位导入 2022-07-27 16:47:19 +08:00
dxfeng fc8aaf7729 部门导入、日志记录 2022-07-27 10:48:43 +08:00
dxfeng b1365da225 分部导入 2022-07-26 16:33:41 +08:00
dxfeng 9d304b0303 分部导入 2022-07-26 09:40:13 +08:00
dxfeng 56a697d4e4 BUG 修复 2022-07-22 16:02:32 +08:00
dxfeng b8adf9ab7b 岗位模块操作同步EC 2022-07-15 09:02:18 +08:00
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 2022-07-13 17:19:45 +08:00
dxfeng e217ecbe16 分部更新EC 2022-07-13 10:55:44 +08:00
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 2022-07-12 16:38:27 +08:00
dxfeng 81fcd96af6 人员拓展卡片 2022-07-11 15:59:15 +08:00
dxfeng 7103eb0c73 记录操作日志 2022-07-07 15:32:30 +08:00
dxfeng 40a7c066a2 记录操作日志 2022-07-07 14:19:56 +08:00
dxfeng f5d95fabb2 记录操作日志 2022-07-05 15:15:00 +08:00
dxfeng 033e90aa34 操作日志 2022-07-05 09:39:00 +08:00
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 2022-07-04 09:18:56 +08:00
dxfeng 5291c3b855 分部列表BUG修复 2022-07-01 17:46:25 +08:00
dxfeng fca0bb4dad 人员导入 2022-07-01 14:02:03 +08:00
dxfeng d508a4d9d0 人员导入，日志表结构 2022-06-30 16:22:57 +08:00
reset be94ae88e7
!129 1 
Merge pull request !129 from reset/feature/cl
 2022-06-29 08:59:32 +00:00
Chengliang 5445e6bfac 导出和批量导出完成 2022-06-29 16:57:45 +08:00
Chengliang 300ccd6d77 “导出修改” 2022-06-29 15:21:36 +08:00
dxfeng 48171c7e82 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:21:17 +08:00
Chengliang 783b9fc6bf 人员导出 2022-06-29 14:18:47 +08:00
dxfeng 5ceb8ae068 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:16:39 +08:00
dxfeng ff06d705e7 人员导入 2022-06-29 14:11:16 +08:00
dxfeng 2fb33877f5 人员导入 2022-06-29 09:11:45 +08:00
Chengliang 0ad6157c26 人员导出功能 2022-06-28 19:04:14 +08:00
dxfeng d0ea50cec5 部门、岗位 合并 2022-06-24 18:26:15 +08:00
dxfeng 15131186de 分部、部门、岗位列表排序 2022-06-23 18:49:47 +08:00
dxfeng 6c40245b02 组织人事测试、优化 2022-06-23 16:55:26 +08:00
dxfeng de1d4a8944 组织人事测试、优化 2022-06-23 14:29:56 +08:00
dxfeng f035662fb6 组织人事测试、优化 2022-06-23 13:43:52 +08:00
dxfeng eeb8c47451 组织人事测试、优化 2022-06-23 09:14:19 +08:00
dxfeng f72db1b5f9 组织人事测试、优化 2022-06-22 11:22:51 +08:00
dxfeng 187be45bdf 人员管理：左侧树、列表接口 2022-06-21 13:49:37 +08:00
dxfeng b8f866e28b 人员树接口 2022-06-20 18:31:11 +08:00
dxfeng abf99aaa51 BUG修复 2022-06-20 14:50:59 +08:00
dxfeng 2af1fb6336 移动到组 2022-06-20 09:09:14 +08:00
dxfeng 6df1accb98 BUG 修复 2022-06-17 16:54:16 +08:00
dxfeng 20bafffd2f BUG 修复 2022-06-17 16:00:05 +08:00
dxfeng caff3332ce BUG 修复 2022-06-17 14:19:52 +08:00
dxfeng fdf2572654 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
 2022-06-17 11:51:48 +08:00
dxfeng e9aa68229d 表结构更新 2022-06-17 11:48:15 +08:00
dxfeng 445507d10d 表结构更新 2022-06-17 10:54:59 +08:00
Chengliang b60a335a1c 新增类型修改 2022-06-17 10:39:52 +08:00
dxfeng eb9c77b2d0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
	src/com/engine/organization/web/FieldDefinedController.java
	src/com/engine/organization/wrapper/FieldDefinedWrapper.java
 2022-06-16 18:04:32 +08:00
Chengliang 6d4448ec51 子信息维护 2022-06-16 17:57:03 +08:00
dxfeng 4d2a70ad5d 自定义字段列表接口 2022-06-16 17:53:48 +08:00
dxfeng 52c964f199 添加自定义字段接口 2022-06-16 14:19:54 +08:00
dxfeng e588fb0c96 BUG修复 2022-06-16 09:37:36 +08:00
dxfeng 3f151d55e6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
	src/com/engine/organization/web/FieldDefinedController.java
	src/com/engine/organization/wrapper/FieldDefinedWrapper.java
 2022-06-15 18:09:26 +08:00
dxfeng 7c02e9bc61 分组删除 新增自定义字段 2022-06-15 18:03:01 +08:00
Chengliang f4f7038611 新增编辑类型 2022-06-15 17:17:34 +08:00
dxfeng b4b54fa1e1 分组维护 新建分组 2022-06-15 11:25:23 +08:00
dxfeng 079addd6c7 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
 2022-06-14 17:56:26 +08:00
dxfeng a7e5619097 细化分组、标题、名字表是否启用； 
明细表按照上下级关系展示。
 2022-06-14 17:53:49 +08:00
reset 6e7c76ac0d
!78 自定义设置页面树 
Merge pull request !78 from reset/feature/cl
 2022-06-14 08:11:40 +00:00
Chengliang 6b1ce95b48 自定义设置页面树 2022-06-14 16:10:26 +08:00
dxfeng 9259596e54 自定义字段 getTabInfo 2022-06-14 15:29:22 +08:00
dxfeng 5b0864d503 添加字段分组表 2022-06-14 14:31:52 +08:00
dxfeng 2ed79cc994 添加字段分组表 2022-06-14 13:58:58 +08:00
Chengliang fadd2577cb 修改注释 2022-06-14 11:07:48 +08:00
dxfeng 3a075f4ec6 公司/分部 主表、拓展表动态添加字段、动态分组 2022-06-13 13:48:03 +08:00
dxfeng 49155c6893 公司/分部 主表、拓展表动态添加字段、动态分组 2022-06-10 09:18:21 +08:00
dxfeng 9877308b84 编制上报 编制变更 2022-06-08 10:25:47 +08:00
dxfeng 77d27801b4 编制上报 编制变更 2022-06-08 09:01:13 +08:00
dxfeng d53365aba3 自动生成编号 2022-06-06 13:17:35 +08:00
dxfeng ec71f31859 部门联查岗位 2022-06-02 16:49:25 +08:00
dxfeng 96e8042156 部门合并、转移 2022-06-02 15:43:19 +08:00
dxfeng 076d099715 部门BUG修复 2022-06-02 13:38:26 +08:00
dxfeng 5252770a61 部门复制 2022-06-02 11:40:24 +08:00
dxfeng 5b2ab89a06
!42 被引用数据勾选框状态、按钮显隐 
Merge pull request !42 from dxfeng/feature/dxf
 2022-06-01 08:42:30 +00:00
dxfeng ad70d2e3d4 被引用数据勾选框状态、按钮显隐 2022-06-01 16:35:28 +08:00