Commit Graph
23 Commits
Author SHA1 Message Date
bupengxiang 33e87fea97 [修改] 权限申请对接 + 保密结束时间定时任务 2023-05-10 18:03:27 +08:00
bupengxiang 78b5c3ba19 [修改] 流程中心变更 2023-05-10 10:48:36 +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
zer0Black 960ea0603e 同步代码编写完毕 2023-05-09 14:29:21 +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 3542bd6899 [修改] target 2023-05-08 10:34:12 +08:00
bupengxiang 8d93660dc6 [新增] 报告日志管理 2023-05-06 18:04:14 +08:00
bupengxiang af64620166 [新增] 权限申请流程 及 工作台的接口 开发完毕 2023-04-25 21:05:37 +08:00
bupengxiang 867f703968 [新增] 工作流工作台 及权限申请流程 2023-04-24 21:55:16 +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
mzaxd 19efa5572b 完善[报表列表接口]功能,增加返回标签列表功能,增加按标签查询功能 2023-04-21 11:49:39 +08:00
zer0Black 3ae4481ee8 工作流引入【未完全修复完毕】 2023-04-19 15:15:02 +08:00
mzaxd 27b71b1cc2 完成标签维护功能 2023-04-18 17:36:27 +08:00
xuetao.li 4ce40d9553 修改以前的垃圾代码 2023-04-18 15:46:20 +08:00
zer0Black 0d878d45cb 工作流相关提交 2023-04-17 15:16:53 +08:00
zer0Black b40519a302 工作流引入【未完全修复完毕】 2023-04-17 13:49:01 +08:00
zer0Black 77ca26d6c7 初始化 2022-08-31 14:06:07 +08:00