From b8721bd84a096e8e306e637615754c6f4579cc5f Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sat, 30 Mar 2024 23:20:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=93?=
 =?UTF-8?q?=E6=9F=A5=E9=87=8D2.=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowable/controller/FlowTaskController.java   |  4 ++--
 .../xiaoyao/ocr/dataobject/OcrPictureInfo.java    |  6 ++++++
 .../ocr/service/impl/OcrPictureServiceImpl.java   |  1 +
 .../impl/OcrTaskchildPictureServiceImpl.java      | 15 +++++++++++++++
 .../impl/OcrUsersearchchildServiceImpl.java       |  6 +++---
 .../main/resources/mapper/oa/FlowableccMapper.xml |  2 ++
 .../main/resources/mapper/oa/OcrPictureMapper.xml |  1 +
 7 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
index 1f0c8b2d..b739f568 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
@@ -172,10 +172,10 @@ public class FlowTaskController extends BaseController {
             formIds.addAll(formId);
             if (CollectionUtils.isNotEmpty(formIds)) {
                 Integer success = flowTaskService.complete(approve, userToken);
-                return ResultVoUtil.success("审批成功" + success + "条，" + "审核失败" + (flowTaskInfoList.size() - success) + "条");
+                return ResultVoUtil.success("审批成功" + success + "条，" + "无权审核" + (flowTaskInfoList.size() - success) + "条","");
             }
         }
-        return ResultVoUtil.success("审核成功0条，" + "审核失败" + flowTaskInfoList.size() + "条");
+        return ResultVoUtil.success("审核成功0条，" + "无权审核" + flowTaskInfoList.size() + "条","");
     }
 
     @GetMapping("/listhistore")
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java
index 6dd46f0c..47bf3322 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java
@@ -35,6 +35,12 @@ public class OcrPictureInfo {
     @TableField(value = "img_size")
     private String imgSize;
 
+    /**
+     * 图片名称
+     */
+    @TableField(value = "img_name")
+    private String imgName;
+
     /**
      * 图片格式
      */
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 f0574221..b8afcf1e 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
@@ -699,6 +699,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
                 OcrPictureInfo imageInfo = getImageInfo(ocrPicture.getImgurl());
                 if (ObjectUtil.isNotEmpty(imageInfo)) {
                     imageInfo.setPictureId(ocrPicture.getId());
+                    imageInfo.setImgName(ocrPicture.getImgname());
                     list.add(imageInfo);
                 }
             }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
index 814ca328..f1f48956 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
@@ -4,10 +4,13 @@ import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.util.ObjectUtil;
 import cn.jyjz.flowable.common.ProcessConstant;
 import cn.jyjz.flowable.common.SystemConstantsOa;
+import cn.jyjz.flowable.domain.vo.FlowModelVO;
 import cn.jyjz.flowable.entity.FlowApprove;
 import cn.jyjz.flowable.service.IFlowInstanceService;
 import cn.jyjz.flowable.service.IFlowTaskService;
+import cn.jyjz.flowable.service.IFormCustomService;
 import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
+import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
@@ -35,6 +38,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.flowable.bpmn.model.FlowElement;
+import org.flowable.bpmn.model.UserTask;
+import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.stereotype.Service;
@@ -324,6 +330,15 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
                             ocrTaskchildPicture.getId().toString(),
                             category.getServicename()
                     );
+                    IFormCustomService iFormCustomService = SpringUtils.getBean(category.getServicename());
+                    FlowModelVO formData = iFormCustomService.getForm(ocrTaskchildPicture.getId().toString());
+                    List<Task> taskList = iFlowTaskService.nowRunTask(formData.getProcessInstanceId(), ocrTaskchildPicture.getProcessdefinitionid());
+                    Task taskData = null;
+                    if (null != taskList && !taskList.isEmpty()) {
+                        taskData = taskList.get(0);
+                        ocrTaskchildPicture.setAssignee(taskData.getAssignee());
+                    }
+
                     ocrPicture.setTaskchildpictureid(ocrTaskchildPicture.getId().toString());
                     //修改状态为已生成任务并且审批状态为审批中
                     ocrPicture.setTaskstatus("1");
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
index 73157acf..ad032b4e 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
@@ -86,9 +86,9 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
 				vo.setIzupuser(ocrUsersearchchild.getSearchvalue());
 			}
 
-			if(SearchConfigEnum.SIMISEARCH.getId().equals(searchfield)){
-				vo.setIzsimilarity(ocrUsersearchchild.getSearchvalue());
-			}
+//			if(SearchConfigEnum.SIMISEARCH.getId().equals(searchfield)){
+//				vo.setIzsimilarity(ocrUsersearchchild.getSearchvalue());
+//			}
 
 			if(SearchConfigEnum.CLASSISEARCH.getId().equals(searchfield)){
 				vo.setIzshow(ocrUsersearchchild.getSearchvalue());
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
index 1bed6661..0858f68d 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
@@ -212,6 +212,7 @@
                t2.UPDATETIME       updateTime
         from (select count(field8) count, field8 content, ID id, imgUrl
               FROM ocr_picture
+			where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)
               GROUP BY field8
               HAVING count(field8) > 1) t1
                  LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID
@@ -232,6 +233,7 @@
 			t2.UPDATETIME       updateTime
 		from (select field8 content, ID id, imgUrl
 			  FROM ocr_picture
+			  where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)
 			  GROUP BY field8
 			  HAVING count(field8) > 1) t1
 				 LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID
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 6e283e3a..d9bf1c86 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
@@ -72,6 +72,7 @@
 		<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
 			<result column="pictureid" property="pictureId"/>
 			<result column="img_size" property="imgSize"/>
+			<result column="img_name" property="imgName"/>
 			<result column="img_format" property="imgFormat"/>
 			<result column="img_measure" property="imgMeasure"/>
 			<result column="upload_time" property="uploadTime"/>