 gaojiabao
|
ee5def33a4
|
在线编辑添加日志信息
|
2023-06-21 10:42:43 +08:00 |
|
|
gaojiabao
|
c5c75fa1bd
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-20 13:24:15 +08:00 |
|
|
gaojiabao
|
896e1a6448
|
在线编辑文件无法被有效区分
|
2023-06-20 13:24:02 +08:00 |
|
|
SUNJIABIN
|
e4cdc7621b
|
新增同步es数据的定时任务
|
2023-06-20 11:46:56 +08:00 |
|
|
gaojiabao
|
24d44f8eef
|
数组越位异常
|
2023-06-20 10:47:43 +08:00 |
|
|
gaojiabao
|
853e86279a
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-19 16:24:35 +08:00 |
|
|
gaojiabao
|
9eb859c6c4
|
企标修改空指针问题
|
2023-06-19 16:23:56 +08:00 |
|
|
wxyclub
|
c204a21b12
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-19 16:22:13 +08:00 |
|
|
wxyclub
|
c2b779c3c0
|
add:修改对外PDMC读取文件接口查询
|
2023-06-19 16:19:54 +08:00 |
|
|
gaojiabao
|
579b54d2be
|
39测试
|
2023-06-19 14:45:43 +08:00 |
|
|
gaojiabao
|
3a523968c9
|
文件处理测试
|
2023-06-19 14:26:17 +08:00 |
|
|
gaojiabao
|
d584481550
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-19 13:45:15 +08:00 |
|
|
gaojiabao
|
11c1a29710
|
39 测试调用在线编辑文件获取
|
2023-06-19 13:43:48 +08:00 |
|
|
SUNJIABIN
|
bb6ad10c5a
|
新增'企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验'接口
|
2023-06-19 09:54:18 +08:00 |
|
|
SUNJIABIN
|
fecfd518d5
|
新增'企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验'接口
|
2023-06-19 09:15:34 +08:00 |
|
|
gaojiabao
|
078dfef0bf
|
条件导出
|
2023-06-16 17:48:26 +08:00 |
|
|
gaojiabao
|
c8d0cf9a76
|
企业标准条件查询导出
|
2023-06-16 17:03:03 +08:00 |
|
|
gaojiabao
|
e535793bde
|
mq批量文件pdf+导出全部功能
|
2023-06-16 16:38:33 +08:00 |
|
|
gaojiabao
|
ede83fe43e
|
39 测试
|
2023-06-16 13:49:20 +08:00 |
|
|
gaojiabao
|
573890103f
|
39 测试
|
2023-06-15 15:31:13 +08:00 |
|
|
gaojiabao
|
61c5225319
|
39 测试
|
2023-06-15 15:04:57 +08:00 |
|
|
高嵩
|
812d2533f0
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!104
|
2023-06-15 09:24:05 +08:00 |
|
|
gaojiabao
|
12b642f0a8
|
退回pdf
|
2023-06-15 09:22:22 +08:00 |
|
|
gaojiabao
|
5985b060a8
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-06-14 15:57:41 +08:00 |
|
|
gaojiabao
|
a67f4a1ce4
|
pdf转换（样式）
|
2023-06-14 15:57:20 +08:00 |
|
|
高嵩
|
b4870471c9
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!103
|
2023-06-14 12:00:17 +08:00 |
|
|
高嵩
|
444f8e1345
|
修改拆分问题
|
2023-06-13 20:12:53 +08:00 |
|
|
gaojiabao
|
d37ae382b5
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-06-13 15:31:55 +08:00 |
|
|
SUNJIABIN
|
aab7a0fb4a
|
优化企标制定顺序号校验
|
2023-06-13 14:15:27 +08:00 |
|
|
gaojiabao
|
f6f6146c83
|
拆分
|
2023-06-13 11:02:21 +08:00 |
|
|
高嵩
|
67106e61f6
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!102
|
2023-06-12 17:50:15 +08:00 |
|
|
SUNJIABIN
|
efb8e69f02
|
手动全部删除es中的国内外和企标数据，慎用
|
2023-06-12 14:35:58 +08:00 |
|
|
高嵩
|
b1df47a9b7
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!101
|
2023-06-09 10:10:36 +08:00 |
|
|
SUNJIABIN
|
6325b8ef92
|
将es国内外执行删除的代码解开
|
2023-06-09 09:16:23 +08:00 |
|
|
高嵩
|
2a6f73c7ef
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!100
|
2023-06-07 16:38:55 +08:00 |
|
|
gaojiabao
|
9ba9956769
|
文件问题优化
|
2023-06-07 11:41:53 +08:00 |
|
|
高嵩
|
1b98d48b0f
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!99
|
2023-06-06 16:58:49 +08:00 |
|
|
SUNJIABIN
|
be1fc9a7b2
|
增加流程发布时校验顺序号问题
|
2023-06-06 15:51:25 +08:00 |
|
|
SUNJIABIN
|
b7f7e952f2
|
增加流程发布时校验顺序号问题
|
2023-06-06 11:33:36 +08:00 |
|
|
高嵩
|
38effa474b
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!98
|
2023-06-06 11:32:36 +08:00 |
|
|
SUNJIABIN
|
9271f5aa81
|
测试线上定时任务是否好使了
|
2023-06-06 09:55:37 +08:00 |
|
|
高嵩
|
feb89361cd
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!97
|
2023-06-02 17:20:17 +08:00 |
|
|
SUNJIABIN
|
ab458ce073
|
将企业标准根据代替标准号修改文本状态的定时任务修改成每天早晨四点执行
|
2023-06-02 16:05:08 +08:00 |
|
|
高嵩
|
57df454a60
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!96
|
2023-06-02 11:50:51 +08:00 |
|
|
gaojiabao
|
b4d0eab10e
|
代码优化
|
2023-06-02 11:21:32 +08:00 |
|
|
gaojiabao
|
87c0e43dd1
|
代码优化
|
2023-06-02 09:54:08 +08:00 |
|
|
高嵩
|
79ca2f228c
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!95
|
2023-06-01 17:28:44 +08:00 |
|
|
gaojiabao
|
08b16ff16b
|
优化
|
2023-06-01 17:20:19 +08:00 |
|
|
高嵩
|
78e9814921
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!94
|
2023-06-01 16:58:38 +08:00 |
|
|
gaojiabao
|
1f7cd1625c
|
Merge branch 'dev_20230216' of E:\futianxiangmu\foton-slrs-system-rest with conflicts.
|
2023-06-01 16:56:55 +08:00 |
|