guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • d0d40b7b35 fix:1、短信验证码登录，解决前端菜单权限列表为空bug； 2、三方标识错误提示账号不存在，修改为提示企业编码或者账号不存在 3、重设密码时，对登录名和手机号进行验证 DELL 2024-04-25 19:33:15 +0800
  • 877aa7f570 Merge pull request 'fix:修改/ocr/ocrUsersearch/querySearchCondition接口返回审核状态字段，应该是iztaskstatus' (#149) from fix/One-click_check_Reaudit_status_field_modification into test cuihaojie 2024-04-25 14:42:22 +0800
  • fc9ace25ce fix:修改/ocr/ocrUsersearch/querySearchCondition接口返回审核状态字段，应该是iztaskstatus DELL 2024-04-25 14:40:42 +0800
  • 964fb9e9bc Merge pull request 'fix: 修复图片配置样式' (#148) from feature/schedulePullData into test yaoshuli 2024-04-25 14:24:46 +0800
  • 33bda90426 fix: 修复图片配置样式 feature/schedulePullData B1ackJack 2024-04-25 14:08:29 +0800
  • f4446bf7c4 fix: 解决代码 shuliYao 2024-04-25 13:13:56 +0800
  • a416f8cb2f Merge pull request 'test_frontmenu' (#147) from test_frontmenu into test zhangyong 2024-04-25 00:01:16 +0800
  • dc0605c7fe 增加menu菜单管理 test_frontmenu admin 2024-04-24 23:59:46 +0800
  • 08c48f193a 增加menu菜单管理 admin 2024-04-24 23:59:02 +0800
  • 5756cfc65c Merge pull request 'fix:图片查询接口增加返回字段，图片的宽和高' (#146) from fix/Image_query_Returns_image_information into test cuihaojie 2024-04-24 17:20:00 +0800
  • 84c7fee317 fix:图片查询接口增加返回字段，图片的宽和高 DELL 2024-04-24 17:19:09 +0800
  • 416eea5b85 Merge remote-tracking branch 'origin/test' into test Administrator 2024-04-24 16:05:53 +0800
  • 1d3987b5c7 1:去重校验 Administrator 2024-04-24 16:05:02 +0800
  • 0ed075a0a7 1:去重校验 Administrator 2024-04-24 15:41:56 +0800
  • a1460528ec fix: 解决高级检索，计划没有带出来的问题 shuliYao 2024-04-24 15:22:24 +0800
  • a30a19a0f2 1:bug修复 Administrator 2024-04-24 14:59:16 +0800
  • 97d8f1b1cb 去掉无用的按钮 admin 2024-04-24 14:31:49 +0800
  • a5eb7d7cc6 修改名称 admin 2024-04-24 14:27:14 +0800
  • a7868f1a0c 增加提示信息 admin 2024-04-24 12:17:47 +0800
  • 50bacc8d1a 去掉岗位选择 admin 2024-04-24 11:53:29 +0800
  • dbff3d7f30 Merge remote-tracking branch 'origin/test' into test guanzheng 2024-04-23 12:14:47 +0800
  • 2380ac241f fix: 分组过后没有再分bug修复 guanzheng 2024-04-23 12:14:36 +0800
  • 2a8c13f4a0 fix: 图片查询接口，增加是否为历史重复字段 shuliYao 2024-04-22 23:06:40 +0800
  • 22395d0e5d Merge pull request 'fix: 优化任务包主图' (#145) from fix/updatePictureSimilarity20240422 into test sunchenliang 2024-04-22 22:34:02 +0800
  • ceff620235 fix: 优化任务包主图 fix/updatePictureSimilarity20240422 sunchenliang 2024-04-22 22:33:40 +0800
  • 309ad89610 Merge pull request 'fix: 修改图鉴相似度列表' (#144) from fix/updatePictureSimilarity20240422 into test sunchenliang 2024-04-22 20:55:16 +0800
  • c6b3a02a95 fix: 修改图鉴相似度列表 sunchenliang 2024-04-22 20:54:43 +0800
  • 06acd7cea5 fix: 修改计划筛选 shuliYao 2024-04-22 19:07:24 +0800
  • 6102eee831 Merge pull request 'fix: 错误过滤了部分数据' (#143) from feature/schedulePullData into test yaoshuli 2024-04-22 18:50:57 +0800
  • 9ff39fcb05 fix: 错误过滤了部分数据 B1ackJack 2024-04-22 17:37:19 +0800
  • 5dd2e0f107 fix: 解决消息没有返回标题问题 shuliYao 2024-04-22 14:07:30 +0800
  • e56d82f8ee Merge pull request 'fix:解决终审统计bug，原因的审批节点字段类型修改，不再是数字，终审节点变为finale_judgment' (#142) from fix/Approval_node_adjustment into test cuihaojie 2024-04-22 12:41:14 +0800
  • ca34af9442 fix:解决终审统计bug，原因的审批节点字段类型修改，不再是数字，终审节点变为finale_judgment DELL 2024-04-22 12:39:31 +0800
  • 881964168a Merge pull request 'fix: 补全时间区间数据处理逻辑' (#140) from feature/schedulePullData into test yaoshuli 2024-04-22 09:01:44 +0800
  • c7c3f871e5 Merge pull request '1:ocr' (#141) from feat/ocr_gz_0420 into test guanzheng 2024-04-21 22:55:34 +0800
  • ecf98f801a 1:ocr rongfeng 2024-04-21 22:56:08 +0800
  • 13bf3e48cc fix: 补全时间区间数据处理逻辑 Vincent 2024-04-21 21:20:43 +0800
  • ee088456e8 fix: 补全时间区间数据处理逻辑 Vincent 2024-04-21 21:20:43 +0800
  • 49c3bcfc43 Merge pull request 'feat: 多线程情况下对准备处理的数据进行查重' (#139) from feature/schedulePullData into test yaoshuli 2024-04-21 18:02:41 +0800
  • e6c94f4a09 feat: 多线程情况下对准备处理的数据进行查重 Vincent 2024-04-21 14:55:36 +0800
  • 63878bb0fd Merge pull request '1:ocr' (#138) from feat/ocr_gz_0420 into test guanzheng 2024-04-20 19:28:20 +0800
  • f6b34b0e5c 1:ocr rongfeng 2024-04-20 19:28:49 +0800
  • 8955091768 fix: 解决图片查询，状态 未提交查询无法查出数据问题。 shuliYao 2024-04-20 16:29:17 +0800
  • 1e0a51e6af fix: 解决图片查询，状态 in 多选占位只取一个值问题。 shuliYao 2024-04-20 15:01:07 +0800
  • e5bee9519a fix: 解决图片查询，状态不能多选 shuliYao 2024-04-20 13:40:46 +0800
  • 53fd9afc15 fix: 修改终审列表 sunchenliang 2024-04-20 12:18:35 +0800
  • dd5b553c74 fix: 修改任务终审 sunchenliang 2024-04-20 11:59:57 +0800
  • 8ac28d6b65 Merge pull request 'fix: 修改任务终审' (#137) from fix/updateCheckRepetition20240418 into test sunchenliang 2024-04-20 11:55:49 +0800
  • 478e75ab23 fix: 修改任务终审 fix/updateCheckRepetition20240418 sunchenliang 2024-04-20 11:55:23 +0800
  • f6a1839647 Merge pull request '修改会签不支持候选组的bug' (#136) from test_flowableAssgin into test zhangyong 2024-04-20 11:06:44 +0800
  • a61e6525b0 修改会签不支持候选组的bug test_flowableAssgin admin 2024-04-20 11:05:22 +0800
  • d5ff40103c Merge remote-tracking branch 'origin/test' into test admin 2024-04-19 23:16:14 +0800
  • c4ac1eac4b 增加开启流程的会签 admin 2024-04-19 23:15:34 +0800
  • 7f0fde987e fix: 解决多人或签、会签审批taskNode没有赋值问题 shuliYao 2024-04-19 23:14:55 +0800
  • 1afc6239d9 Merge pull request 'fix:1、设置审批过的任务不能放入可疑文件夹' (#135) from fix/Suspicious_folder_restriction into test cuihaojie 2024-04-19 19:01:46 +0800
  • 65f4dc6e78 fix:1、设置审批过的任务不能放入可疑文件夹 2、任务状态返回值修改 3、全局搜索不加条件时，返回值加上图检审批列表 DELL 2024-04-19 19:00:09 +0800
  • cf52d75505 Merge pull request 'fix:终审列表当按照states排序时，相似度增加倒序排序' (#134) from fix/Final_list_sort into test cuihaojie 2024-04-19 17:15:49 +0800
  • e8347ea312 fix:终审列表当按照states排序时，相似度增加倒序排序 DELL 2024-04-19 17:14:45 +0800
  • 90b5d72d48 Merge pull request 'fix:全文检索任务审批和终审查询范围修改' (#133) from fix/Full_text_search_query_scope_modified into test cuihaojie 2024-04-19 17:00:23 +0800
  • 828cd35624 fix: 解决一件查重相似度排序、分组排序问题 shuliYao 2024-04-19 16:59:27 +0800
  • ecad4a2e31 fix:全文检索任务审批和终审查询范围修改 1、任务审批由原来的STATES IN ('1','2') AND TASKNAME IN ( '一级审批', '二级审批' ) 修改为TASKNODE !='finale_judgment' 2、终审查询有原来的STATES = '3' AND TASKNAME = '最终审批'修改为 TASKNODE = 'finale_judgment' DELL 2024-04-19 16:59:17 +0800
  • ea97211948 fix: 如果查询详情的时候带了taskNo节点，则返回是也将taskNo改为传入的 shuliYao 2024-04-19 14:50:31 +0800
  • c4206c2883 fix: 解决单用户多节点审批异常问题 shuliYao 2024-04-19 14:21:20 +0800
  • 0ceb8f614f Merge pull request 'feat/ocrPictureLog_20240419' (#132) from feat/ocrPictureLog_20240419 into test guanzheng 2024-04-19 12:06:53 +0800
  • 00962be1c6 1:图片查重日志 15007173189@163.com 2024-04-19 12:05:55 +0800
  • 9429bb3bff Merge pull request 'fix:任务终审排序bug' (#131) from fix/Final_list_sort into test cuihaojie 2024-04-19 11:19:56 +0800
  • 9b6ca4c629 fix:任务终审排序bug DELL 2024-04-19 11:18:50 +0800
  • ba590d027f Merge branch 'test' into feat/ocrPictureLog_20240419 15007173189@163.com 2024-04-19 11:02:04 +0800
  • b0edc74a4c fix: 解决拉取数据时，定位地址map为空，json转换为了 “null” 问题 shuliYao 2024-04-19 10:23:46 +0800
  • 171bb66d32 1:图片查重日志 15007173189@163.com 2024-04-19 09:56:55 +0800
  • a577ad1f4d 1:图片查重日志 15007173189@163.com 2024-04-19 09:52:21 +0800
  • 17747dd4bc Merge pull request 'fix: 修改小结查重添加查重日志' (#130) from fix/updateCheckRepetition20240418 into test sunchenliang 2024-04-19 09:46:00 +0800
  • 85bb5c8679 fix: 修改小结查重添加查重日志 sunchenliang 2024-04-19 09:44:52 +0800
  • 59615140a7 Merge pull request 'fix: 修改小结查重添加查重日志' (#129) from fix/updateCheckRepetition20240418 into test sunchenliang 2024-04-18 23:57:32 +0800
  • 4b677b0f9f fix: 修改小结查重添加查重日志 sunchenliang 2024-04-18 23:57:04 +0800
  • 9d8d2b1788 Merge pull request '增加会签' (#128) from test_Flowable into test zhangyong 2024-04-18 23:05:31 +0800
  • 706744f311 增加会签 admin 2024-04-18 22:47:44 +0800
  • 0325b0e074 feat: 图片墙的图片，阈值100的图片要和跟他比对出100阈值排列在一起 guanzheng 2024-04-18 22:40:41 +0800
  • 3501d78a00 Merge remote-tracking branch 'origin/test' into test guanzheng 2024-04-18 22:29:50 +0800
  • 4784ea4f25 feat: 图片墙的图片，阈值100的图片要和跟他比对出100阈值排列在一起 guanzheng 2024-04-18 22:26:22 +0800
  • 4573ae7b1b Merge pull request 'fix: 修改终审接口查询状态' (#127) from fix/updateCheckRepetition20240418 into test sunchenliang 2024-04-18 21:19:43 +0800
  • 698460c582 fix: 修改终审接口查询状态 sunchenliang 2024-04-18 21:19:16 +0800
  • e76089c261 Merge pull request 'fix:优化任务审批统计接口做审批节点隔离；ai统计弹窗实现和任务审批统计接口相同功能' (#126) from fix/Task_statistics into test cuihaojie 2024-04-18 17:56:07 +0800
  • 8c7d2751ef fix:优化任务审批统计接口做审批节点隔离；ai统计弹窗实现和任务审批统计接口相同功能 DELL 2024-04-18 17:54:59 +0800
  • fb82de6182 feat: 拉取数据增加单业务主体拉取接口 shuliYao 2024-04-18 11:53:41 +0800
  • fcee0dabb2 feat: 添加默认图片配置 B1ackJack 2024-04-18 11:53:21 +0800
  • efa3185b75 Merge pull request 'feat: 拉取所有业务主体数据' (#125) from feature/schedulePullData into test yaoshuli 2024-04-18 10:00:35 +0800
  • a8579bdaae fix: 修复书写错误 B1ackJack 2024-04-18 09:59:09 +0800
  • 7bdad34ac8 feat: 补充定时任务拉取数据逻辑 B1ackJack 2024-04-18 09:19:47 +0800
  • 36a3f7762d Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr into test feature/schedule Vincent 2024-04-18 00:34:43 +0800
  • ed5ca80adb feat: 定时拉取任务 Vincent 2024-04-18 00:34:07 +0800
  • afab271307 Merge pull request 'fix:提报人排序' (#124) from fix/List_of_applicants into test cuihaojie 2024-04-18 00:09:09 +0800
  • 5a73353028 fix:提报人排序 DELL 2024-04-18 00:08:24 +0800
  • d9507983fb Merge pull request 'fix: 修改任务审批历史记录排序' (#123) from fix/updateFlow20240417 into test sunchenliang 2024-04-17 23:26:17 +0800
  • 277874d91a fix: 修改任务审批历史记录排序 fix/updateFlow20240417 sunchenliang 2024-04-17 23:20:32 +0800
  • 199dd11d34 Merge pull request 'fix: 修改任务审核' (#122) from fix/updateFlow20240417 into test sunchenliang 2024-04-17 22:27:48 +0800
  • 9ea06aa9ea fix: 修改任务审核 sunchenliang 2024-04-17 22:19:42 +0800
  • 3947240df8 Merge pull request 'fix:1、解决任务包相似度列表接口取不到相似度值bug；2、任务审批统计接口做审批节点隔离；3、移入可疑文件夹，如果这个任务审批人不是登录用户，则不允许移入可疑文件夹' (#121) from fix/Home_queries_and_suspicious_folders into test cuihaojie 2024-04-17 22:02:19 +0800
  • 9496eb6892 fix:1、解决任务包相似度列表接口取不到相似度值bug；2、任务审批统计接口做审批节点隔离；3、移入可疑文件夹，如果这个任务审批人不是登录用户，则不允许移入可疑文件夹 DELL 2024-04-17 22:01:05 +0800
  • 67bd927def fix: 首页图片，相似度100图片分类到一起 shuliYao 2024-04-17 15:13:24 +0800