Commit Graph

338 Commits (25c729783dce23fadeb3dbbd238db950c7beb759)

Author SHA1 Message Date
youhong.ai 17ba40eee8 修改关键字定位方式 2023-06-02 11:29:18 +08:00
ic_excellent a470f368cb 修复collection bug 2023-06-02 11:04:26 +08:00
ic_excellent 2af595ad81 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并
2023-06-02 11:00:28 +08:00
ic_excellent 2dbea71ba0 上传文件 2023-06-02 11:00:00 +08:00
wangxuanran 685240f2f8 极兔ncc 自定义sql用{mainTable}代替当前表名代码同步 2023-05-31 10:07:27 +08:00
youhong.ai 7e6fa007e0 fix deal whti maping bug rs 大小写 2023-05-31 09:40:59 +08:00
youhong.ai bbcd42e79f fix rs 初始化失败 2023-05-30 11:50:41 +08:00
youhong.ai a4f9ded450 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并
2023-05-23 14:45:32 +08:00
youhong.ai 04a019b5ce 修改 2023-05-23 14:45:23 +08:00
chaoyang.he cc015d6098 航天科技-台账同步 2023-05-21 20:20:30 +08:00
chaoyang.he 0e2e6325f3 文件备份---何朝阳 2023-05-17 10:29:15 +08:00
ic_excellent 3b00297fef Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并冲突
2023-05-16 14:54:01 +08:00
ic_excellent a45c94e1ee 保时捷开发 2023-05-16 14:51:30 +08:00
chaoyang.he f2b938e668 Merge remote-tracking branch 'origin/dev' into dev 2023-05-15 17:58:59 +08:00
chaoyang.he 0284f4c70b 文件备份---何朝阳 2023-05-15 17:58:42 +08:00
youhong.ai 402082f038 mapper拼接类 2023-05-12 21:17:28 +08:00
youhong.ai ad6c60dc9f mapper拼接类 2023-05-12 21:14:04 +08:00
youhong.ai 8b8ab74483 mapper拼接类 2023-05-12 21:12:06 +08:00
wangxuanran ce90fa1def 修复自定义sql方法bug 2023-05-12 15:55:33 +08:00
wangxuanran a0bc9c30b9 建模生成json类日志文件修改 2023-05-12 13:42:20 +08:00
youhong.ai b5d95fb201 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
修复dealwith bug、洲际酒店任务元素开发
2023-05-12 11:15:41 +08:00
youhong.ai 0cc0b9889a 洲际酒店任务元素开发、delwithbug修复 2023-05-12 11:15:29 +08:00
wangxuanran cb02ca6184 中船流程推送cms系统 2023-05-11 15:25:53 +08:00
youhong.ai daaefd64c2 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并远程分支
2023-05-10 14:15:35 +08:00
youhong.ai 7772b404dc 雅诗兰黛拆单报表、洲际酒店任务元素 2023-05-10 14:15:05 +08:00
ic_excellent a66422b667 解决冲突 2023-05-06 15:21:42 +08:00
ic_excellent 3ed657ebec 修改文件 2023-05-06 15:17:47 +08:00
ic_excellent a5f477ad9d 修改 2023-05-06 15:15:28 +08:00
ic_excellent e3a1a7060e Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-05-06 13:51:48 +08:00
ic_excellent 78140f7c35 提交 2023-05-06 13:51:21 +08:00
wangxuanran d78176c580 代码备份提交 2023-05-04 14:34:40 +08:00
youHong.ai edb807e430 添加老项目代码,雅诗兰黛代码初始化 2023-04-25 10:20:19 +08:00
youHong.ai c69aeb13bf 修改dealWithMapping的默认值空指针异常bug修改 2023-04-24 13:52:16 +08:00
youHong.ai e23fc2161e 邮箱黑名单 2023-04-21 15:28:34 +08:00
youHong.ai 1aac6f6cc4 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
float精度修复
2023-04-20 15:19:57 +08:00
youHong.ai 01c6cf1cdc 修改float精度问题 2023-04-20 15:19:49 +08:00
ic_excellent 0e77a487d8 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-04-20 14:18:43 +08:00
ic_excellent c9aee48ecd 信银知识产权局 2023-04-20 14:18:27 +08:00
youHong.ai a691c6def9 签字意见 2023-04-17 22:47:28 +08:00
youHong.ai abf48d1d7d 冲突解决 2023-04-14 10:19:25 +08:00
youHong.ai aeb04f41d4 修改文件 2023-04-14 10:16:48 +08:00
王宣然 7717781676 2023-04-09 上海大数据中心统一待办 2023-04-09 21:15:39 +08:00
王宣然 9275631cd8 解决double超出精度转成科学记数法的问题 2023-04-04 17:15:00 +08:00
yushun.ding ee64140219 金额类型字段 + - * / 处理 2023-03-27 13:03:45 +08:00
yushun.ding 3c49ade7b4 方法补充static 2023-03-25 21:12:22 +08:00
yushun.ding 4615e23317 新增多语言处理方法 2023-03-25 00:26:00 +08:00
youHong.ai 1dcce55d72 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
修改登录名生成逻辑
2023-03-23 16:15:43 +08:00
youHong.ai e22366fdc5 修改分部名称生成登录名逻辑 2023-03-23 16:15:32 +08:00
ic_excellent ed3b04b6d5 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-23 13:24:08 +08:00
ic_excellent a7b324ce6c 新弘农业报表需求 2023-03-23 13:23:58 +08:00
youHong.ai 228ed443a1 添加智己水印图片添加,德尔格隐私签字意见功能 2023-03-23 10:28:39 +08:00
youHong.ai f79891d95f 支持批量参数传递名称 2023-03-20 14:41:44 +08:00
youHong.ai 2ea391e814 支持批量参数传递名称 2023-03-20 14:40:59 +08:00
youHong.ai d776524824 修改getLogger lombook无法覆盖get方法 2023-03-18 04:19:51 +08:00
youHong.ai a62038fda8 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-18 04:18:14 +08:00
youHong.ai ab52c273f9 修改getLogger lombook无法覆盖get方法 2023-03-18 04:18:09 +08:00
ic_excellent 50b8582287 报表 2023-03-18 04:16:38 +08:00
youHong.ai 7bd5d5b782 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-17 23:07:46 +08:00
youHong.ai 5e3c18b8bb mymapper 完善,但是没有测试 2023-03-17 23:07:37 +08:00
ic_excellent f71d0dbe18 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-15 16:14:48 +08:00
ic_excellent 950b68a796 请求配置-修复自定义表无法查询数据的问题 2023-03-15 16:14:21 +08:00
youHong.ai 9399401fb7 bind命令、choose命令以及其他东西 2023-03-15 14:00:40 +08:00
youHong.ai 7f67f4a8ac Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
添加bind、choose指令
2023-03-15 13:57:05 +08:00
youHong.ai 0d252c6452 bind命令、choose命令以及其他东西 2023-03-15 13:56:53 +08:00
王宣然 af939631b4 2023-03-15 团校mq代码 2023-03-15 13:50:48 +08:00
youHong.ai 8b16f9ca57 好多东西添加 2023-03-14 15:12:53 +08:00
youHong.ai 7489f8d291 添加trim指令 2023-03-05 21:54:09 +08:00
youHong.ai d9d6b77a93 添加if指令 2023-03-04 16:04:39 +08:00
youHong.ai 2bbac377aa 添加jexl依赖,添加脚本执行器 2023-03-04 00:48:34 +08:00
youHong.ai 8c84a01a69 fix \ to double 2023-03-03 18:08:39 +08:00
youHong.ai 86b6dc1ef6 for - map 2023-03-03 17:40:03 +08:00
youHong.ai 08a396fe40 常量抽离 2023-03-03 17:32:32 +08:00
youHong.ai e5f001cd9e 动态sql解析 2023-03-03 17:28:38 +08:00
ic_excellent 680e4b9343 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-03-03 16:27:10 +08:00
ic_excellent 0f54e90b33 万象报表开发 2023-03-03 16:26:53 +08:00
youHong.ai 4a54e7f5c7 极兔登录消息查询、mapper修改 2023-02-27 11:55:12 +08:00
ic_excellent 80d9200fdf Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-02-27 11:25:22 +08:00
ic_excellent 7d005de99a mapper支持Double 2023-02-27 11:24:02 +08:00
youHong.ai 12870f6339 单点登录、修改线程池 2023-02-24 15:28:54 +08:00
youHong.ai 09ea2f1bdb Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并修改https
2023-02-22 17:02:04 +08:00
youHong.ai 5216cfecd1 附件赋值,生成loginID,修复httpUtils set方法 2023-02-22 17:01:58 +08:00
ic_excellent 28464f4c8d Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-02-20 16:15:56 +08:00
ic_excellent f407d83354 电装相关开发 2023-02-20 16:15:34 +08:00
youHong.ai 63bf2a1642 mapper优化,流程条件赋值action 2023-02-20 16:10:24 +08:00
youHong.ai e9fedf8b8f Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并修改ssl绕过的方式
2023-02-16 19:00:42 +08:00
youHong.ai 2857d0a3df ssl测试 2023-02-16 19:00:32 +08:00
ic_excellent 01a21547d8 保时捷年终总结 2023-02-16 14:56:06 +08:00
ic_excellent e6a67339a9 克来机电 - 流程编号生成规则自定义 2023-02-13 12:11:16 +08:00
youHong.ai 9dacdd2751 修改dealwithmapping获取字段数据bug 2023-02-12 22:17:44 +08:00
王宣然 dfc89e7d21 柏美流水创建,团校mq代码修改 2023-02-12 21:08:09 +08:00
youHong.ai 65ebec9fa3 屹宏电梯阶段图节点台账信息开发 2023-02-08 16:22:29 +08:00
youHong.ai 1e754843ff Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并远程到sap开发
2023-02-06 18:57:15 +08:00
youHong.ai ce6908f603 sap凭证本地文件生成 2023-02-06 18:57:02 +08:00
ic_excellent bf999d1367 电装发票勾选接口开发 2023-02-06 11:31:40 +08:00
ic_excellent 8057e5dc28 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev 2023-02-02 11:09:49 +08:00
ic_excellent e840cf64db 添加 前端开发环境搭建文档 2023-02-02 11:07:01 +08:00
youHong.ai 8204400283 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
合并年前保时捷的开发
2023-02-02 10:26:45 +08:00
youHong.ai 87771e9426 保时捷定时任务,前端代码,util优化 2023-02-02 10:26:35 +08:00
xuanran.wang 557afeaa25 2023-01-12 施罗德代码测试提交与mq部分代码 2023-01-12 16:47:02 +08:00
weilin.zhu 4bbe6a2df8 修复请求form表单提交时,参数值被双引号括了起来 2023-01-05 12:14:38 +08:00
王宣然 bef9b98546 mq消息队列消费者代码编写 2023-01-03 21:03:37 +08:00
wangxuanran 868fc51f2d mq消息队列开发 2023-01-03 09:40:04 +08:00
wangxuanran 50789e184b 上汽出行以及施罗德代码测试完成 2022-12-23 16:07:57 +08:00
youHong.ai f2b3189e4f 同一个线程支持多个事务mapper 2022-12-21 23:58:45 +08:00
youHong.ai 8e6720335d fix dealwithmapping lowecase bug 2022-12-21 23:22:58 +08:00
youHong.ai 958a9d7029 添加maper事务支持 2022-12-21 23:02:27 +08:00
youHong.ai 242080e581 修改方法重载中docid没设置的bug 2022-12-19 19:49:02 +08:00
jiacheng.deng e99562c417 修改请求日志输出所有相应数据导致日志太大的问题 2022-12-16 16:40:42 +08:00
jiacheng.deng 88d6b40fb5 fix filename bug fieldname不明确 2022-12-16 15:16:40 +08:00
jiacheng.deng d0c7e50ec4 修改测试类 2022-12-16 15:13:09 +08:00
jiacheng.deng 8c9a17a653 Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev
# Conflicts:
#	src/test/java/youhong/ai/pcn/TestOrganization.java
2022-12-16 15:11:01 +08:00
jiacheng.deng 8198c7e4eb 修改测试 2022-12-16 15:05:04 +08:00
wangxuanran d94aa8e9fa 删除临时文件 2022-12-13 18:39:38 +08:00
wangxuanran 42f39f73b1 Merge branch 'dev' of http://1.15.45.82:3000/ecology/ebu_ecology_dev1 into dev 2022-12-13 18:27:26 +08:00
wangxuanran 1654d4f765 优化CusBaseAction以及施罗德代码完善 2022-12-13 18:03:24 +08:00
youHong.ai 4170596ba1 修改action模板方法,解决潜在的线程不安全问题 2022-12-13 17:38:15 +08:00
youHong.ai 8b55a4bd64 字符串格式化输出修复,替换$引发的Illegal group reference错误 2022-12-13 16:55:52 +08:00
youHong.ai 0dde57349d 字符串格式化输出修复 2022-12-13 16:13:25 +08:00
youHong.ai 3a2234cbcc 路径参数获取?bug修复 2022-12-13 15:43:15 +08:00
youHong.ai 1f59f96dac apa等级带出 2022-12-13 15:30:18 +08:00
youHong.ai d59ed4f677 修改流程保存触发流程转数据接口,修改分布式锁,添加建模targetSetting按钮置灰 2022-12-13 10:35:10 +08:00
wangxuanran 24a1db60ac 2022-12-12 文件提示插件测试 2022-12-12 14:17:20 +08:00
youHong.ai ffd51db3ff 修改本地锁map对象为线程安全的map 2022-12-11 23:10:32 +08:00
youHong.ai 8e8b6376e6 修改cus日志输出范围,分布式锁新增添加新增失败可能是其他服务器抢占的逻辑控制 2022-12-11 22:57:35 +08:00
youHong.ai 2d4bce9513 分布式非公平锁实现、路径参数正则表达式修改增强 2022-12-11 16:51:14 +08:00
youHong.ai 50989aa997 添加ecode更加安全的发布样式文件以及引入第三方库 2022-12-10 16:45:29 +08:00
youHong.ai 7975f9b797 添加easyexcel依赖,编写excel单元格合并测试代码,分析可行性 2022-12-10 12:24:55 +08:00
youHong.ai b7af6ffe34 保时捷人事保存流程触发流程转数据、丰田纺织流程名称可以根据字段配置 2022-12-09 23:10:13 +08:00
youHong.ai 76beae6bfc 合并TestOrganization冲突 2022-12-08 15:36:44 +08:00
youHong.ai 72f8bca9aa 合并TestOrganization冲突 2022-12-08 15:36:22 +08:00
youHong.ai a85e0777e3 保时捷target setting 流程控制开发 2022-12-08 15:32:28 +08:00
ic_excellent df1e8bb8c1 添加相关工具类信息 2022-12-08 15:07:18 +08:00
youHong.ai 01014bda04 保时捷人员组织架构图修改、响应对象修改 2022-12-07 19:38:35 +08:00
wangxuanran fdb7bac7f6 施罗德下载文件接口修改 2022-12-07 15:08:39 +08:00
youHong.ai 501bddf2f1 修改正则表达式可以匹配'`?`'的形式 2022-12-06 19:21:31 +08:00
wangxuanran e83d55c455 参数类型枚举类增加object类型以及生成json类中对参数类型转换逻辑增加object判断 2022-12-06 17:43:44 +08:00
youHong.ai e53858e7c6 Merge branch 'dev' of http://1.15.45.82:3000/youhong.ai/ecology_dev into dev
合并远程代码
2022-12-06 17:06:57 +08:00
youHong.ai af35223154 修改亢亢上传附件的实体类,添加附件docid和imagefileid 2022-12-06 17:03:35 +08:00
wangxuanran b1340f0b8e Merge branch 'dev' of http://1.15.45.82:3000/youhong.ai/ecology_dev into dev 2022-12-06 13:54:31 +08:00
wangxuanran 31286babb2 施罗德代码开发以及生成json工具类代码修改 2022-12-06 13:13:31 +08:00
youHong.ai 6f1e24a274 修改cusBaseAction,新增使用非全局requestInfo对象获取数据方法,防 止多线程下出现问题 2022-12-06 13:08:57 +08:00
youHong.ai d5b0805ea5 修改组织架构图 2022-12-06 11:49:50 +08:00
wangxuanran bc6b5eb9d5 修改缓存 2022-12-06 11:22:06 +08:00
wangxuanran 19e724b59d Merge branch 'dev' of http://1.15.45.82:3000/youhong.ai/ecology_dev into dev 2022-12-06 11:18:58 +08:00
youHong.ai 2360774e9d 修改 2022-12-06 11:14:59 +08:00
wangxuanran 203a7cd4a9 修改缓存 2022-12-05 19:22:01 +08:00
youHong.ai 26c7992abd 新增查询工具映射boolean类型,保时捷人员组织架构图默认全部展开 2022-12-05 15:09:34 +08:00
youHong.ai a54073c604 保时捷人员组织架构后端代码编写 2022-12-04 19:51:12 +08:00
youHong.ai 9bf767afb5 修改附件上传push缺少文件 2022-12-01 16:35:18 +08:00
youHong.ai ff371a3cc9 修改附件上传类名称 2022-12-01 10:28:48 +08:00
youHong.ai c02aea81be 维护常用信息文档,测试方法测试Builder类 2022-11-27 20:49:32 +08:00
youHong.ai 52102ba058 维护邮件上传附件常用文档 2022-11-25 17:35:20 +08:00
youHong.ai 82a22c3af8 处理忽略文件 2022-11-25 16:50:19 +08:00
youHong.ai 894e56b974 修改人员组织架构代码 2022-11-25 16:47:48 +08:00
wangxuanran d4df5698ec wxr 2022-11-25威科数据先行代码编写以及增加常用信息文档后端1-4内容 2022-11-25 16:32:54 +08:00
youHong.ai 062b998ce5 修改cusBaseAction,新增异常回调方法 2022-11-25 13:25:29 +08:00
youHong.ai 4abb771154 合并xuanran组织架构同步 2022-11-23 22:27:10 +08:00
wangxuanran ad3eed6d87 wxr 2022-11-23删除掉临时文件夹并且修改gitignore排除/src/main/resources/file 2022-11-23 21:27:05 +08:00
wangxuanran eac719477d wxr 2022-11-23 交银理财威科数据先行 2022-11-23 21:22:43 +08:00
wangxuanran cf1bb661ed wxr 2022-11-23 交银理财威科数据先行代码 2022-11-23 21:16:45 +08:00
youHong.ai 23fefd6ab8 新增csv读取工具类,人员组织结构同步代码从wesmat整理到hr系统 2022-11-23 18:52:38 +08:00
youHong.ai 618d1b2a3d 修改BaseTest,修复全局变量引用log报空指针异常 2022-11-23 14:31:16 +08:00
youHong.ai 8a8cf33c4a 修改BaseTest,修复全局变量引用log报空指针异常 2022-11-23 14:29:56 +08:00
wangxuanran f3a4c4877c wxr 2022-11-23修改baseTest文件 2022-11-23 13:12:45 +08:00
wangxuanran 565a2e47f6 Merge branch 'dev' of https://gitee.com/it-xiaoxiong/e9-project-ebu7-dev1 into dev 2022-11-23 12:59:34 +08:00
youHong.ai 15dd223a9b 修改baseTest类,使其更加通用 2022-11-23 11:41:25 +08:00
youHong.ai 8d8375bded http工具修改 2022-11-23 10:10:06 +08:00
wangxuanran b09f13ebc2 Merge branch 'dev' of https://gitee.com/it-xiaoxiong/e9-project-ebu7-dev1 into dev 2022-11-23 10:06:11 +08:00
wangxuanran 96c1fa69d4 xuanran.wang 2022-11-21 提交交银代码 2022-11-23 09:59:43 +08:00
youHong.ai 222e998b6c sftp工具类编写 2022-11-22 18:48:25 +08:00
youHong.ai 2c0300f8d4 修复CusBaseAction中没有获取明细id 2022-11-22 18:21:50 +08:00
youHong.ai 25db7d1f55 测试sftp 2022-11-22 17:54:34 +08:00
youHong.ai 09cdc32bf8 排除文件修改 2022-11-22 17:04:20 +08:00
wangxuanran 8587eafee4 Merge branch 'dev' of https://gitee.com/it-xiaoxiong/e9-project-ebu7-dev1 into dev 2022-11-22 16:57:09 +08:00
wangxuanran ba2867a669 wxr 2022-11-22 测试合并 2022-11-22 16:56:44 +08:00
youHong.ai 6c3a2bc795 排除文件修改 2022-11-22 16:54:42 +08:00
wangxuanran beb5b940a0 wxr 2022-11-22 交银理财威科先行数据写入建模 2022-11-22 16:33:58 +08:00
youHong.ai a11b0b9cf0 老大工具包补充 2022-11-22 16:33:19 +08:00
youHong.ai e9bd4fd92a 肖工具添加 2022-11-22 16:24:35 +08:00
youHong.ai a1dd155733 sftp工具 2022-11-22 15:03:13 +08:00
youHong.ai dc55a7d982 sftp工具 2022-11-22 14:58:48 +08:00
youHong.ai f635f209f9 sftp工具 2022-11-22 14:57:42 +08:00
youHong.ai bef608d57f util jar文件更新 2022-11-22 14:44:37 +08:00
youHong.ai b7f8c6a920 修改忽略文件 2022-11-22 12:59:43 +08:00
youHong.ai 6647fccc48 修改baseTest 2022-11-22 12:43:22 +08:00
youHong.ai 0fe5bda2e4 新增设置systemFilePath方法,创建保时捷sftp工具类 2022-11-22 12:38:33 +08:00
youHong.ai 244a7b6162 新增设置systemFilePath方法,创建保时捷sftp工具类 2022-11-22 12:36:33 +08:00
youHong.ai 7900654b0d frist commit 2022-11-22 00:24:17 +08:00