DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280 Commits 1 Branch 0 Tags
e56bdf3d32c0ea27beabc8d55b28a705c28f6a98
Commit Graph
81 Commits
Author SHA1 Message Date
bupengxiang e56bdf3d32 [修改] 组织管理模块 2023-05-16 19:01:36 +08:00
bupengxiang a45b96b820 [修改] orgEopage 2023-05-16 18:30:54 +08:00
mzaxd a9bc15b5eb ci:修改UserEOMapper中的数据库字段 2023-05-16 18:28:25 +08:00
mzaxd d7ab68933a ci:修改ORG实体类 2023-05-16 18:22:24 +08:00
bupengxiang 28fb15382e [修改] UserEOMapper.xml 2023-05-16 18:12:23 +08:00
mzaxd c00e431bed ci:将部分orgCode改为DepartmentCode 2023-05-16 18:08:10 +08:00
xuetao.li 5219263cae 移除误提交的target 2023-05-16 18:00:07 +08:00
bupengxiang ac6129e9c3 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 17:55:30 +08:00
bupengxiang 479cf83506 [修改] orgEomapper 2023-05-16 17:55:23 +08:00
xuetao.li 71fdf48fe0 转换org问题完毕 2023-05-16 17:51:55 +08:00
xuetao.li 40e7e67760 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 17:41:48 +08:00
xuetao.li 8b9ad09c48 同步测试，修改org表 2023-05-16 17:29:40 +08:00
bupengxiang d5a8df76a1 [修改] 监控流程审核历史 2023-05-16 17:13:54 +08:00
mzaxd 0106517804 fix:修复[角色管理-保存的权限显示不正确]Bug 2023-05-16 16:35:22 +08:00
bupengxiang 89e829781e [修改] isAct 2023-05-16 16:17:24 +08:00
bupengxiang 6e6ce8f49a Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 15:34:34 +08:00
bupengxiang ba11a47341 [修改] 部门修改 修改编码 2023-05-16 15:34:19 +08:00
mzaxd a5e11115d3 ci:menu新增字段及相应逻辑 2023-05-16 15:10:37 +08:00
bupengxiang 103ff19650 [修改] 添加编辑用户 部门回显 2023-05-16 15:07:52 +08:00
bupengxiang fcdcea3afc [修改] 修改 转办 与审批历史 2023-05-16 11:46:20 +08:00
bupengxiang 24da664d0a [修改] 获取当前人领导 2023-05-16 10:45:05 +08:00
bupengxiang c94ac509e9 [修改] 切分支 提targer 2023-05-16 10:02:23 +08:00
bupengxiang aa1cbe54aa [修改] 切分支 提一下target 2023-05-16 10:00:30 +08:00
bupengxiang 664efab332 [修改] 报告编辑流程 2023-05-15 17:51:40 +08:00
bupengxiang 57c92cbdb0 [修改] 解决一些流程bug 2023-05-12 17:04:11 +08:00
bupengxiang 92f76a3440 [新增] 流程批量同意 不同意 2023-05-12 11:37:31 +08:00
bupengxiang 0062d75e59 [修改] 流程重复发起问题 2023-05-11 17:42:21 +08:00
bupengxiang 2434692171 [修改] 转办审批历史 2023-05-11 15:33:21 +08:00
bupengxiang 0248e691c2 [新增] 解决一些流程流转的问题 2023-05-11 15:08:38 +08:00
bupengxiang 33e87fea97 [修改] 权限申请对接 + 保密结束时间定时任务 2023-05-10 18:03:27 +08:00
bupengxiang 78b5c3ba19 [修改] 流程中心变更 2023-05-10 10:48:36 +08:00
bupengxiang 7c793af87c [新增] 权限申请流程 2023-05-09 16:35:16 +08:00
zer0Black 960ea0603e 同步代码编写完毕 2023-05-09 14:29:21 +08:00
bupengxiang 8df19abcef [修改] 组织管理 删除id 用org_code 2023-05-09 11:00:44 +08:00
bupengxiang d570492906 [新增] 上传报告流程开发 2023-05-09 09:08:46 +08:00
bupengxiang 3542bd6899 [修改] target 2023-05-08 10:34:12 +08:00
bupengxiang e3c1602f12 Merge branch 'caihaohan' into lixuetao 
# Conflicts:
#	adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
 2023-05-08 10:22:48 +08:00
mzaxd 09a74e6365 feat:下载PDF文件添加水印 2023-05-06 16:35:14 +08:00
bupengxiang 3cd351adc5 [新增] 组织管理模块 2023-05-06 15:54:31 +08:00
mzaxd 98eda3b071 fix:修复【根据字典编码获取所有选项】查不到Bug 2023-05-06 15:27:08 +08:00
mzaxd fb25c42e82 feat:增加根据字典编码查找选项接口 2023-05-06 14:17:46 +08:00
mzaxd fa37863410 fix:数据字典(二级)，修复按名称模糊查询失效Bug 2023-05-06 11:12:03 +08:00
mzaxd 60913300d4 fix:数据字典(一级)，修复无法新增已删除字典Bug 2023-05-06 11:11:33 +08:00
mzaxd 9e1341867d feat:数据字典(二级) 2023-05-06 09:41:59 +08:00
xuetao.li 6c81523aea Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-06 09:27:36 +08:00
xuetao.li 21b4d01567 添加TODO标识 2023-05-06 09:27:27 +08:00
mzaxd 4b370a6da4 feat:数据字典(一级)支持多选删除 2023-05-05 17:40:48 +08:00
mzaxd 2527bcfca2 fix:修复数据字典(一级)Bug 2023-05-05 17:17:53 +08:00
mzaxd 15a5a1d386 feat: 数据字典(一级),功能完善 2023-05-05 16:15:00 +08:00
mzaxd f4bf2a46e2 feat: 数据字典CRUD 2023-05-05 13:39:12 +08:00