 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
|
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
|
0248e691c2
|
[新增] 解决一些流程流转的问题
|
2023-05-11 15:08:38 +08:00 |
|
|
bupengxiang
|
33e87fea97
|
[修改] 权限申请对接 + 保密结束时间定时任务
|
2023-05-10 18:03:27 +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
|
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 |
|
|
mzaxd
|
4e2f0a52ab
|
perf: 基础设置功能健壮性提升
将基础功能设置枚举类增加多个描述字段
|
2023-05-05 09:51:26 +08:00 |
|
|
mzaxd
|
99c7f1ffa9
|
perf: 基础设置功能健壮性提升
现在所有基础设置配置项数据以后端枚举类中的配置为准
|
2023-05-05 09:07:22 +08:00 |
|
|
mzaxd
|
deb237e7f1
|
fix: 修改代码中的默认serialVersionUID
|
2023-05-04 17:05:57 +08:00 |
|
|
mzaxd
|
246d688d4a
|
feat: 基础设置
新增基础设置维护功能，包括基础设置获取和更新
|
2023-05-04 10:59:28 +08:00 |
|
|
bupengxiang
|
dd3c7a2554
|
[修改] 登录403问题
|
2023-04-28 18:21:01 +08:00 |
|
|
bupengxiang
|
9b9457b9dd
|
[修改] 监控流程 调整处理人 永久
|
2023-04-28 10:10:44 +08:00 |
|
|
bupengxiang
|
6e2fc642d3
|
[修改] 流程发起后 删除用户 回显bug
|
2023-04-27 18:02:30 +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
|
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
|
22221173fe
|
工作流 修改一些todo
|
2023-04-20 18:02:56 +08:00 |
|
|
xuetao.li
|
ab18d499c2
|
根据id获取多个用户信息的接口完成
|
2023-04-19 18:07:37 +08:00 |
|
|
bupengxiang
|
9092f1a38f
|
工作流 启动
|
2023-04-19 17:37:47 +08:00 |
|
|
xuetao.li
|
dbe999143a
|
去掉额外的fk包
|
2023-04-19 16:19:18 +08:00 |
|
|
zer0Black
|
3ae4481ee8
|
工作流引入【未完全修复完毕】
|
2023-04-19 15:15:02 +08:00 |
|
|
xuetao.li
|
4ce40d9553
|
修改以前的垃圾代码
|
2023-04-18 15:46:20 +08:00 |
|
|
xuetao.li
|
e796a0000e
|
同步基本框架处理完毕
|
2023-04-18 11:53:45 +08:00 |
|
|
xuetao.li
|
5244ba8245
|
同步日志表相关实体补充
|
2023-04-18 10:15:40 +08:00 |
|