diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index 07606591..2b88a860 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -215,6 +215,7 @@ public class OcrPictureController extends BaseController { String search_month = req.getParameter("search_month"); String ordertype = req.getParameter("ordertype"); + queryWrapper.eq("suspiciousfile","0"); if (StringUtils.isNotBlank(ordertype)) { if (ordertype.equals("0")) { queryWrapper.orderByAsc("similarity_score"); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index 4b95acfd..0420e9a5 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -56,6 +56,7 @@ public class OcrTaskchildPictureController extends BaseController { @Resource private UserService userService; + /** * 方法描述:返回json字符串,接受参数,dto名称以及分页信息 * 创建人:mail.zhangyong@gmail.com @@ -169,6 +170,14 @@ public class OcrTaskchildPictureController extends BaseController { jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString()); return jsonObject; }).collect(Collectors.toList()); + for (JSONObject asd:collect){ + QueryWrapper imgWrapper = new QueryWrapper<>(); + imgWrapper.eq("id",asd.get("pictureid")); + OcrPicture one = ocrPictureService.getOne(imgWrapper); + if (one.getSuspiciousfile()!=0){ + collect.add(asd); + } + } IPage objects = new Page<>(); BeanUtils.copyProperties(page, objects); objects.setRecords(collect); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index fb7c0e4e..b2175f69 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -338,6 +338,11 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "server_thumbnail_url") private String serverThumbnailUrl; + @ApiModelProperty(value = "可疑文件夹 0:不在,1:在") + @Schema(description = "可疑文件夹 0:不在,1:在") + @TableField(value = "suspiciousfile") + private Integer suspiciousfile; + //图片分类 @TableField(exist = false) private OcrPictureclass ocrPictureclass; @@ -347,10 +352,6 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @JsonIgnore private SearchQuery searchQueryrolesShowleave; - @ApiModelProperty(value = "提报日期时间戳") - @TableField(value = "submit_date_timestamp") - private Long submitDateTimestamp; - @TableField(exist = false) @JsonIgnore private final Map query = Stream.of( @@ -419,7 +420,8 @@ public class OcrPicture implements BaseDto, java.io.Serializable { new SimpleEntry<>("localpictrueurl", "localpictrueurl"), new SimpleEntry<>("imgHash", "imgHash"), new SimpleEntry<>("serverThumbnailUrl", "serverThumbnailUrl"), - new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl") + new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl"), + new SimpleEntry<>("suspiciousfile", "suspiciousfile") ) .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index 4792cc81..1e88e7a8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -754,7 +754,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper(); - + queryWrapper.eq("suspiciousfile","0"); for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) { this.formattingSearchChild(queryWrapper, usersearchchild); diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml index 96bf4ac5..526db577 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml @@ -64,6 +64,7 @@ + ID AS id, @@ -127,7 +128,8 @@ field15 AS field15, field16 AS field16, field17 AS field17, - field18 AS field18 + field18 AS field18, + suspiciousfile AS suspiciousfile @@ -195,6 +197,7 @@ and field16 ${field16.dataOp} ${field16.likestar}#{field16.value}${field16.likeend} and field17 ${field17.dataOp} ${field17.likestar}#{field17.value}${field17.likeend} and field18 ${field18.dataOp} ${field18.likestar}#{field18.value}${field18.likeend} + and suspiciousfile ${suspiciousfile.dataOp} ${suspiciousfile.likestar}#{suspiciousfile.value}${suspiciousfile.likeend}