105 Commits

Author SHA1 Message Date
wulin
15c82ace3a 增加保存绩效详情接口 2020-10-27 17:12:03 +08:00
杜建超
fcf9ec460b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 15:56:07 +08:00
杜建超
4f3a52596f fix 2020-10-27 15:56:03 +08:00
quyixiao
184cd5d8e6 rjuq whnt 2020-10-27 15:35:39 +08:00
wulin
c8c492e9ad 解决冲突 2020-10-27 14:55:46 +08:00
wulin
b95bb856d1 发起考核时返回发起对象 2020-10-27 14:54:58 +08:00
quyixiao
162c01b73b 提交修改 2020-10-27 14:34:37 +08:00
quyixiao
4a27bc2692 提交修改 2020-10-27 14:34:10 +08:00
wulin
ede0acde37 引用初始化lz_flow_record表 2020-10-27 14:05:47 +08:00
wulin
31eec17e0e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 12:05:23 +08:00
quyixiao
d8af83e0fb 提交修改 2020-10-27 11:48:32 +08:00
wulin
4d33a7fe35 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 11:13:19 +08:00
wulin
daad5e41f6 修改发起考核接口, 2020-10-27 11:13:13 +08:00
quyixiao
41e6a8a7c7 提交修改 2020-10-26 18:52:53 +08:00
quyixiao
1217c67b32 提交儿童睡袋 t 2020-10-26 18:52:11 +08:00
wulin
8ade53dfb1 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 16:29:19 +08:00
wulin
86fc82ae8c 修复当人员在多个部门时,获取部门几级领导异常。目前搜索第一个为准 2020-10-26 16:29:14 +08:00
杜建超
2f519074d3 fix 2020-10-26 16:19:52 +08:00
杜建超
4681cb93fb fix 2020-10-26 16:19:25 +08:00
quyixiao
d90ea0b15a 提交修改 2020-10-26 16:01:20 +08:00
quyixiao
7044bebf95 提交修改 2020-10-26 15:54:51 +08:00
quyixiao
4aa5aa4dd4 提交修改 2020-10-26 15:37:58 +08:00
quyixiao
fb945d20a9 提交修改 2020-10-26 15:36:20 +08:00
wulin
2dbc72645e 一些操作放到service里面,并添加手动事务回滚操作 2020-10-26 15:03:58 +08:00
wulin
023876e362 修复发起考核bug 2020-10-26 14:08:21 +08:00
quyixiao
d1957ecad6 提交修改 2020-10-26 11:51:05 +08:00
wulin
944846d7ec 发起考核功能基本完成 2020-10-25 22:21:22 +08:00
wulin
1fe86fda4c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-23 18:12:16 +08:00
wulin
474adeb112 改的多,就不愿意描述 2020-10-23 18:12:10 +08:00
杜建超
aa7dfccc0c fix 2020-10-23 17:55:59 +08:00
wulin
838e751775 获取组模板列表是无法返回登记id 2020-10-22 17:19:39 +08:00
wulin
b9397343c9 解决冲突 2020-10-21 20:51:12 +08:00
wulin
cadab4891a 新增保存戒掉小流程列表,修改保存考核指标为列表 2020-10-21 20:50:22 +08:00
杜建超
6e73c4da7d fix 2020-10-21 17:04:56 +08:00
wulin
4ea78046df Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 14:31:03 +08:00
wulin
379cb16def 考核组相关的保存和编辑接口合并 2020-10-21 14:30:58 +08:00
杜建超
4e89c24e49 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 11:16:14 +08:00
杜建超
53ed800463 fix 2020-10-21 11:16:08 +08:00
quyixiao
9177eab432 rjuq whnt 2020-10-21 11:12:12 +08:00
wulin
302d4c744c 考核组列表返回考核人数 2020-10-21 10:27:49 +08:00
wulin
cec8d658ce 查询部门增加code 2020-10-20 16:08:00 +08:00
wulin
8b51e6edfb 部门人员接口哟划 2020-10-20 15:48:42 +08:00
wulin
be1b6d3610 增加获取考核组详情接口 2020-10-20 11:06:25 +08:00
wulin
e6ba9b1635 更新部分代码 2020-10-20 09:41:55 +08:00
wulin
32861dc01f 增加节点小流程记录表 2020-10-19 14:45:43 +08:00
wulin
a9a2349cd5 增加部分接口,修改部分表代码 2020-10-19 11:36:25 +08:00
wulin
8b562bd684 解决冲突 2020-10-16 18:31:12 +08:00
wulin
ff273e0d03 修改部份表的字段 2020-10-16 18:29:28 +08:00
杜建超
53812d9e3d fix 2020-10-16 15:10:03 +08:00
杜建超
434118adca Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-16 14:59:57 +08:00