DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
298 Commits 1 Branch 0 Tags
ceb28723f18d5eeb63af735cdfc536a2d9d10b9b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bupengxiang ceb28723f1 Merge branch 'lixuetao' 2023-05-17 15:38:24 +08:00
bupengxiang be5c2ff02c [修改] 查询全部用户 2023-05-17 15:37:35 +08:00
bupengxiang b5b48c16c2 [修改] 用户模板导入 2023-05-17 11:24:12 +08:00
bupengxiang 41f3aec37e [修改] 保存到草稿 因dataId引起的偶现问题 2023-05-17 10:57:38 +08:00
bupengxiang 2915442675 Merge branch 'lixuetao' 2023-05-17 09:22:53 +08:00
bupengxiang 39e8848eb7 [修改] 修改用户时 修改密码问题 2023-05-17 09:20:56 +08:00
bupengxiang 70f1e89629 [修改] userEomapper 2023-05-16 20:10:21 +08:00
bupengxiang 5e5ecd9583 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 
# Conflicts:
#	adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java
 2023-05-16 19:03:09 +08:00
bupengxiang e56bdf3d32 [修改] 组织管理模块 2023-05-16 19:01:36 +08:00
bupengxiang a45b96b820 [修改] orgEopage 2023-05-16 18:30:54 +08:00
bupengxiang 90a4d20c3c [修改] TtReportManageActMapper.xml 2023-05-16 18:15:27 +08:00
bupengxiang 28fb15382e [修改] UserEOMapper.xml 2023-05-16 18:12:23 +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
bupengxiang d5a8df76a1 [修改] 监控流程审核历史 2023-05-16 17:13:54 +08:00
bupengxiang 7843a9e00d Merge branch 'lixuetao' 2023-05-16 16:20:23 +08:00
bupengxiang 46c3f98a5f [修改] 切分支 提targer 2023-05-16 16:17:54 +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
bupengxiang 103ff19650 [修改] 添加编辑用户 部门回显 2023-05-16 15:07:52 +08:00
bupengxiang 770bbdfff4 [修改] 删除草稿时，删除业务数据 2023-05-16 14:58:47 +08:00
bupengxiang 2b22e95e3b [修改] 草稿删除，删除业务数据 2023-05-16 14:52:20 +08:00
bupengxiang d151af2234 [修改] 监控流程审批步骤 2023-05-16 13:53:41 +08:00
bupengxiang 882053a6df Merge branch 'lixuetao' 2023-05-16 11:48:07 +08:00
bupengxiang 7e02e430d9 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 11:46:31 +08:00
bupengxiang fcdcea3afc [修改] 修改 转办 与审批历史 2023-05-16 11:46:20 +08:00
bupengxiang 24da664d0a [修改] 获取当前人领导 2023-05-16 10:45:05 +08:00
bupengxiang be297b9c31 Merge branch 'lixuetao' 2023-05-16 10:15:47 +08:00
bupengxiang 0b39a1454d [修改] 流程中心搜索 2023-05-16 10:15:16 +08:00
bupengxiang dc22b3ba70 Merge branch 'lixuetao' 2023-05-16 10:03:32 +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 b860961095 [修改] 保密到期定时任务 2023-05-16 09:44:26 +08:00
bupengxiang c1958b2c4e [修改] 流程页面权限 2023-05-15 18:01:44 +08:00
bupengxiang 664efab332 [修改] 报告编辑流程 2023-05-15 17:51:40 +08:00
bupengxiang 87e520377d Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-15 16:09:59 +08:00
bupengxiang c6a071b63c [修改] 审批历史的时间 2023-05-15 16:06:52 +08:00
bupengxiang 2a166475f8 [修改] 申请权限流程userId 2023-05-15 14:50:05 +08:00
bupengxiang 6f7b48b351 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-15 14:39:28 +08:00
bupengxiang e844a6fdba [修改] 报告管理 操作日志 新增 修改 预览 下载 删除 2023-05-15 14:39:13 +08:00
bupengxiang 57c92cbdb0 [修改] 解决一些流程bug 2023-05-12 17:04:11 +08:00
bupengxiang 69a66c6330 [修改] 报告名称不能重复问题 2023-05-12 12:00:12 +08:00
bupengxiang 92f76a3440 [新增] 流程批量同意 不同意 2023-05-12 11:37:31 +08:00
bupengxiang a469da2dec [修改] 流程重复发起问题 更改 2023-05-11 18:07:27 +08:00
bupengxiang 0062d75e59 [修改] 流程重复发起问题 2023-05-11 17:42:21 +08:00
bupengxiang 2434692171 [修改] 转办审批历史 2023-05-11 15:33:21 +08:00
bupengxiang 5145817dd4 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-11 15:09:18 +08:00
bupengxiang 0248e691c2 [新增] 解决一些流程流转的问题 2023-05-11 15:08:38 +08:00
bupengxiang dbe67a1292 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-11 11:17:22 +08:00
bupengxiang d9778cb8e6 [新增] 流程批量保存 2023-05-11 11:17:13 +08:00
bupengxiang a45fbd6242 [修改] 上传报告oneApply监听器 2023-05-11 09:21:10 +08:00
bupengxiang 49d1dced09 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-10 18:03:41 +08:00
bupengxiang 33e87fea97 [修改] 权限申请对接 + 保密结束时间定时任务 2023-05-10 18:03:27 +08:00
bupengxiang 78b5c3ba19 [修改] 流程中心变更 2023-05-10 10:48:36 +08:00
bupengxiang 1f9a342253 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-09 18:10:20 +08:00
bupengxiang b32494580f [修改] 查看审批历史 转办部分 2023-05-09 18:10:07 +08:00
bupengxiang 67f3555c7a [修改] 查询详情 2023-05-09 17:10:12 +08:00
bupengxiang 7c793af87c [新增] 权限申请流程 2023-05-09 16:35:16 +08:00
bupengxiang f42eaf211a Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-09 15:41:13 +08:00
bupengxiang 61165f5583 [新增] 批量发起完成任务 2023-05-09 15:40:58 +08:00
bupengxiang a06a6e93f1 [修改] 标签回显 2023-05-09 14:15:40 +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 57909fe2e2 [修改] 报告日志下载接口参数修改 2023-05-08 10:42:54 +08:00
bupengxiang 5742a5637d [修改] 报告book日志管理 2023-05-08 10:41:12 +08:00
bupengxiang 3542bd6899 [修改] target 2023-05-08 10:34:12 +08:00
bupengxiang 713df8cc87 [修改] 合并代码 2023-05-08 10:26:07 +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
bupengxiang c7a91820fd [新增] 报告点赞and取消点赞 2023-05-08 10:11:00 +08:00
bupengxiang 8d93660dc6 [新增] 报告日志管理 2023-05-06 18:04:14 +08:00
bupengxiang 3cd351adc5 [新增] 组织管理模块 2023-05-06 15:54:31 +08:00
bupengxiang fc8e22962e Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-06 09:31:06 +08:00
bupengxiang 91c14e0489 [修改] 报告上传部分接口调试 2023-05-06 09:30:46 +08:00
bupengxiang 0de7012353 [修改] 流程监听器的名称 2023-05-04 18:00:32 +08:00
bupengxiang d5214158fa [修改] 修改一条勿提交 2023-05-04 16:42:34 +08:00
bupengxiang c5d438776c Merge branch 'master' into lixuetao 
# Conflicts:
#	adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java
 2023-05-04 16:34:39 +08:00
