盘点任务筛选bug调整

src/main/java/com/jsh/erp/datasource/dto/TaskStocktakingQueryDTO.java

@@ -1,7 +1,11 @@
 package com.jsh.erp.datasource.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
 
+@Data
+@Accessors(chain = true)
 public class TaskStocktakingQueryDTO {
 
     @ApiModelProperty("任务状态 1.未开始，2.进行中，3.已完成，4.已取消")
@@ -14,7 +18,7 @@ public class TaskStocktakingQueryDTO {
     private Long depotId;
 
     @ApiModelProperty("创建人")
-    private String createName;
+    private Long createBy;
 
 
 }

src/main/resources/mapper_xml/TaskStocktakingMapper.xml

@@ -62,7 +62,7 @@
         <where>
             ts.delete_flag = 0
             <if test="number != null and number != ''">
-                AND ts.number LIKE CONCAT('%',#{number},'%')
+                AND (ts.number LIKE CONCAT('%',#{number},'%') OR ts.task_name LIKE CONCAT('%',#{number},'%'))
             </if>
             <if test="taskStatus != null and taskStatus != 0">
                 AND ts.task_status = #{taskStatus}
@@ -70,8 +70,8 @@
             <if test="depotId != null and depotId !=''">
                 AND ts.depot_id = #{depotId}
             </if>
-            <if test="createName != null and createName !=''">
-                AND ju.username LIKE CONCAT('%',#{createName},'%')
+            <if test="createBy != null and createBy !=''">
+                AND ts.create_by = #{createBy}
             </if>
         GROUP BY
             ts.id