Commit Graph

105 Commits

Author SHA1 Message Date
shangguochao
ee65540361 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
2022-07-06 20:03:51 +08:00
shangguochao
8e73127472 测试环境打包 2022-07-06 20:00:16 +08:00
anhc
2261f14fe9 修改流程属性Word导入接口为批量导入 2022-07-06 15:28:12 +08:00
shangguochao
673e9c89bf 删除不必要文件 2022-07-06 15:26:34 +08:00
qinoy
c25b10ca22 word文件导入批量上传前端修改 2022-07-06 15:09:47 +08:00
chengli
0e902ea525 表单属性解析相关代码 2022-07-06 14:27:02 +08:00
翟林帆
b24da3a557 Merge remote-tracking branch 'origin/master' 2022-07-06 10:17:52 +08:00
翟林帆
df6107eb37 Merge branch 'datamigration-word' of https://e.coding.net/yilidev/yilipalkaifa/apps
 Conflicts:
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlUtils.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/Test.java
	com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/action.xml
2022-07-06 10:16:22 +08:00
anhc
0938985027 Word解析工具内容调整 2022-07-06 10:13:54 +08:00
chengli
d101790c41 富文本编辑第一版代码。 2022-07-05 23:36:19 +08:00
shangguochao
b51e0692b1 打包同步测试环境 2022-07-05 21:18:20 +08:00
446052889@qq.com
24947ddcb7 导入模型是角色图形状间距缩小 2022-07-05 18:54:42 +08:00
446052889@qq.com
7b4863ca65 aris数据迁移IT系统别名映射调整 2022-07-05 18:13:01 +08:00
shangguochao
c92421bf9e Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 17:04:19 +08:00
shangguochao
32370b8d7f 补充vue文件 2022-07-05 17:04:11 +08:00
446052889@qq.com
a57502c9f0 活动描述导入不显示 2022-07-05 16:21:12 +08:00
shangguochao
50690d3dae 本地打包升级测试环境 2022-07-05 10:57:45 +08:00
34f9eae515 质量校验代码 2022-07-04 23:03:34 +08:00
chengli
7bfc017dad 处理相关冲突 2022-07-04 21:19:57 +08:00
chengli
1c5c532317 Merge remote-tracking branch 'origin/master' into datamigration-word
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/WordFinal.java
#	com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
2022-07-04 21:18:41 +08:00
446052889@qq.com
5afbe8fc3b Aris流程导入停止后删除其缓存 2022-07-04 18:23:19 +08:00
shangguochao
044300a218 数据迁移校验问题修正 2022-07-04 18:15:04 +08:00
shangguochao
2cabd75966 数据迁移校验图形属性时问题修改 2022-07-04 17:42:56 +08:00
446052889@qq.com
21db306e90 打包 2022-07-04 15:33:42 +08:00
446052889@qq.com
1847e995ef 数据迁移应用前端调整 2022-07-04 13:38:32 +08:00
446052889@qq.com
668d6104ce Aris流程数据迁移日志记录处理 2022-07-04 12:44:59 +08:00
446052889@qq.com
bdddcbeef2 Aris流程数据迁移日志记录处理 2022-07-04 01:48:15 +08:00
446052889@qq.com
a0e9f5354a Aris流程数据迁移日志记录处理 2022-07-03 01:35:37 +08:00
chengli
bac9094b84 表单导入解析 2022-07-02 23:49:17 +08:00
446052889@qq.com
13b80bf501 Aris流程数据迁移日志记录处理 2022-07-02 13:33:09 +08:00
446052889@qq.com
7d9d5ed35d Aris流程数据迁移日志记录处理 2022-07-02 03:02:07 +08:00
shangguochao
ab16ca6c91 修改xml解析时图形转换对应错误的问题及解决不允许pal应用调用子应用代码类的问题 2022-07-02 00:13:00 +08:00
446052889@qq.com
ad7ddb6b38 aris数据迁移提取到单独目录 2022-07-01 18:06:10 +08:00
446052889@qq.com
0081b0e1bb 流程数据迁移,日志相关db、操作方法 2022-07-01 17:29:13 +08:00
chengli
14e0d08fdc 替换常量CoEConstant引用路径 2022-07-01 17:24:28 +08:00
9b16093b95 word导入 2022-07-01 16:13:58 +08:00
1357400e30 word导入 2022-07-01 16:07:25 +08:00
1ffe7f965b 定时同步组织代码 2022-07-01 16:04:07 +08:00
4e82f54c98 角色模型跳转 2022-07-01 15:04:56 +08:00
d5c096fda4 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-01 14:44:45 +08:00
anhc
ad30a57924 修复bug:4437 数据迁移-word解析-》审核人属性多人,名称没有分隔 2022-07-01 14:15:18 +08:00
720042a4fe Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-01 13:20:04 +08:00
446052889@qq.com
c067e1e1b2 解决导入xml报错问题,bug no 4436 2022-07-01 13:11:02 +08:00
baca7d173d Merge branch 'datamigration-word' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-01 10:45:33 +08:00
chengli
413b303fd2 解析制度~~第一版代码 2022-06-30 21:33:57 +08:00
shangguochao
0dacd4f8c2 批处理工具中字段改为标准的字段ID及成烨代码同步 2022-06-30 21:11:03 +08:00
446052889@qq.com
f19ea3233c aris导入流程时输出属性形状未删除、属性未赋值处理 2022-06-30 14:18:48 +08:00
446052889@qq.com
1b2b8bfbfe aris导入流程时角色岗位处理,另角色图增加"岗位文本"属性存储岗位 2022-06-30 11:07:16 +08:00
446052889@qq.com
62492a0cee aris导入流程时角色岗位处理,另角色图增加"岗位文本"属性存储岗位 2022-06-30 11:04:09 +08:00
eed51d2b1f 定时同步组织代码 2022-06-29 16:43:05 +08:00
anhc
9198759d57 修复禅道bug: 4422 word解析-》名称解析有问题,断行时没获取全:5,6 新版文档 2022-06-29 11:06:46 +08:00
446052889@qq.com
dae3b29c4e Aris流程迁移IT系统属性问题处理 2022-06-28 19:27:08 +08:00
anhc
9f909db508 补交jar 2022-06-28 15:14:50 +08:00
anhc
de587f6e87 pal 流程数据导入Word 表格类型数据调整 2022-06-28 15:13:03 +08:00
446052889@qq.com
1d6767c36b 数据迁移应用上传 2022-06-27 17:39:30 +08:00