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

668 Commits

Author SHA1 Message Date
Mlin b3057e2f4e 版本查询接口 2022-12-15 14:38:48 +08:00
Mlin 3462511603 showOrder类型小数转换 2022-12-15 09:59:57 +08:00
dxfeng 550be7fb14 BUG修复 2022-12-15 09:49:55 +08:00
Mlin 7f51135424 定时任务 2022-12-14 17:42:59 +08:00
dxfeng 42545745fe Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-14 15:38:59 +08:00
dxfeng 946354b32d BUG修复 2022-12-14 15:38:29 +08:00
Mlin 1db1949a94 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-14 14:32:40 +08:00
Mlin 43f00f7d9d sqlserver存入版本修复、定时任务 2022-12-14 14:32:19 +08:00
dxfeng d2f6fa693a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-14 10:58:09 +08:00
dxfeng 4117a34928 BUG修复 2022-12-14 10:52:20 +08:00
dxfeng 8383c08a06 BUG修复 2022-12-13 18:19:12 +08:00
Mlin 9c80a74386 oracle、sqlserver查询版本语句(部门存入失败) 2022-12-13 16:38:06 +08:00
dxfeng b9d06b4246 分权功能版本回退，岗位BUG修复 2022-12-13 15:57:21 +08:00
Mlin 5897ae1563 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-13 15:01:11 +08:00
Mlin e81d8f4939 oracle、sqlserver查询版本语句 2022-12-13 14:58:22 +08:00
dxfeng fab4614cd5 分权功能重构，调用EC方法 2022-12-13 10:58:57 +08:00
dxfeng ce2c34cfdd BUG修复,岗位关联关系调整 2022-12-13 10:42:35 +08:00
dxfeng 32fd42db2f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-12 18:11:59 +08:00
dxfeng b64f15bd83 BUG修复,岗位关联关系调整 2022-12-12 18:11:03 +08:00
Mlin 2b549bcc4a 人员版本控制写入逻辑 2022-12-12 17:55:50 +08:00
dxfeng 6169b007ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-09 17:05:01 +08:00
Mlin 32e8eb4890 分部、部门版本控制写入逻辑 2022-12-09 16:57:42 +08:00
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 45a24cb0be BUG修复,岗位关联关系调整 2022-12-09 15:39:15 +08:00
dxfeng 06c9912d21 BUG修复,岗位关联关系调整 2022-12-09 15:07:34 +08:00
dxfeng dee6bb25b5 岗位关联关系调整 2022-12-09 14:29:56 +08:00
dxfeng 3470ba04cd 岗位关联关系调整 2022-12-09 14:29:20 +08:00
Mlin 73dbaf75ac 分部版本控制写入逻辑 2022-12-09 08:50:23 +08:00
dxfeng b368c3ea27 BUG修复 2022-12-08 17:10:50 +08:00
dxfeng c1c812596d BUG修复 2022-12-08 17:10:31 +08:00
dxfeng eaa1c53c9c 分部、部门联调。BUG修复 2022-12-08 14:37:48 +08:00
dxfeng f89ebdb965 分部、部门联调。BUG修复 2022-12-08 14:16:58 +08:00
dxfeng a1f2c9d1ac BUG修复 2022-12-08 11:24:48 +08:00
dxfeng ea8a48099f Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/87
 2022-12-08 11:04:35 +08:00
