Merge remote-tracking branch 'origin/test' into test

htmlweb/web/backstage/oa/ocr/information/add.html

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

htmlweb/web/backstage/oa/ocr/information/edit.html

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

htmlweb/web/backstage/oa/ocr/information/list.html

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

htmlweb/web/backstage/oa/ocr/picturelog/list.html

@@ -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');
 						}
 					});
-					_tableListPost = $('#Post_list').bootstrapTable({
+					_tableListCommontword = $('#Post_list').bootstrapTable({
 						url: '${ctx}/ocr/picturelog/page',
 						pagination: true,          //是否显示分页（*）
 						pageNumber:1,            //初始化加载第一页，默认第一页
@@ -83,13 +83,11 @@
 							return {
 								sortorder: params.order,
 								sortname: params.sort,
-								pagesize: params.limit,
+								pageSize: params.limit,
 								start: (params.offset / params.limit) + 1,
 								callStatus: $("#callStatus").val(),
 								callTimeStart: params.callTimeStart,
 								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){

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java

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

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java

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