DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
365 Commits 1 Branch 0 Tags
f33fdc468a61927142c5901787403dbcc579403c
Commit Graph
365 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mzaxd 34e0852d40 feat:预览-文件列表 2023-05-24 15:29:44 +08:00
mzaxd 7477a16a47 feat:站内信 2023-05-24 14:50:54 +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
mzaxd 71c3662665 feat:修改上传人 2023-05-23 11:33:31 +08:00
mzaxd a4a4189181 ci:清理表删除后无效的代码和SQL 2023-05-23 10:30:48 +08:00
mzaxd 6dfbcfe0de feat:报告管理列表新增字段“上传人” 2023-05-22 11:00:47 +08:00
mzaxd 3afbfe2375 fix:修复LevelId和EmployeeTypeId判空问题 2023-05-19 14:54:54 +08:00
mzaxd 6df149af49 ci:增加SSO的log日志 2023-05-19 14:54:09 +08:00
mzaxd 25a4a484a1 Merge remote-tracking branch 'origin/master' into caihaohan 2023-05-19 14:49:34 +08:00
mzaxd 78de6ed199 ci:将公开（内部公开）改为 内部公开 2023-05-19 09:37:01 +08:00
mzaxd 574e2ee526 ci:将公开（内部公开）改为 内部公开 2023-05-19 09:32:10 +08:00
mzaxd 93e9361cf9 fix:修复未删除的老权限，替换为公用鉴权方法 
(cherry picked from commit e80224bbae)
 2023-05-19 09:09:01 +08:00
mzaxd e80224bbae fix:修复未删除的老权限，替换为公用鉴权方法 2023-05-19 09:06:37 +08:00
bupengxiang 95802dad05 Merge remote-tracking branch 'origin/master' 2023-05-19 08:52:30 +08:00
mzaxd b4eb5540a2 fix:修复预览页面下载权限问题 2023-05-19 08:45:33 +08:00
mzaxd 801e7d1060 fix:修复预览页面下载权限问题 2023-05-19 08:43:19 +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
xuetao.li 7f91a29346 feat:SSO单点登录功能 2023-05-18 18:20:07 +08:00
xuetao.li e20407f8f0 fix:修复用户数据同步缺失的三个字段 
Level LevelName EmployeeTypeId
 2023-05-18 18:17:42 +08:00
bupengxiang 09bafc78dc [修改] 并发 流程编号重复问题 2023-05-18 17:59:21 +08:00
mzaxd 3387850f8b fix:修复Bug【69485】 
用该报告申请了下载权限，流程结束后，操作栏里有下载按钮了，但点击预览，页面没有下载按钮。
 2023-05-18 17:35:31 +08:00
mzaxd a5eba18449 feat:全量同步定时任务 2023-05-18 17:20:49 +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
mzaxd a297980511 feat:重新打开浏览器后不丢失登陆状态 
将新的sessionId返回给前端
 2023-05-18 16:59:05 +08:00
zer0Black 4f9214a48c 【review】评审 2023-05-18 16:31:15 +08:00
bupengxiang 8da539164e Merge branch 'lixuetao' 2023-05-18 15:06:53 +08:00