DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
423 Commits 1 Branch 0 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bupengxiang 63e8dbf759 [修改] fileID 2023-05-26 14:15:57 +08:00
bupengxiang 7f3cc1f56a Merge remote-tracking branch 'origin/master' 2023-05-26 14:13:45 +08:00
bupengxiang 705414696d [修改] 申请流程办理异常 2023-05-26 14:13:35 +08:00
bupengxiang fddbfa7656 [修改] 代办 2023-05-26 11:41:41 +08:00
bupengxiang 5a2f1513ed Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-26 10:55:24 +08:00
bupengxiang 400d5bc28a [修改] 标签问题 2023-05-26 10:55:17 +08:00
bupengxiang 93c9c4c1e6 [修改] 保密到期 定时任务 每晚1点执行 2023-05-25 16:31:39 +08:00
bupengxiang caa06b9693 Merge branch 'lixuetao' 2023-05-25 15:28:22 +08:00
bupengxiang 8d3b39e9e3 [修改] 已办 2023-05-25 14:37:48 +08:00
bupengxiang 5d392877cf [修改] 报告新增 2023-05-25 11:12:43 +08:00
bupengxiang dc2a8b69fe [修改] 多文件上传 详情预览 2023-05-25 10:44:02 +08:00
bupengxiang 5d9c442cc2 [修改] 多文件上传 上传流程 2023-05-25 10:15:42 +08:00
bupengxiang 6409ee92e5 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-24 18:02:27 +08:00
bupengxiang f33fdc468a [修改] 代办查询 2023-05-24 18:02:16 +08:00
bupengxiang 777e1ab481 [修改] 报告文件批量上传 2023-05-24 17:15:29 +08:00
bupengxiang d20595d8df Merge remote-tracking branch 'origin/lixuetao' into lixuetao 
# Conflicts:
#	adc-da-report/src/main/java/com/adc/da/report/eo/ReportFile.java
#	adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
#	adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java
#	adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
 2023-05-24 16:55:28 +08:00
bupengxiang b0a47208c2 [修改] 报告文件批量上传 2023-05-24 16:50:07 +08:00
bupengxiang d8d785652b [修改] 用户导入 2023-05-24 11:07:03 +08:00
bupengxiang 71ab3a0fd8 [修改] 文件批量上传 2023-05-24 10:54:58 +08:00
bupengxiang 8ff7c87d16 Merge branch 'master' into lixuetao 2023-05-24 09:47:38 +08:00
bupengxiang f9f7f5e141 [修改] 用户批量导入 2023-05-24 09:44:55 +08:00
bupengxiang b720a7f652 [修改] 文件实体表 2023-05-23 17:58:42 +08:00
bupengxiang 36c9516ec1 [修改] 部门查询 2023-05-23 17:36:12 +08:00
bupengxiang f317b20682 [修改] 配置文件 勿提交 2023-05-23 17:25:03 +08:00
bupengxiang eb1c08aa53 [修改] 配置文件 勿提交 2023-05-23 17:24:06 +08:00
bupengxiang f38f5b76f1 [修改] 修改用户页面的bug 2023-05-23 16:45:19 +08:00
bupengxiang d896e8f426 [修改] 日志管理高级搜索 2023-05-23 13:49:32 +08:00
bupengxiang f5a364f1e7 Merge remote-tracking branch 'origin/master' 2023-05-23 11:36:07 +08:00
bupengxiang 43d74aa02d [修改] 操作日志 “修改”改“编辑” 2023-05-23 11:35:52 +08:00
bupengxiang 95802dad05 Merge remote-tracking branch 'origin/master' 2023-05-19 08:52:30 +08:00
bupengxiang e9db2baee5 [修改] xml 2023-05-18 23:04:32 +08:00
bupengxiang 84421b48cc [修改] prcType 以前prcType不能编辑 2023-05-18 22:21:49 +08:00
bupengxiang f36ea1c546 [修改] prcType 以前prcType不能编辑 2023-05-18 22:14:13 +08:00
bupengxiang 2ce3e1b03a [修改] prcType 以前prcType不能编辑 2023-05-18 21:44:21 +08:00
bupengxiang 09eb8c5171 [修改] 用户列表,角色搜索 2023-05-18 21:11:27 +08:00
bupengxiang 429a111431 [修改] 权限申请流程，批量同意报程序异常 2023-05-18 20:44:01 +08:00
bupengxiang 40d6720216 [修改] 管理员上传报异常， 普通用户上传，审核时报异常 2023-05-18 20:10:46 +08:00
bupengxiang ee55ec05d0 Merge branch 'lixuetao' 2023-05-18 19:06:48 +08:00
bupengxiang 2263a8f554 [修改] 并发 单日发起最多流程数9999 2023-05-18 19:05:57 +08:00
bupengxiang 09bafc78dc [修改] 并发 流程编号重复问题 2023-05-18 17:59:21 +08:00
bupengxiang 0dd034e730 Merge branch 'lixuetao' 2023-05-18 17:19:27 +08:00
bupengxiang 73c88ffe82 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-18 17:15:18 +08:00
bupengxiang d1ae4c37e7 [修改] 重名命题 2023-05-18 17:15:10 +08:00
bupengxiang 8da539164e Merge branch 'lixuetao' 2023-05-18 15:06:53 +08:00
bupengxiang f68b6756c1 [修改] 添加用户的手机号验证规则 2023-05-18 14:36:36 +08:00
bupengxiang c02c1adec9 Merge branch 'lixuetao' 2023-05-18 11:54:55 +08:00
bupengxiang b10bf0898f [修改] 监控流程 2023-05-18 11:50:34 +08:00
bupengxiang d9ca17ce3f [修改] 流程中心 2023-05-18 11:25:06 +08:00
bupengxiang 34790e5778 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-18 10:27:14 +08:00
bupengxiang e4ee26b176 [修改] 报告流程权限私有化 2023-05-18 10:27:01 +08:00
bupengxiang 55cfac6509 [修改] 修改用户 ，手机号验证正则 2023-05-18 09:50:32 +08:00
bupengxiang 5ef5a5ff03 Merge branch 'lixuetao' 2023-05-18 09:09:23 +08:00
bupengxiang abad378fae Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-18 09:08:02 +08:00
bupengxiang 9b4a5d12f9 [修改] 流程中心 效率优化 2023-05-18 09:07:53 +08:00
bupengxiang 0c0567095a [修改] 从草稿编辑已删除得报告，加校验 2023-05-17 16:17:10 +08:00
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