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

Compare commits

base: guoxiangbin:416eea5b851385507e4c362d8397007ebf617d6e
Branches Tags
guoxiangbin:cuihaojie/fix/ocr-test-openapi-bug
guoxiangbin:test
guoxiangbin:feat/uodateFlow20240623
guoxiangbin:feat/addPrevailCloudLog
guoxiangbin:feature/pullPictureLog
guoxiangbin:feat/updatePrevailCloudLog
guoxiangbin:feat/updateRepetitionTask2024-05-08
guoxiangbin:feat/dict_gz_0430
guoxiangbin:dev
guoxiangbin:feature/schedulePullData
guoxiangbin:test_frontmenu
guoxiangbin:fix/updatePictureSimilarity20240422
guoxiangbin:fix/updateCheckRepetition20240418
guoxiangbin:test_flowableAssgin
guoxiangbin:feature/schedule
guoxiangbin:fix/updateFlow20240417
guoxiangbin:fix/UpdateFlowComplete20240416
guoxiangbin:feat/updateFlow-20240415
guoxiangbin:feat/updateflow20240411
guoxiangbin:feat/addSynchronizationData-20240409
guoxiangbin:fix/localPictureUrlIsNotNull
guoxiangbin:feat/addSynchronizationData-20240407
guoxiangbin:fix/pullWLYDataBug
guoxiangbin:sunchenliang
guoxiangbin:master
..
compare: guoxiangbin:a1460528ec23db70b10cc71bed6fd5cccde750aa
Branches Tags
guoxiangbin:cuihaojie/fix/ocr-test-openapi-bug
guoxiangbin:test
guoxiangbin:feat/uodateFlow20240623
guoxiangbin:feat/addPrevailCloudLog
guoxiangbin:feature/pullPictureLog
guoxiangbin:feat/updatePrevailCloudLog
guoxiangbin:feat/updateRepetitionTask2024-05-08
guoxiangbin:feat/dict_gz_0430
guoxiangbin:dev
guoxiangbin:feature/schedulePullData
guoxiangbin:test_frontmenu
guoxiangbin:fix/updatePictureSimilarity20240422
guoxiangbin:fix/updateCheckRepetition20240418
guoxiangbin:test_flowableAssgin
guoxiangbin:feature/schedule
guoxiangbin:fix/updateFlow20240417
guoxiangbin:fix/UpdateFlowComplete20240416
guoxiangbin:feat/updateFlow-20240415
guoxiangbin:feat/updateflow20240411
guoxiangbin:feat/addSynchronizationData-20240409
guoxiangbin:fix/localPictureUrlIsNotNull
guoxiangbin:feat/addSynchronizationData-20240407
guoxiangbin:fix/pullWLYDataBug
guoxiangbin:sunchenliang
guoxiangbin:master

No commits in common. '416eea5b851385507e4c362d8397007ebf617d6e' and 'a1460528ec23db70b10cc71bed6fd5cccde750aa' have entirely different histories.
416eea5b85 ... a1460528ec

6 changed files with 20 additions and 19 deletions
Show Stats

6
htmlweb/web/backstage/oa/ocr/information/add.html
Unescape View File

@ -36,9 +36,9 @@
<label class="col-sm-3 control-label is-required">* 页面类型:</label> <label class="col-sm-3 control-label is-required">* 页面类型:</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="form-control" name='reviewType' id='reviewType'> <select class="form-control" name='reviewType' id='reviewType'>
<option value="0">任务终审</option> <option value="0">终审</option>
<option value="1">图鉴审批</option> <option value="1">工单</option>
<option value="2">任务审核</option> <option value="2">一审二审</option>
<option value="3">审核填报</option> <option value="3">审核填报</option>
</select> </select>
</div> </div>

6
htmlweb/web/backstage/oa/ocr/information/edit.html
Unescape View File

@ -37,9 +37,9 @@
<label class="col-sm-3 control-label is-required">* 页面类型:</label> <label class="col-sm-3 control-label is-required">* 页面类型:</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="form-control" name='reviewType' id='reviewType'> <select class="form-control" name='reviewType' id='reviewType'>
<option value="0">任务终审</option> <option value="0">终审</option>
<option value="1">图鉴审批</option> <option value="1">工单</option>
<option value="2">任务审核</option> <option value="2">一审二审</option>
<option value="3">审核填报</option> <option value="3">审核填报</option>
</select> </select>
</div> </div>

14
htmlweb/web/backstage/oa/ocr/information/list.html
Unescape View File

