From 0ff031169b99fb1923e51d7f9aacb3f70e61c5b1 Mon Sep 17 00:00:00 2001
From: LILI <707464720@qq.com>
Date: Sat, 30 Mar 2024 19:38:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.=E4=B8=80=E9=94=AE=E6=9F=A5=E9=87=8D?=
 =?UTF-8?q?=E6=8F=90=E6=8A=A5=E4=BA=BA=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=202.AI=E5=B7=A5=E5=8D=95=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=203.AI=E5=B7=A5=E5=8D=95=E4=BB=BB=E5=8A=A1=E5=8C=85=E5=80=92?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jyjz/xiaoyao/ocr/controller/OcrPictureController.java | 8 ++++++++
 .../src/main/resources/mapper/oa/OcrTaskPackageMapper.xml | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
index 211e87c9..629f4a70 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
+++ b/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()) {
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
index c1091775..c898c7f5 100644
--- 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
@@ -10,8 +10,9 @@
         left join s_user_t t3 on t1.create_by = t3.ID
         <where>
             <if test="packageName != null and packageName != ''">
-                t1.name like concat('%', #{packageName}, '%')
+                t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%')
             </if>
         </where>
+        ORDER BY T1.create_time desc
     </select>
 </mapper>
\ No newline at end of file