From cb86c79d9cf74418a51d022103fc42c7634a0331 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 11 九月 2025 15:03:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
index e6d8f0c..1c952cd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
@@ -14,6 +14,7 @@
         <result column="handler_person" property="handlerPerson" />
         <result column="handler_time" property="handlerTime" />
         <result column="handler_content" property="handlerContent" />
+        <result column="handler_pictures" property="handlerPictures" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
         <result column="create_by" property="createBy" />
@@ -24,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, problem_title, report_content, pictures, status, report_type, report_user_id,handler_person,handler_time, handler_content,
-          create_time, update_time, create_by, update_by, disabled
+          handler_pictures,create_time, update_time, create_by, update_by, disabled
     </sql>
     <select id="pageList" resultType="com.ruoyi.system.vo.TErpIssueReportingVO">
         SELECT
@@ -43,13 +44,16 @@
             <if test="query.createBy != null and query.createBy != ''">
                 AND create_by LIKE concat('%',#{query.createBy},'%')
             </if>
+            <if test="query.handlerPerson != null and query.handlerPerson != ''">
+                AND handler_person LIKE concat('%',#{query.handlerPerson},'%')
+            </if>
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                 AND handler_time &gt;= #{query.startTime}
                 AND handler_time &lt;= #{query.endTime}
             </if>
             <if test="query.reportStartTime != null and query.reportStartTime != '' and query.reportEndTime != null and query.reportEndTime != ''">
-                AND create_time &gt;= #{query.startTime}
-                AND create_time &lt;= #{query.endTime}
+                AND create_time &gt;= #{query.reportStartTime}
+                AND create_time &lt;= #{query.reportEndTime}
             </if>
             AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
         </where>

--
Gitblit v1.7.1