@ -21,9 +21,9 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<select class="form-control" name='search_reviewType' id='search_reviewType'> <select class="form-control" name='search_reviewType' id='search_reviewType'>
<option value="0">任务终审</option> <option value="0">终审</option>
<option value="1">图鉴审批</option> <option value="1">工单</option>
<option value="2">任务审核</option> <option value="2">一审二审</option>
<option value="3">审核填报</option> <option value="3">审核填报</option>
</select> </select>
</div> </div>
@ -84,7 +84,7 @@
return { return {
sortorder: params.order, sortorder: params.order,
sortname: params.sort, sortname: params.sort,
pageSize: params.limit, pagesize: params.limit,
start: (params.offset / params.limit) + 1, start: (params.offset / params.limit) + 1,
search_name:'{"value":"' + $("#search_name").val() + '","op":"equal","type":"string"}', search_name:'{"value":"' + $("#search_name").val() + '","op":"equal","type":"string"}',
search_reviewType:'{"value":"' + $("#search_reviewType").val() + '","op":"equal","type":"string"}', search_reviewType:'{"value":"' + $("#search_reviewType").val() + '","op":"equal","type":"string"}',
@ -101,13 +101,13 @@
formatter:function(value,oData,index) { formatter:function(value,oData,index) {
var listOperation = ""; var listOperation = "";
if(oData.reviewType == 0){ if(oData.reviewType == 0){
listOperation = "任务终审"; listOperation = "终审";
} }
else if(oData.reviewType == 1) { else if(oData.reviewType == 1) {
listOperation = "图鉴审批"; listOperation = "工单";
} }
else if(oData.reviewType == 2) { else if(oData.reviewType == 2) {
listOperation = "任务审核"; listOperation = "一审二审";
} }
else{ else{
listOperation = "审核填报"; listOperation = "审核填报";

6
htmlweb/web/backstage/oa/ocr/picturelog/list.html
Unescape View File

@ -69,7 +69,7 @@
$("#_mybutton").append('<button class="btn sbold ' + toolbar.img + '" onClick="' + toolbar.actionmethod + '(\'${resourceid}' + toolbar.methodid + '\')"> ' + ' <i class="fa ' + toolbar.methodkey + '"></i> ' + toolbar.text + '</button>&nbsp'); $("#_mybutton").append('<button class="btn sbold ' + toolbar.img + '" onClick="' + toolbar.actionmethod + '(\'${resourceid}' + toolbar.methodid + '\')"> ' + ' <i class="fa ' + toolbar.methodkey + '"></i> ' + toolbar.text + '</button>&nbsp');
} }
}); });
_tableListCommontword = $('#Post_list').bootstrapTable({ _tableListPost = $('#Post_list').bootstrapTable({
url: '${ctx}/ocr/picturelog/page', url: '${ctx}/ocr/picturelog/page',
pagination: true, //是否显示分页（*） pagination: true, //是否显示分页（*）
pageNumber:1, //初始化加载第一页，默认第一页 pageNumber:1, //初始化加载第一页，默认第一页
@ -83,11 +83,13 @@
return { return {
sortorder: params.order, sortorder: params.order,
sortname: params.sort, sortname: params.sort,
pageSize: params.limit, pagesize: params.limit,
start: (params.offset / params.limit) + 1, start: (params.offset / params.limit) + 1,
callStatus: $("#callStatus").val(), callStatus: $("#callStatus").val(),
callTimeStart: params.callTimeStart, callTimeStart: params.callTimeStart,
callTimeEnd: params.callTimeEnd, callTimeEnd: params.callTimeEnd,
//search_callStatus:'{"value":"' + $("#search_callStatus").val() + '","op":"equal","type":"string"}',
//search_callTime:'{"value":"' + $("#search_callTime").val() + '","op":"equal","type":"string"}',
}; };
}, },
responseHandler:function(res){ responseHandler:function(res){

1
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java
Unescape View File

@ -136,7 +136,6 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
if (Objects.nonNull(ocrField.getId())) { if (Objects.nonNull(ocrField.getId())) {
String name = ocrField.getName(); String name = ocrField.getName();
LambdaQueryWrapper<OcrField> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OcrField> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OcrField::getReviewType, ocrField.getReviewType());
queryWrapper.eq(OcrField::getName, name); queryWrapper.eq(OcrField::getName, name);
queryWrapper.eq(OcrField::getDel, 0); queryWrapper.eq(OcrField::getDel, 0);
OcrField ocrFieldOne = this.getOne(queryWrapper); OcrField ocrFieldOne = this.getOne(queryWrapper);

6
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java
Unescape View File

@ -95,15 +95,15 @@ public class ImageClassUtil {
JSONObject jsonObjectSimi = JSON.parseObject(responseDataVi); JSONObject jsonObjectSimi = JSON.parseObject(responseDataVi);
if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0") && jsonObjectSimi.get("data") != null && jsonObjectSimi.getJSONArray("data").size() > 0) { if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0") && jsonObjectSimi.get("data") != null && jsonObjectSimi.getJSONArray("data").size() > 0) {
ocrPictureLog.setCallStatus("1"); ocrPictureLog.setCallStatus("1");
ocrPictureLog.setCallMsg("请求信息:"+jsonObjectVi.toJSONString()+"\n响应信息:"+responseDataVi); ocrPictureLog.setCallMsg("req:"+jsonObjectVi.toJSONString()+"\nrep:"+responseDataVi);
} else { } else {
ocrPictureLog.setCallStatus("2"); ocrPictureLog.setCallStatus("2");
ocrPictureLog.setCallMsg("请求信息:"+jsonObjectVi.toJSONString()+"\n响应信息:"+responseDataVi); ocrPictureLog.setCallMsg("req:"+jsonObjectVi.toJSONString()+"\nrep:"+responseDataVi);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("classify={}", e); logger.error("classify={}", e);
ocrPictureLog.setCallStatus("3"); ocrPictureLog.setCallStatus("3");
ocrPictureLog.setCallMsg("请求信息:"+jsonObjectVi.toJSONString()+"\n响应信息:"+responseDataVi+"Exception:"+e.getMessage()); ocrPictureLog.setCallMsg("req:"+jsonObjectVi.toJSONString()+"\nrep:"+responseDataVi+"Exception:"+e.getMessage());
} finally { } finally {
ApplicationContext applicationContext = SpringUtil.getApplicationContext(); ApplicationContext applicationContext = SpringUtil.getApplicationContext();
OcrPictureLogService ocrPictureLogService = applicationContext.getBean(OcrPictureLogService.class); OcrPictureLogService ocrPictureLogService = applicationContext.getBean(OcrPictureLogService.class);

Write Preview
Loading…
Cancel
Save