From 31d98eecdb926a8ef050f1b771481b5bdb198aaa Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 26 Mar 2024 15:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BB=BB=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8F=8A=E7=9B=B8=E4=BC=BC=E5=BA=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OcrTaskPackageServiceImpl.java       |   1 +
 .../jyjz/xiaoyao/ocr/vo/PictureDetailVo.java  | 111 ++++++++++++++++++
 .../mapper/oa/OcrTaskPackageMapper.xml        |  16 +++
 3 files changed, 128 insertions(+)
 create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/PictureDetailVo.java
 create mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java
index 62c8273d..0719dae3 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java
@@ -62,6 +62,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
         if(CollectionUtils.isNotEmpty(result.getRecords())){
             List<Map<String, Object>> records = result.getRecords();
             for (Map<String, Object> record : records) {
+                record.put("id",record.get("id").toString());
                 Object search = record.getOrDefault("search", null);
                 if(search!=null){
                     Map map = JSONObject.parseObject(search.toString(), Map.class);
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/PictureDetailVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/PictureDetailVo.java
new file mode 100644
index 00000000..44ea9710
--- /dev/null
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/PictureDetailVo.java
@@ -0,0 +1,111 @@
+package cn.jyjz.xiaoyao.ocr.vo;
+
+import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * ClassName： PictureDetailVo$.java
+ * Description:
+ * Author： scl.
+ * Date： 2024/3/25 18:26
+ */
+@Data
+public class PictureDetailVo {
+    //图片id
+    private String pictureId;
+    //图片任务id
+    private String taskChildId;
+    //任务id
+    private String taskId;
+    //任务名称
+    private String taskName;
+    //租户id
+    private String tenantId;
+    //最大相似度
+    private String similarityScore;
+    //定位信息
+    private String location;
+
+    @ApiModelProperty(value = "是否已经审批，0：未审批，1：审批中，2：已审批")
+    private Integer workStatus;
+
+    @ApiModelProperty(value = "完成时间")
+    private Long finishTime;
+
+    @ApiModelProperty(value = "提报人")
+    private String field1;
+
+    @ApiModelProperty(value = "拜访客户类型")
+    private String field2;
+
+    @ApiModelProperty(value = "拜访客户名称,终端名称，例如中日友好医院")
+    private String field3;
+
+    @ApiModelProperty(value = "任务来源")
+    private String field4;
+
+    @ApiModelProperty(value = "厂商")
+    private String field5;
+
+    @ApiModelProperty(value = "拜访客户级别")
+    private String field6;
+
+    @ApiModelProperty(value = "科室名称")
+    private String field7;
+
+    @ApiModelProperty(value = "拜访小结")
+    private String field8;
+
+    @ApiModelProperty(value = "产品名称")
+    private String field9;
+
+    @ApiModelProperty(value = "地区，定位信息，例如北京市朝阳区文苑路10号")
+    private String field10;
+
+    @ApiModelProperty(value = "拜访日期")
+    private String field11;
+
+    @ApiModelProperty(value = "定位距离")
+    private String field12;
+
+    @ApiModelProperty(value = "病历号")
+    private String field13;
+
+    @ApiModelProperty(value = "是否重复")
+    private String field14;
+
+    @ApiModelProperty(value = "任务类型")
+    private String field15;
+
+    @ApiModelProperty(value = "任务状态")
+    private String field16;
+
+    @ApiModelProperty(value = "拜访项目类别")
+    private String field17;
+
+    @ApiModelProperty(value = "图片地址")
+    private String imgUrl;
+    @ApiModelProperty(value = "任务状态")
+    private String states;
+
+    @ApiModelProperty(value = "流程实例IdprocessInstanceId")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "流程实例processdeFinitionId")
+    private String processDefinitionId;
+
+    //图片信息
+    private OcrPictureInfo pictureInfo;
+    //本人审查记录
+    private Userapprove userapprove;
+    //历史审查记录
+    private List<Userapprove> userapproveList;
+
+
+}
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
new file mode 100644
index 00000000..66b08a32
--- /dev/null
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskPackageMapper">
+
+    <select id="getPackageList" resultType="java.util.Map">
+        SELECT t1.*,t2.picture_count,
+               t2.searching_json search
+        FROM ocr_task_package t1
+                 LEFT JOIN ocr_check_duplicate t2 ON t1.check_duplicate_id = t2.id
+        <where>
+            <if test="packageName != null and packageName != ''">
+                t1.name like concat('%', #{packageName}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file