#检修工作票列表查询

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/accessTicket/dto/request/AccessTicketPageReqDTO.java

@@ -11,6 +11,9 @@ import java.io.Serializable;
 @Data
 public class AccessTicketPageReqDTO implements Serializable {
 
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
     @ApiModelProperty("开始时间 : YYYY-MM-DD HH:MM:SS")
     private String startTime;
 

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/accessTicket/dto/response/AccessTicketPageRspDTO.java

@@ -18,4 +18,8 @@ public class AccessTicketPageRspDTO extends AccessTicketEntity {
 
     @ApiModelProperty("下一步执行人")
     private List<User> executors;
+
+
+    @ApiModelProperty("拥有者(数据创建者)")
+    private Long holder;
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/accessTicket/mapper/AccessTicketMapper.xml

@@ -3,9 +3,15 @@
 <mapper namespace="com.hnac.hzims.ticket.accessTicket.mapper.AccessTicketMapper">
 
     <select id="pageCondition" resultType="com.hnac.hzims.ticket.accessTicket.dto.response.AccessTicketPageRspDTO">
-        SELECT * FROM ACCESS_WORK_TICKET
+        SELECT *,CREATE_USER AS HOLDER  FROM ACCESS_WORK_TICKET
         <where>
             IS_DELETED = 0
+            <if test="param.deviceName != null and param.deviceName != ''">
+                AND (DEVICE_CODE LIKE CONCAT('%',#{param.deviceName},'%') OR
+                     DEVICE_NAME LIKE CONCAT('%',#{param.deviceName},'%') OR
+                     DEVICE_ADDRESS LIKE CONCAT('%',#{param.deviceName},'%')
+                )
+            </if>
             <if test="param.startTime != null and para.startTime != ''">
                 AND CREATE_TIME >= #{param.startTime}
             </if>