bupengxiang 9ba6760fef [新增] 上传报告流程开发 2023-05-04 16:30:42 +08:00
bupengxiang fd2aba8c81 [修改] 封板！ 2023-04-29 01:23:20 +08:00
bupengxiang c61a19b991 [修改] 修改监听器 2023-04-28 22:03:42 +08:00
bupengxiang f22c15f3c4 [修改] 流程中删除报告 2023-04-28 21:44:03 +08:00
bupengxiang d5b7776ce4 [修改] 报告名称不能重复 2023-04-28 20:16:52 +08:00
bupengxiang 143f0f4ad2 [修改] pom文件 2023-04-28 18:24:41 +08:00
bupengxiang dec6625584 Merge remote-tracking branch 'origin/master' 2023-04-28 18:21:18 +08:00
bupengxiang dd3c7a2554 [修改] 登录403问题 2023-04-28 18:21:01 +08:00
bupengxiang d058fdf6a6 [修改] 302问题 2023-04-28 16:46:27 +08:00
bupengxiang a20e9d9a18 [修改] session失效后，前台不能自动退出问题 2023-04-28 16:10:31 +08:00
bupengxiang 6d51724a26 Merge remote-tracking branch 'origin/master' 2023-04-28 16:00:23 +08:00
bupengxiang 59324c7096 Merge remote-tracking branch 'origin/master' 2023-04-28 15:58:48 +08:00
bupengxiang 29e1bf46df Merge remote-tracking branch 'origin/master' 2023-04-28 14:10:21 +08:00
bupengxiang 6e9b5f103c [修改] 查询当前任务 2023-04-28 14:05:49 +08:00
bupengxiang 01e57b9eea [修改] 调整变更人的bug 2023-04-28 13:43:03 +08:00
bupengxiang 34195e6460 Merge remote-tracking branch 'origin/master' 2023-04-28 10:11:00 +08:00
bupengxiang 9b9457b9dd [修改] 监控流程 调整处理人 永久 2023-04-28 10:10:44 +08:00
bupengxiang 9c54f2d52a [新增] 权限申请流程 及 工作台的接口 开发完毕 2023-04-28 09:37:11 +08:00
bupengxiang 1763720520 [新增] 代办查询 2023-04-28 09:33:32 +08:00
bupengxiang 9b51125926 合并master到caihaohan 2023-04-28 09:33:06 +08:00
bupengxiang 6e2fc642d3 [修改] 流程发起后 删除用户 回显bug 2023-04-27 18:02:30 +08:00
bupengxiang 78bfd21522 [修改] 草稿功能开发，及部分bug修改 2023-04-27 17:23:48 +08:00
bupengxiang 774c70c3c8 [修改] 修改hutool依赖 从仓库获取转到本地 2023-04-27 10:39:36 +08:00