86 Commits

Author SHA1 Message Date
quyixiao
4aa5aa4dd4 提交修改 2020-10-26 15:37:58 +08:00
quyixiao
fb945d20a9 提交修改 2020-10-26 15:36:20 +08:00
wulin
5c896280de flowchart添加字段 2020-10-26 15:35:39 +08:00
quyixiao
ca52289161 提交修改 2020-10-26 11:51:39 +08:00
quyixiao
d1957ecad6 提交修改 2020-10-26 11:51:05 +08:00
wulin
9b9abc0f2e 修复保存节点小流程时没有保存关闭节点功能更 2020-10-26 10:29:33 +08:00
wulin
3f4a1612ee 修复问题 2020-10-25 23:46:29 +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
杜建超
b212baa434 fix 2020-10-23 17:56:34 +08:00
杜建超
aa7dfccc0c fix 2020-10-23 17:55:59 +08:00
wulin
d9516cee01 获取考评组信息时返回department_id 2020-10-22 18:01:44 +08:00
wulin
838e751775 获取组模板列表是无法返回登记id 2020-10-22 17:19:39 +08:00
杜建超
184b530481 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 15:47:00 +08:00
杜建超
6d1f1f1f42 fix 2020-10-22 15:46:54 +08:00
wulin
cd93891f21 获取 2020-10-22 15:06:20 +08:00
wulin
d6fd83df5d 解决冲突 2020-10-22 12:09:38 +08:00
wulin
662c38011b 修复bug 2020-10-22 12:07:31 +08:00
杜建超
4d85c2bde7 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 11:56:08 +08:00
杜建超
3c403c1d28 fix 2020-10-22 11:55:55 +08:00
wulin
91fa248be4 增加param 2020-10-22 09:51:51 +08:00
wulin
ea176a3155 修复对判空的支持 2020-10-22 09:45:22 +08:00
wulin
b9397343c9 解决冲突 2020-10-21 20:51:12 +08:00
wulin
cadab4891a 新增保存戒掉小流程列表,修改保存考核指标为列表 2020-10-21 20:50:22 +08:00
杜建超
ed4f1e3736 fix 2020-10-21 18:12:15 +08:00
杜建超
35afe09d7a fix 2020-10-21 17:05:43 +08:00
杜建超
6e73c4da7d fix 2020-10-21 17:04:56 +08:00
wulin
ddf11e0134 流程小节点增加权重
"
2020-10-21 16:23:07 +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
quyixiao
03c55402bc 提交修改 2020-10-21 11:49:27 +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
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
ff273e0d03 修改部份表的字段 2020-10-16 18:29:28 +08:00
wulin
1c20927771 增加信表相关代码 2020-10-16 13:44:54 +08:00
wulin
d024b7b3ac 集成knife4j-spring-ui说明文档 2020-10-16 09:41:47 +08:00
wulin
e5a72e8351 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-15 10:52:06 +08:00
wulin
ca198ac75c 增加相关表的dto 2020-10-15 10:51:58 +08:00
杜建超
43f6a8f730 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-15 09:25:56 +08:00
杜建超
02df239792 fix 2020-10-15 09:25:50 +08:00
wulin
9883cbc9da Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-14 18:50:57 +08:00
wulin
739ac9bfd5 增加部分新表相关代码 2020-10-14 18:50:52 +08:00
杜建超
a2ce4c51a5 fix 2020-10-14 17:06:16 +08:00
杜建超
8f71c7f2c4 fix 2020-10-14 15:18:05 +08:00