dxfeng 668231fd61 人员导入逻辑重写 2022-12-08 11:01:30 +08:00
Chengliang d345a5fe66 版本管理 2022-12-08 09:56:25 +08:00
dxfeng de03ca3b8b 部门列表BUG修复 2022-12-07 14:15:02 +08:00
dxfeng 3477539393 部门列表BUG修复 2022-12-07 14:08:03 +08:00
dxfeng 37dc31b7b5 部门查看、编辑接口调整 2022-12-07 11:49:06 +08:00
dxfeng 6fc67d7d67 分部查看、编辑接口调整 2022-12-07 10:36:05 +08:00
dxfeng 64af65cad3 部门导入新增、更新 2022-12-06 17:11:48 +08:00
dxfeng 324881794b 分部导入新增、更新 2022-12-06 15:06:51 +08:00
dxfeng 54c3676c07 分部BUG修复，导入接口逻辑重写 2022-12-06 14:47:50 +08:00
dxfeng 85ec966813 人员卡片查看页面逻辑重写 2022-12-05 17:57:33 +08:00
dxfeng fb17f43323 部门管理功能逻辑调整 2022-11-30 16:14:23 +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 5d2b880ed5 人员同步BUG修复，导入优化 2022-11-22 09:41:11 +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 e45ff3daa3 导入BUG，提示信息优化 2022-11-17 17:02:45 +08:00
dxfeng 25d3db4d81 导入BUG，提示信息优化 2022-11-17 15:36:26 +08:00
dxfeng a273008715 导入BUG，提示信息优化 2022-11-17 11:36:52 +08:00
dxfeng 0404c4b7fd 导入自动编号 2022-11-17 09:05:00 +08:00
dxfeng 47c09cac9a 导入自动编号 2022-11-16 17:54:57 +08:00
dxfeng 81943df058 编制、分部树排序 2022-11-16 17:39:58 +08:00
dxfeng 9b20c6838a 人事卡片按钮权限BUG 2022-11-16 16:09:32 +08:00
dxfeng 49b4358e17 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 15:24:34 +08:00
dxfeng f9f5bc432c BUG修复 2022-11-16 15:23:56 +08:00
‘ml’ b5d5b717d1 职务导入提示优化修复20221116 2022-11-16 15:14:11 +08:00
dxfeng 17f4789e33 BUG修复 2022-11-16 14:59:22 +08:00
dxfeng 67fd2df4f9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 14:58:48 +08:00
liang.cheng b3bfad0148 Merge pull request '“栏目表格修复”' (#65) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/65
 2022-11-16 14:08:40 +08:00
Chengliang cb4db723e4 “栏目表格修复” 2022-11-16 14:06:12 +08:00
dxfeng 05364f9265 BUG修复 2022-11-16 13:39:56 +08:00
‘ml’ caa9604315 职级导入异常处理方案1116 2022-11-16 11:22:28 +08:00
dxfeng bb071c3ad9 Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/64
 2022-11-15 14:35:16 +08:00
dxfeng 2d64a5015b 组织透视下拉框BUG 2022-11-15 14:34:16 +08:00
‘ml’ 706edd43ed 职级导入提示优化1115 2022-11-15 14:24:06 +08:00
dxfeng 4fc2eca27b 花名册树、角色展示BUG 2022-11-15 11:47:54 +08:00
dxfeng f1a3565fc7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-15 08:56:58 +08:00
dxfeng 10bb8159aa 明细表BUG修复 2022-11-14 19:13:35 +08:00
‘ml’ 0bcdbc9de8 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-11-14 17:30:06 +08:00
‘ml’ 306897c5bc 职务导入模板提示修复1114 2022-11-14 17:29:55 +08:00
dxfeng 7c79718d6e 人员卡片，修改字段名 2022-11-14 14:05:48 +08:00
dxfeng 3ec8afe78b 人员卡片，明细表展示 2022-11-14 13:56:19 +08:00
dxfeng 7b5a4905dc BUG修复、卡片按钮排序 2022-11-14 11:19:08 +08:00
‘ml’ af6d920b59 职务导入模板生成 2022-11-11 17:31:17 +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
liang.cheng c9b82b5f71 Merge pull request 'bug修复' (#56) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/56
 2022-11-11 16:55:29 +08:00
Chengliang d236127f31 bug修复 2022-11-11 16:52:01 +08:00
‘ml’ 091f202eac 职务导入 2022-11-11 16:50:35 +08:00
dxfeng 16794bf98c 人员卡片按钮保存 2022-11-11 16:24:26 +08:00
dxfeng 854a40b7cd 人员卡片按钮自定义 2022-11-11 14:11:34 +08:00
dxfeng b7217dae23 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-11 14:00:08 +08:00
dxfeng d16f13405c 人员卡片按钮自定义 2022-11-11 13:59:45 +08:00
‘ml’ 1baf55e04f 职级职等导入更新 2022-11-11 13:35:00 +08:00
‘ml’ 9517ad15d6 优化职级模板字段顺序 2022-11-11 10:36:49 +08:00
‘ml’ ba2434b130 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-11-11 09:11:25 +08:00
‘ml’ 0459c628ea 职等职级导入接口20221111 2022-11-11 09:11:03 +08:00
dxfeng 57d788d807 人员卡片按钮权限 2022-11-11 09:09:53 +08:00
Chengliang 8e93568aa4 bug修复 2022-11-10 14:07:50 +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