sunchenliang
|
c6b3a02a95
|
fix: 修改图鉴相似度列表
|
1 year ago |
 shuliYao
|
06acd7cea5
|
fix: 修改计划筛选
|
1 year ago |
|
yaoshuli
|
6102eee831
|
Merge pull request 'fix: 错误过滤了部分数据' (#143) from feature/schedulePullData into test
Reviewed-on: #143
|
1 year ago |
B1ackJack
|
9ff39fcb05
|
fix: 错误过滤了部分数据
|
1 year ago |
|
shuliYao
|
5dd2e0f107
|
fix: 解决消息没有返回标题问题
|
1 year ago |
 DELL
|
ca34af9442
|
fix:解决终审统计bug，原因的审批节点字段类型修改，不再是数字，终审节点变为finale_judgment
|
1 year ago |
|
yaoshuli
|
881964168a
|
Merge pull request 'fix: 补全时间区间数据处理逻辑' (#140) from feature/schedulePullData into test
Reviewed-on: #140
|
1 year ago |
 guanzheng
|
c7c3f871e5
|
Merge pull request '1:ocr' (#141) from feat/ocr_gz_0420 into test
Reviewed-on: #141
|
1 year ago |
rongfeng
|
ecf98f801a
|
1:ocr
|
1 year ago |
 Vincent
|
13bf3e48cc
|
fix: 补全时间区间数据处理逻辑
|
1 year ago |
|
Vincent
|
ee088456e8
|
fix: 补全时间区间数据处理逻辑
|
1 year ago |
|
yaoshuli
|
49c3bcfc43
|
Merge pull request 'feat: 多线程情况下对准备处理的数据进行查重' (#139) from feature/schedulePullData into test
Reviewed-on: #139
|
1 year ago |
|
Vincent
|
e6c94f4a09
|
feat: 多线程情况下对准备处理的数据进行查重
|
1 year ago |
|
rongfeng
|
f6b34b0e5c
|
1:ocr
|
1 year ago |
|
shuliYao
|
8955091768
|
fix: 解决图片查询，状态 未提交查询无法查出数据问题。
|
1 year ago |
|
shuliYao
|
1e0a51e6af
|
fix: 解决图片查询，状态 in 多选占位只取一个值问题。
|
1 year ago |
|
shuliYao
|
e5bee9519a
|
fix: 解决图片查询，状态不能多选
|
1 year ago |
|
sunchenliang
|
53fd9afc15
|
fix: 修改终审列表
|
1 year ago |
|
sunchenliang
|
dd5b553c74
|
fix: 修改任务终审
|
1 year ago |
 sunchenliang
|
8ac28d6b65
|
Merge pull request 'fix: 修改任务终审' (#137) from fix/updateCheckRepetition20240418 into test
Reviewed-on: #137
|
1 year ago |
|
sunchenliang
|
478e75ab23
|
fix: 修改任务终审
|
1 year ago |
admin
|
a61e6525b0
|
修改会签不支持候选组的bug
|
1 year ago |
|
admin
|
d5ff40103c
|
Merge remote-tracking branch 'origin/test' into test
|
1 year ago |
|
admin
|
c4ac1eac4b
|
增加开启流程的会签
|
1 year ago |
|
shuliYao
|
7f0fde987e
|
fix: 解决多人或签、会签审批taskNode没有赋值问题
|
1 year ago |
|
DELL
|
65f4dc6e78
|
fix:1、设置审批过的任务不能放入可疑文件夹
2、任务状态返回值修改
3、全局搜索不加条件时，返回值加上图检审批列表
|
1 year ago |
|
DELL
|
e8347ea312
|
fix:终审列表当按照states排序时，相似度增加倒序排序
|
1 year ago |
|
cuihaojie
|
90b5d72d48
|
Merge pull request 'fix:全文检索任务审批和终审查询范围修改' (#133) from fix/Full_text_search_query_scope_modified into test
Reviewed-on: #133
|
1 year ago |
|
shuliYao
|
828cd35624
|
fix: 解决一件查重相似度排序、分组排序问题
|
1 year ago |
|
DELL
|
ecad4a2e31
|
fix:全文检索任务审批和终审查询范围修改
1、任务审批由原来的STATES IN ('1','2') AND TASKNAME IN ( '一级审批', '二级审批' ) 修改为TASKNODE !='finale_judgment'
2、终审查询有原来的STATES = '3' AND TASKNAME = '最终审批'修改为 TASKNODE = 'finale_judgment'
|
1 year ago |
|
shuliYao
|
ea97211948
|
fix: 如果查询详情的时候带了taskNo节点，则返回是也将taskNo改为传入的
|
1 year ago |
|
shuliYao
|
c4206c2883
|
fix: 解决单用户多节点审批异常问题
|
1 year ago |
|
guanzheng
|
0ceb8f614f
|
Merge pull request 'feat/ocrPictureLog_20240419' (#132) from feat/ocrPictureLog_20240419 into test
Reviewed-on: #132
|
1 year ago |
15007173189@163.com
|
00962be1c6
|
1:图片查重日志
|
1 year ago |
|
cuihaojie
|
9429bb3bff
|
Merge pull request 'fix:任务终审排序bug' (#131) from fix/Final_list_sort into test
Reviewed-on: #131
|
1 year ago |
|
DELL
|
9b6ca4c629
|
fix:任务终审排序bug
|
1 year ago |
|
15007173189@163.com
|
ba590d027f
|
Merge branch 'test' into feat/ocrPictureLog_20240419
|
1 year ago |
|
shuliYao
|
b0edc74a4c
|
fix: 解决拉取数据时，定位地址map为空，json转换为了 “null” 问题
|
1 year ago |
|
15007173189@163.com
|
171bb66d32
|
1:图片查重日志
|
1 year ago |
|
15007173189@163.com
|
a577ad1f4d
|
1:图片查重日志
|
1 year ago |
|
sunchenliang
|
17747dd4bc
|
Merge pull request 'fix: 修改小结查重添加查重日志' (#130) from fix/updateCheckRepetition20240418 into test
Reviewed-on: #130
|
1 year ago |
|
sunchenliang
|
85bb5c8679
|
fix: 修改小结查重添加查重日志
|
1 year ago |
|
sunchenliang
|
59615140a7
|
Merge pull request 'fix: 修改小结查重添加查重日志' (#129) from fix/updateCheckRepetition20240418 into test
Reviewed-on: #129
|
1 year ago |
|
sunchenliang
|
4b677b0f9f
|
fix: 修改小结查重添加查重日志
|
1 year ago |
 zhangyong
|
9d8d2b1788
|
Merge pull request '增加会签' (#128) from test_Flowable into test
Reviewed-on: #128
|
1 year ago |
|
admin
|
706744f311
|
增加会签
|
1 year ago |
guanzheng
|
0325b0e074
|
feat: 图片墙的图片，阈值100的图片要和跟他比对出100阈值排列在一起
|
1 year ago |
|
guanzheng
|
3501d78a00
|
Merge remote-tracking branch 'origin/test' into test
|
1 year ago |
|
guanzheng
|
4784ea4f25
|
feat: 图片墙的图片，阈值100的图片要和跟他比对出100阈值排列在一起
|
1 year ago |
|
sunchenliang
|
698460c582
|
fix: 修改终审接口查询状态
|
1 year ago |
|
DELL
|
8c7d2751ef
|
fix:优化任务审批统计接口做审批节点隔离；ai统计弹窗实现和任务审批统计接口相同功能
|
1 year ago |
|
shuliYao
|
fb82de6182
|
feat: 拉取数据增加单业务主体拉取接口
|
1 year ago |
|
B1ackJack
|
fcee0dabb2
|
feat: 添加默认图片配置
|
1 year ago |
|
B1ackJack
|
a8579bdaae
|
fix: 修复书写错误
|
1 year ago |
|
B1ackJack
|
7bdad34ac8
|
feat: 补充定时任务拉取数据逻辑
|
1 year ago |
|
Vincent
|
36a3f7762d
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr into test
|
1 year ago |
|
Vincent
|
ed5ca80adb
|
feat: 定时拉取任务
|
1 year ago |
|
DELL
|
5a73353028
|
fix:提报人排序
|
1 year ago |
|
sunchenliang
|
d9507983fb
|
Merge pull request 'fix: 修改任务审批历史记录排序' (#123) from fix/updateFlow20240417 into test
Reviewed-on: #123
|
1 year ago |
|
sunchenliang
|
277874d91a
|
fix: 修改任务审批历史记录排序
|
1 year ago |
|
sunchenliang
|
199dd11d34
|
Merge pull request 'fix: 修改任务审核' (#122) from fix/updateFlow20240417 into test
Reviewed-on: #122
|
1 year ago |
|
sunchenliang
|
9ea06aa9ea
|
fix: 修改任务审核
|
1 year ago |
|
cuihaojie
|
3947240df8
|
Merge pull request 'fix:1、解决任务包相似度列表接口取不到相似度值bug；2、任务审批统计接口做审批节点隔离；3、移入可疑文件夹，如果这个任务审批人不是登录用户，则不允许移入可疑文件夹' (#121) from fix/Home_queries_and_suspicious_folders into test
Reviewed-on: #121
|
1 year ago |
|
DELL
|
9496eb6892
|
fix:1、解决任务包相似度列表接口取不到相似度值bug；2、任务审批统计接口做审批节点隔离；3、移入可疑文件夹，如果这个任务审批人不是登录用户，则不允许移入可疑文件夹
|
1 year ago |
|
shuliYao
|
67bd927def
|
fix: 首页图片，相似度100图片分类到一起
|
1 year ago |
|
shuliYao
|
8cad78c1b3
|
fix: 删除图片创建时间默认值，修改增加test yml，pro yml修改为pord存储客户服务器配置信息。
|
1 year ago |
|
sunchenliang
|
de75221301
|
fix: 修改字段名称
|
1 year ago |
|
sunchenliang
|
d82a7e2369
|
fix: 修改字段名称
|
1 year ago |
|
sunchenliang
|
7b63de2dc6
|
fix: 任务审批列表及详情
|
1 year ago |
|
sunchenliang
|
1b0a0efa29
|
fix: 任务审批列表及详情
|
1 year ago |
|
sunchenliang
|
1b8cf716cb
|
fix: 修改任务多级审批
|
1 year ago |
|
sunchenliang
|
b9c30606a3
|
Merge pull request 'fix: 修改任务审批' (#118) from fix/UpdateFlowComplete20240416 into test
Reviewed-on: #118
|
1 year ago |
|
sunchenliang
|
fd9a6a4666
|
fix: 修改任务审批
|
1 year ago |
|
sunchenliang
|
e5f3e15864
|
Merge pull request 'fix: 修改任务审批' (#117) from fix/UpdateFlowComplete20240416 into test
Reviewed-on: #117
|
1 year ago |
|
sunchenliang
|
78b2f03b6d
|
fix: 修改任务审批
|
1 year ago |
|
DELL
|
0d7c40cf24
|
fix:修改图片查询接口的关联关系-图片表和任务表
|
1 year ago |
|
shuliYao
|
92fb16330e
|
fix: 如果任务没有下载本地图片，不能将任务查出也不能查重。
|
1 year ago |
|
shuliYao
|
916811b340
|
fix: 修改单次拉取无图片给一张默认图，优化图片落地图片已经存在不再重复下载
|
1 year ago |
|
DELL
|
62feb52177
|
fix:图片查询接口-增加筛选条件，条件：任务状态，字段：iztaskstatus(传数字)
|
1 year ago |
|
sunchenliang
|
43dd74c1b2
|
Merge pull request 'fix: 修改相似度列表' (#114) from feat/updateFlow-20240415 into test
Reviewed-on: #114
|
1 year ago |
|
sunchenliang
|
2743383f17
|
fix: 修改相似度列表
|
1 year ago |
|
yaoshuli
|
4afca41edd
|
Merge pull request 'fix: 修复初始化时, 未设置localImagePath' (#112) from feature/frontConf into test
Reviewed-on: #112
|
1 year ago |
|
cuihaojie
|
40299447b6
|
Merge pull request 'fix:图片查询接口-增加返回值-任务状态（返回数字）' (#111) from fix/Return_to_the_task_flow_status into test
Reviewed-on: #111
|
1 year ago |
|
B1ackJack
|
ed063ac5f1
|
fix: 修复初始化时, 未设置localImagePath
|
1 year ago |
|
DELL
|
f3e854c372
|
fix:图片查询接口-增加返回值-任务状态（返回数字）
|
1 year ago |
|
15007173189@163.com
|
e8e6c529e2
|
Merge remote-tracking branch 'origin/test' into feat/QxOcrFieldMg-20240412
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java
|
1 year ago |
|
15007173189@163.com
|
be10cc93a8
|
1:兼容转发http请求
2:新增是否启用字段
|
1 year ago |
|
shuliYao
|
49b671a8b3
|
Merge remote-tracking branch 'origin/test' into test
|
1 year ago |
|
shuliYao
|
562c2e2c3e
|
fix: 解决拉取赋值问题，改租户为业务主体
|
1 year ago |
|
shuliYao
|
e6c7b87a8e
|
fix: 解决配置文件删除字段，导致获取无量云接口错误
|
1 year ago |
|
shuliYao
|
c7b1ff6efc
|
Merge branch 'test' into feature/gitPush_dept
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
|
1 year ago |
|
shuliYao
|
2ed192854f
|
Merge branch 'test' into feature/gitPush_dept
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
|
1 year ago |
|
admin
|
f46e87214d
|
修改工作流审批组权限
|
1 year ago |
|
sunchenliang
|
a50fbf958d
|
Merge pull request 'fix: 修改获取任务包主图' (#106) from feat/updateFlow-20240415 into test
Reviewed-on: #106
|
1 year ago |
|
sunchenliang
|
a71f2d2219
|
fix: 修改获取任务包主图
|
1 year ago |
|
admin
|
acab202aba
|
修改工作流审批组权限
|
1 year ago |
|
sunchenliang
|
f26e310cd2
|
Merge pull request 'fix: 修改获取任务包主图' (#105) from feat/updateFlow-20240415 into test
Reviewed-on: #105
|
1 year ago |
|
sunchenliang
|
c148003504
|
fix: 修改获取任务包主图
|
1 year ago |
|
shuliYao
|
de10dfd664
|
fix: 拉取数据，如果数据为空增加提示
|
1 year ago |
|
shuliYao
|
49204c6711
|
fix: 修改登录,解决根据公司登录显示冻结问题
|
1 year ago |
