Merge branch 'test' into dev-lili-330

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")

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java

@@ -13,6 +13,10 @@ public class RepeatedTaskVo {
 
     private String taskId;
 
+    private String formId;
+
+    private String fromTaskId;
+
     private String taskName;
 
     private String nodeName;

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;
+
     /**
      * 图片格式
      */

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);
                 }
             }

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

@@ -87,7 +87,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         List<OcrPicture> saveList = new ArrayList<>();
         int i=0;
         for (String childpictureid : cps) {
-            if (childpictureid.equals("100.00")){
+            if (childpictureid.equals("100")){
                 i++;
             }
         }
@@ -97,7 +97,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         map.put("tenantusername",selectaiuser);
         map.put("packagename",selectaisp.get("packagename"));
         map.put("tasks","基线任务");
-        map.put("similarcount",selectaisp.get("similarcount"));
+//        map.put("similarcount",selectaisp.get("similarcount"));
         map.put("createtime",selectaisp.get("createtime"));
         map.put("similarComplete",i);
 

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");

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());

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml

@@ -37,6 +37,8 @@
 		<result column="imgUrl" property="imgUrl"/>
 		<collection property="repeatedTaskList" ofType="cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo">
 			<result column="taskId" property="taskId"/>
+			<result column="formId" property="formId"/>
+			<result column="fromTaskId" property="fromTaskId"/>
 			<result column="taskName" property="taskName"/>
 			<result column="nodeName" property="nodeName"/>
 			<result column="states" property="states"/>
@@ -205,13 +207,16 @@
                t1.imgUrl,
                t3.similarity_score similarityScore,
                t2.STATES,
-               t3.remark           taskId,
+               t3.remark           fromTaskId,
                t3.taskName,
                t2.TASKNAME         nodeName,
                t2.FROMUPTIME       fromTime,
-               t2.UPDATETIME       updateTime
+               t2.UPDATETIME       updateTime,
+			   t2.TASKID			taskId,
+			   t2.ID formId
         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
@@ -225,13 +230,16 @@
 			t1.imgUrl,
 			t3.similarity_score similarityScore,
 			t2.STATES,
-			t3.remark           taskId,
+			t3.remark           fromTaskId,
 			t3.taskName,
 			t2.TASKNAME         nodeName,
 			t2.FROMUPTIME       fromTime,
-			t2.UPDATETIME       updateTime
+			t2.UPDATETIME       updateTime,
+			t2.TASKID			taskId,
+			t2.ID formId
 		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

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"/>

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml

@@ -66,14 +66,27 @@
             (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE TENANTID = ""#{tenantid}"" AND STATES = '3') as approved
     </select>
 
+<!--    <select id="selectaisp" resultType="map">-->
+<!--        SELECT-->
+<!--            rw.ID as id,rw.OCPICTUREID as ocpictureid,t.packagename,rw.PICTURERESULT as pictureresult,count(length(rw.PICTURERESULT)-length(replace(rw.PICTURERESULT,',',''))+1) as similarcount,t.create_time as createtime-->
+<!--        FROM-->
+<!--            ocr_taskchild_picture rw-->
+<!--            LEFT JOIN ocr_packagetask t ON rw.PACKAGEID = t.ID-->
+
+<!--        WHERE t.ID = #{id}-->
+<!--    </select>-->
+
     <select id="selectaisp" resultType="map">
         SELECT
-            rw.ID as id,rw.OCPICTUREID as ocpictureid,t.packagename,rw.PICTURERESULT as pictureresult,count(length(rw.PICTURERESULT)-length(replace(rw.PICTURERESULT,',',''))+1) as similarcount,t.create_time as createtime
+            tp.id as id,
+            tp.name as packagename,
+            GROUP_CONCAT(IFNULL(cdr.max_similarity, 0)) as pictureresult,
+            tp.create_time as createtime
         FROM
-            ocr_taskchild_picture rw
-            LEFT JOIN ocr_packagetask t ON rw.PACKAGEID = t.ID
-
-        WHERE t.ID = #{id}
+            ocr_task_package tp
+            LEFT JOIN ocr_check_duplicate_result cdr ON tp.check_duplicate_id = cdr.check_duplicate_id
+        WHERE
+            tp.ID = #{id}
     </select>
 
     <select id="selectaiuser" resultType="String">