Merge branch 'qms/develop' into feature/NoScanning

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java

@@ -17,6 +17,11 @@ public class QmsTodoItemVO {
      */
     private String code;
 
+    /**
+     * 标题
+     */
+    private String title;
+
     /**
      * 来源类型ID，关联dictionary_item表（字典编码MessageType）
      */

nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml

@@ -17,11 +17,8 @@
         <if test="request.sourceType != null">
             AND vit.source_type = #{request.sourceType}
         </if>
-        <if test="request.ticketTitle != null and request.ticketTitle != ''">
+        <if test="request.title != null and request.title != ''">
-            AND vit.ticket_title ilike concat('%', #{request.ticketTitle}, '%')
+            AND vit.ticket_title ilike concat('%', #{request.title}, '%')
-        </if>
-        <if test="request.hasProcessed != null">
-            AND itd.has_processed = #{request.hasProcessed}
         </if>
         <if test="request.startDate != null">
             AND vit.create_time &gt;= #{request.startDate}

nflg-wms-repository/src/main/resources/mapper/QmsTodoItemMapper.xml

@@ -3,15 +3,7 @@
 <mapper namespace="com.nflg.wms.repository.mapper.QmsTodoItemMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.QmsTodoItemVO">
-        SELECT
+        SELECT *
-            id,
-            code,
-            source_type_id,
-            source_id,
-            is_read,
-            create_user_id,
-            create_user_name,
-            create_time
         FROM qms_todo_item
         WHERE 1=1
         <if test="request.isRead != null">