 bupengxiang
|
8ee3f2b86b
|
[修改] 报告列表sql
|
2023-04-26 10:05:40 +08:00 |
|
|
xuetao.li
|
62f0a139b6
|
Merge remote-tracking branch 'origin/caihaohan' into lixuetao
# Conflicts:
# adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
|
2023-04-25 21:18:11 +08:00 |
|
|
bupengxiang
|
af64620166
|
[新增] 权限申请流程 及 工作台的接口 开发完毕
|
2023-04-25 21:05:37 +08:00 |
|
|
bupengxiang
|
6ffe04363f
|
[新增] 代办查询
|
2023-04-25 09:18:52 +08:00 |
|
|
bupengxiang
|
867f703968
|
[新增] 工作流工作台 及权限申请流程
|
2023-04-24 21:55:16 +08:00 |
|
|
bupengxiang
|
ab65fa2fb7
|
[修改] 修改用户查询sql
|
2023-04-24 11:45:36 +08:00 |
|
|
bupengxiang
|
2d1b1d2066
|
[合并] ‘caihaohan’合并到 ‘lixuetao’ 解决冲突
|
2023-04-24 11:18:57 +08:00 |
|
|
bupengxiang
|
6d3e7fe66e
|
Merge branch 'caihaohan' into lixuetao
# Conflicts:
# adc-da-main/target/classes/application-dev.properties
# adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
# adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class
# adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class
# adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class
# adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class
# adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml
# adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
# adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
# adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
# adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
# adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class
# adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class
# adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml
# pom.xml
|
2023-04-24 11:15:18 +08:00 |
|
|
bupengxiang
|
95c9eb1904
|
[新增] pom文件
|
2023-04-24 09:28:41 +08:00 |
|
|
bupengxiang
|
d90f388962
|
[新增] 权限申请流程监听器
|
2023-04-24 09:25:36 +08:00 |
|
|
bupengxiang
|
2fe1a1ab52
|
[新增] 权限申请流程
|
2023-04-23 17:49:21 +08:00 |
|
 mzaxd
