Merge pull request 'fix:任务审批模糊检索-任务id、任务名称、提报人' (#152) from fix/Fuzzy_retrieval into test

Reviewed-on: #152

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java

@@ -316,7 +316,8 @@ public class FlowTaskController extends BaseController {
             return ResultVoUtil.error("租户主键不能为空");
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(taskName)) {
-            searchQuery.addLike("fromtaskname", taskName);
+//            searchQuery.addLike("fromtaskname", taskName);
+            searchQuery.addLike("fuzzyRetrieval", taskName);
         }
 
         //获取用户预设检索条件id,如果存在检索条件，则高级检索失效

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

@@ -479,6 +479,14 @@
                 <if test="userid != null">
                     and tcp.USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}
                 </if>
+                <if test="fuzzyRetrieval != null and fuzzyRetrieval != ''">
+                    and
+                    (
+                    tcp.FROMUSERNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
+                    OR tcp.FROMTASKID LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
+                    OR tcp.FROMTASKNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
+                    )
+                </if>
             </trim>
         </where>
     </sql>