 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 |
|
shuliYao
|
342d5fb8af
|
fix: 修改登录，三方标识查询由公司表，切换至部门表
|
1 year ago |
|
DELL
|
b6bccd82dc
|
fix:获取系统筛选项接口恢复成之前的，任务审批ai统计接口复制一份出来
|
1 year ago |
|
DELL
|
6845d22efb
|
fix:解决合并冲突
|
1 year ago |
|
DELL
|
b1c92d0ac7
|
Merge branch 'test' into fix/Picture_query_interface
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
# jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
|
1 year ago |
|
DELL
|
198f4e8c33
|
fix:小结查重接口-任务表增加小结是否重复字段，ai统计弹窗接口，完善返回值
|
1 year ago |
|
shuliYao
|
9fa490ff48
|
fix: 无量云配置动态化，配置文件配置清除
|
1 year ago |
|
sunchenliang
|
f6a7c5b926
|
fix: 修改任务终审列表
|
1 year ago |
 Vincent
|
f2d246565b
|
feat: 前端配置管理
|
1 year ago |
|
DELL
|
fff35e5280
|
fix:自定义筛选——>获取ai查询过滤条件回写接口返回值调整
|
1 year ago |
|
DELL
|
84e9ea402e
|
fix:自定义筛选——>获取筛选项接口返回值调整
|
1 year ago |
|
Vincent
|
a6259f9dd3
|
feat: 前端配置管理
|
1 year ago |
|
sunchenliang
|
0cf94d5c4c
|
fix: 修改获取任务包主图
|
1 year ago |
|
sunchenliang
|
3a81017d9e
|
fix: 修改任务终审列表
|
1 year ago |
|
Vincent
|
7eaaef3ae0
|
fix: 更新设置时, 实时更新配置
|
1 year ago |
|
Vincent
|
ddd205321f
|
feat: 前端配置管理
|
1 year ago |
|
DELL
|
cd7e5ff546
|
fix:自定义筛选——>获取ai查询过滤条件回写接口返回值调整
|
1 year ago |
|
DELL
|
6bf042beb5
|
fix:自定义筛选——>获取筛选项接口返回值调整
|
1 year ago |
|
sunchenliang
|
9f77cb6728
|
fix: 修改获取任务包主图
|
1 year ago |
|
sunchenliang
|
0cc8855a60
|
fix: 修改任务审批列表
|
1 year ago |
|
shuliYao
|
80f007f03d
|
fix: 解决提报日期检索问题
|
1 year ago |
|
shuliYao
|
dc0ccfb342
|
fix: 解决工作流过滤字段错误问题
|
1 year ago |
|
Vincent
|
9bffacb0a6
|
fix: 更新设置时, 实时更新配置
|
1 year ago |
|
Vincent
|
55b221d442
|
Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr into test
|
1 year ago |
|
Vincent
|
1994cc35cb
|
feat: 前端配置管理
|
1 year ago |
|
shuliYao
|
334659fbcc
|
fix: 解决提报日期检索问题
|
1 year ago |
|
shuliYao
|
5390be13d7
|
fix: 解决工作流过滤字段错误问题
|
1 year ago |
|
sunchenliang
|
74117f58a8
|
fix: 修改任务终审列表
|
1 year ago |
 zhangyong
