Merge pull request 'dev-lili-330' (#19) from dev-lili-330 into test

Reviewed-on: #19

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java

@@ -264,6 +264,8 @@ public class OcrPictureController extends BaseController {
             return ResultVoUtil.error("租户主键不能为空");
         }
 
+
+
         QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper<>();
 
         String search_month = req.getParameter("search_month");
@@ -291,6 +293,12 @@ public class OcrPictureController extends BaseController {
             queryWrapper.ge("create_time", DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
         }
 
+        //提报人模糊搜索
+        String upUserName = req.getParameter("upUserName");
+        if(StringUtils.isNotBlank(upUserName)){
+            queryWrapper.like("upName",upUserName);
+        }
+
         //根据参数枚举，获取检索参数，并映射为数据库的字段的key-v map
         Map<String, Object> paraMap = new HashMap<>();
         for (SearchConfigEnum config : SearchConfigEnum.values()) {

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

@@ -11,8 +11,8 @@
         <where>
             t1.tenant_id = #{tenantId}
             <if test="packageName != null and packageName != ''">
-                and t1.name like concat('%', #{packageName}, '%')
+                and t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%')
             </if>
         </where>
     </select>
-</mapper>
+</mapper>