|
162338e916
|
增加一些注释
|
2023-04-23 17:43:36 +08:00 |
|
|
mzaxd
|
63902fc856
|
消除[报表列表]接口中的魔法值
|
2023-04-23 10:32:15 +08:00 |
|
|
bupengxiang
|
8543731a43
|
工作流 修改sql位置
|
2023-04-23 09:26:01 +08:00 |
|
|
bupengxiang
|
4280f39aeb
|
修改 流程图保存后的回调端口
|
2023-04-21 17:45:45 +08:00 |
|
|
mzaxd
|
8c33bf81ea
|
修复[删除报告]不生效Bug
|
2023-04-21 16:42:43 +08:00 |
|
|
bupengxiang
|
560fcdd75a
|
修改工作流页面的前端代码
|
2023-04-21 16:38:25 +08:00 |
|
|
mzaxd
|
b3b6a47aa3
|
完成[抽取七种文件格式内容]工具类
|
2023-04-21 15:20:00 +08:00 |
|
|
mzaxd
|
8fd3079588
|
完善[删除报表]接口，删除报表的同时会删除所有关联标签
|
2023-04-21 13:47:43 +08:00 |
|
|
mzaxd
|
40f780f7d8
|
新增接口[报告列表(带权限验证)]
|
2023-04-21 11:58:11 +08:00 |
|
|
bupengxiang
|
edb0ae1a3b
|
工作流 修改接口传参
|
2023-04-21 11:51:48 +08:00 |
|
|
mzaxd
|
19efa5572b
|
完善[报表列表接口]功能，增加返回标签列表功能，增加按标签查询功能
|
2023-04-21 11:49:39 +08:00 |
|
|
mzaxd
|
9cd97ee573
|
优化[删除标签接口]性能
|
2023-04-21 11:46:46 +08:00 |
|
|
mzaxd
|
761f8d2002
|
[报表列表接口]新增按标签查询功能
|
2023-04-21 11:22:33 +08:00 |
|
|
mzaxd
|
e92233eaca
|
修复报表列表接口重复列Bug
|
2023-04-21 11:20:51 +08:00 |
|
|
mzaxd
|
59c2d6f833
|
修复标签循环引用Bug
|
2023-04-21 10:42:41 +08:00 |
|
|
mzaxd
|
ed9adf2a93
|
修复删除标签后，刷新不出列表的Bug
|
2023-04-21 10:42:09 +08:00 |
|
|
bupengxiang
|
22221173fe
|
工作流 修改一些todo
|
2023-04-20 18:02:56 +08:00 |
|
|
mzaxd
|
d835a37453
|
维护[报表列表接口],新增返回两个字段
|
2023-04-20 16:58:45 +08:00 |
|
|
bupengxiang
|
f70799511a
|
工作流 修改todo
|
2023-04-20 16:55:29 +08:00 |
|
|
mzaxd
|
66cb3abdc4
|
维护[报表列表接口]
|
2023-04-20 16:34:04 +08:00 |
|
|
mzaxd
|
8f042adb27
|
修复报告上传接口Bug
|
2023-04-20 16:17:00 +08:00 |
|
|
mzaxd
|
d65fa09536
|
修改[获取当前标签的父级路径]接口
|
2023-04-20 16:03:45 +08:00 |
|
|
mzaxd
|
8c3ef0a9d9
|
修改[新增报告接口]的返回值
|
2023-04-20 16:02:25 +08:00 |
|
|
mzaxd
|
64f82861b6
|
修改[获取当前标签的路径List接口]的返回值为id
|
2023-04-20 15:33:23 +08:00 |
|
|
mzaxd
|
6fe27234c4
|
改ReportQueryVo,改报表标签关系实体类
|
2023-04-20 15:16:14 +08:00 |
|
|
mzaxd
|
a9ca68af08
|
增加标签路径集合接口
|
2023-04-20 11:50:39 +08:00 |
|
|
xuetao.li
|
ab18d499c2
|
根据id获取多个用户信息的接口完成
|
2023-04-19 18:07:37 +08:00 |
|
|
mzaxd
|
a866bb5d28
|
完善删除功能，目前删除标签的同时会删除所有子标签
|
2023-04-19 17:41:01 +08:00 |
|
|
bupengxiang
|
9092f1a38f
|
工作流 启动
|
2023-04-19 17:37:47 +08:00 |
|
|
xuetao.li
|
48af797f96
|
处理mapper位置问题
|
2023-04-19 17:32:11 +08:00 |
|
|
mzaxd
|
d37ae67084
|
完成报告上传功能
|
2023-04-19 17:15:34 +08:00 |
|
|
xuetao.li
|
94ecb32608
|
处理activity启动
|
2023-04-19 16:30:07 +08:00 |
|
|
xuetao.li
|
dbe999143a
|
去掉额外的fk包
|
2023-04-19 16:19:18 +08:00 |
|
|
mzaxd
|
6c76b8d576
|
增加报表标签关系表
|
2023-04-19 15:50:12 +08:00 |
|
|
mzaxd
|
d283eb00ac
|
TreeLabelVo增加value字段
|
2023-04-19 15:43:55 +08:00 |
|
|
mzaxd
|
580a2f6d4e
|
Revert "完成标签维护功能"
This reverts commit 0eece5f7ec.
|
2023-04-19 15:29:48 +08:00 |
|
|
mzaxd
|
0eece5f7ec
|
完成标签维护功能
|
2023-04-19 15:17:55 +08:00 |
|
|
zer0Black
|
b51b43b449
|
去掉错误的提交
|
2023-04-19 15:15:03 +08:00 |
|
|
zer0Black
|
be5c3ba43f
|
Revert "修复权限的问题"
This reverts commit 5a85e0c29f.
|
2023-04-19 15:15:02 +08:00 |
|