|
eff87e6195
|
Merge pull request 'feature/gitPush_dept' (#94) from feature/gitPush_dept into test
Reviewed-on: #94
|
1 year ago |
|
admin
|
2ad0135114
|
修改公司与工作流的关联
|
1 year ago |
|
zhangyong
|
adf86005e7
|
Merge pull request 'feature/gitPush_dept' (#93) from feature/gitPush_dept into test
Reviewed-on: #93
|
1 year ago |
|
shuliYao
|
9dbdee21b2
|
fix: 解决动态列字段接口修改问题
|
1 year ago |
|
admin
|
1b564c8c0a
|
修改用户与多公司关系
|
1 year ago |
 guanzheng
|
0cdf78100e
|
Merge pull request 'feat/QxOcrFieldMg-20240412' (#91) from feat/QxOcrFieldMg-20240412 into test
Reviewed-on: #91
|
1 year ago |
|
15007173189@163.com
|
3b27eca3db
|
init
|
1 year ago |
|
15007173189@163.com
|
08e28750b3
|
init
|
1 year ago |
|
15007173189@163.com
|
365fbec76c
|
init
|
1 year ago |
|
shuliYao
|
a3de7e34ba
|
fix: 解决任务审核查询默认带出筛选条件后，跳转检索不到对应数据问题。
|
1 year ago |
|
guanzheng
|
92d3993ef7
|
init
|
1 year ago |
|
DELL
|
3c7b41abae
|
fix:ai统计弹窗-重复图片统计
|
1 year ago |
|
shuliYao
|
c57e6b1a48
|
fix: 图片分类相应业务代码提交
|
1 year ago |
|
DELL
|
20fc17912e
|
fix:打开全文检索，不输入数据的情况下需要有一个默认展示，展示任务审批和任务终审的待审批状态的最新三条数据
|
1 year ago |
|
cuihaojie
|
5291bb5c9f
|
Merge pull request 'fix:解决图检审批创建时间字段获取值的问题，以及任务审批主图加入可疑文件夹后左侧列表还能查询到的问题' (#87) from fix/Picture_check_approval_creation_time into test
Reviewed-on: #87
|
1 year ago |
|
DELL
|
e3c4111822
|
fix:解决图检审批创建时间字段获取值的问题，以及任务审批主图加入可疑文件夹后左侧列表还能查询到的问题
|
1 year ago |
|
sunchenliang
|
9968d626da
|
Merge remote-tracking branch 'origin/feat/addSynchronizationData-20240409' into feat/addSynchronizationData-20240409
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
|
1 year ago |
|
sunchenliang
|
242c4125e7
|
fix: 修改任务审批列表
|
1 year ago |
|
sunchenliang
|
1ee8c6ec57
|
fix: 修改任务审批列表
|
1 year ago |
|
sunchenliang
|
152f6b0efc
|
Merge pull request 'fix: 审批完成通知无量云' (#84) from feat/addSynchronizationData-20240409 into test
Reviewed-on: #84
|
1 year ago |
|
sunchenliang
|
6edc53605a
|
fix: 审批完成通知无量云
|
1 year ago |
|
DELL
|
6f38e0fb8d
|
fix:解决合并冲突
|
1 year ago |
|
DELL
|
7cad047448
|
Merge branch 'test' into fix/Download_image_interface_added
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
|
1 year ago |
|
DELL
|
075e9d515c
|
fix:修改可疑文件夹相似度排序字段名，适配前端，同时修改apifox，新增下载图片监测接口，该接口暂不完善，还需要调整
|
1 year ago |
|
shuliYao
|
98c6376623
|
fix: 增加根据无量云获取租户信息接口，修改任务审核时项目筛选条件
|
1 year ago |
|
sunchenliang
|
04fe194c65
|
Merge pull request 'fix: 审批完成通知无量云' (#81) from feat/addSynchronizationData-20240409 into test
Reviewed-on: #81
|
1 year ago |
|
sunchenliang
|
4231e5d57e
|
fix: 审批完成通知无量云
|
1 year ago |
|
DELL
|
f277767e27
|
fix:高级检索修复审批状态查询
|
1 year ago |
|
shuliYao
|
c524d375bb
|
fix: 解决任务审核报错
|
1 year ago |
|
shuliYao
|
d056ddb054
|
fix: 关闭自动补齐功能
|
1 year ago |
|
shuliYao
|
cb3c46e5a3
|
fix: 解决没有开启获取hash值问题
|
1 year ago |
|
shuliYao
|
d76ba019c2
|
fix: 解决查重入库数据量过大，导致事务崩溃问题
|
1 year ago |
|
shuliYao
|
d96a911c3f
|
fix: 解决图片本地化，拉取失败增加重试流程，解决查重1.6w条数据导致内存被拉崩。
|
1 year ago |
|
DELL
|
71e97d7bb6
|
fix:修改pro配置文件
|
1 year ago |
|
DELL
|
918676fb35
|
fix:显示可疑文件列表新增提报时间排序和阈值排序
|
1 year ago |
|
shuliYao
|
9f94517852
|
fix: 解决图片下载检测程序问题
|
1 year ago |
|
cuihaojie
|
5fc9a02fdb
|
Merge pull request 'fix:新增图片下载监测，对未下载图片重新放入队列' (#75) from fix/Image_download_monitoring into test
Reviewed-on: #75
|
1 year ago |
|
DELL
|
f3ee195183
|
fix:新增图片下载监测，对未下载图片重新放入队列
|
1 year ago |
|
sunchenliang
|
4304f535d2
|
Merge pull request 'fix: 审批完成通知无量云' (#74) from feat/addSynchronizationData-20240407 into test
Reviewed-on: #74
|
1 year ago |
|
sunchenliang
|
d779191b0d
|
fix: 审批完成通知无量云
|
1 year ago |
|
sunchenliang
|
0e995bf567
|
Merge pull request 'fix: 审批完成通知无量云' (#73) from feat/addSynchronizationData-20240407 into test
Reviewed-on: #73
|
1 year ago |
|
sunchenliang
|
f1a9dc2fb7
|
fix: 审批完成通知无量云
|
1 year ago |
|
shuliYao
|
4b1d62ac7e
|
fix: 拉取无量云2.0数据下载，数据丢失等问题解决，修改线程逻辑
|
1 year ago |
|
DELL
|
3d71a7fca9
|
fix:解决高级筛选sql查询问题（关于时间区间or的情况），解决无量云批量拉取数据问题
|
1 year ago |
|
DELL
|
e5b673fcdb
|
fix:无量云拉取全量数据
|
1 year ago |
|
DELL
|
123dd65e97
|
fix:任务审批高级检索
|
1 year ago |
|
shuliYao
|
ee43a048ae
|
fix: 一键查重模糊搜索问题
|
1 year ago |
|
shuliYao
|
a6d17fbdc4
|
fix: 解决系统排序等各种bug
|
1 year ago |
|
yaoshuli
|
a38e43ddb3
|
Merge pull request 'fix: 任务审核列表补齐返回值信息' (#65) from fix/listalldataComplementResult into test
Reviewed-on: #65
|
1 year ago |
|
shuliYao
|
1392d7c1b0
|
fix: 补齐参数信息
|
1 year ago |
|
sunchenliang
|
718ba4324c
|
fix: 修改相似度列表
|
1 year ago |
|
sunchenliang
|
d8294d704b
|
fix: 修改相似度
|
1 year ago |
|
shuliYao
|
432ac36346
|
fix: 解决终审列表报错问题
|
1 year ago |
|
sunchenliang
|
1680322a64
|
fix: 终审列表添加排序
|
1 year ago |
|
sunchenliang
|
d89a98808f
|
fix: 任务包主图返回任务id
|
1 year ago |
|
sunchenliang
|
229e164046
|
fix: 修改终审列表返回及搜索
|
1 year ago |
|
sunchenliang
|
4737149aa5
|
fix: 修改任务包详情返回taskId
|
1 year ago |
|
shuliYao
|
2e919f8b06
|
fix: 拉取新数据域名代码切换
|
1 year ago |
|
shuliYao
|
9b2cd4b1cb
|
fix: 拉取新数据域名代码切换
|
1 year ago |
|
shuliYao
|
17258e7adb
|
fix: 数据拉取参数环境调整修改。
|
1 year ago |
 LILI
|
9823f6e2c5
|
fix:1.图片列表排序字段变更 2.图片查重列表返回阈值重新获取排序 3.可疑文件删除代码优化
|
1 year ago |
|
LILI
|
b5892c3885
|
fix:可疑文件删除接口增加非空判断,添加API文档注释
|
1 year ago |
|
LILI
|
af56654566
|
fix:1.图片查重页面条件回写接口问题修改
|
1 year ago |
|
DELL
|
a81625f674
|
fix:全文检索-工单搜索部分对已删除数据加判断
|
1 year ago |
|
shuliYao
|
39ecb23c6b
|
fix: 新数据域名及请求切换
|
1 year ago |
|
DELL
|
dd42fa96ad
|
fix:ai统计弹窗，已审批数修改为通过+不通过
|
1 year ago |
|
sunchenliang
|
0aae10cba9
|
fix: 相似度列表增加缩略图
|
1 year ago |
|
DELL
|
24f36fa020
|
fix:测试结束，恢复ai审批工具弹窗原有阈值判断
|
1 year ago |
|
DELL
|
b8da26f48e
|
fix:ai审批工具修改阈值方便测试
|
1 year ago |
|
sunchenliang
|
aee0a37b43
|
fix: ai审批列表及相似度列表返回查重信息
|
1 year ago |
|
sunchenliang
|
719a1885f7
|
Merge pull request 'sunchenliang' (#49) from sunchenliang into test
Reviewed-on: #49
|
1 year ago |
|
cuihaojie
|
bf71402ac8
|
Merge pull request 'fix:高级检索的修改先注释掉，SearchQuery类修改的代码不完整，会影响服务运行' (#48) from fix/Task_approval_Advanced_screening_2898 into test
Reviewed-on: #48
|
1 year ago |
|
sunchenliang
|
193ab52f02
|
fix: ai审批列表及相似度列表返回查重信息
|
1 year ago |
|
DELL
|
4e9d6d3345
|
fix:高级检索的修改先注释掉，SearchQuery类修改的代码不完整，会影响服务运行
|
1 year ago |
|
LILI
|
c92beb488e
|
Merge branch 'test' into fix/dubious_file_2897
|
1 year ago |
|
LILI
|
475cf208c7
|
fix:1.可疑文件搜索返回相关字段信息处理
|
1 year ago |
|
shuliYao
|
e94dcb014c
|
Merge remote-tracking branch 'origin/test' into test
|
1 year ago |
|
shuliYao
|
13d7eea4a4
|
fix: 封装代码提交
|
1 year ago |
|
sunchenliang
|
17a467d3f6
|
fix: 相似度列表添加图片信息
|
1 year ago |
|
sunchenliang
|
d9066f1115
|
fix: 任务重复列表修改
|
1 year ago |
|
sunchenliang
|
3fbe5ba03c
|
Merge remote-tracking branch 'origin/sunchenliang' into sunchenliang
# Conflicts:
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
# jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java
|
1 year ago |
