开发工作单池

java110-bean/src/main/java/com/java110/dto/workTask/WorkTaskDto.java

@@ -34,6 +34,8 @@ public class WorkTaskDto extends PageDto implements Serializable {
     private String queryStartTime;
     private String queryEndTime;
 
+    private String createUserNameLike;
+
 
     private Date createTime;
 
@@ -168,4 +170,12 @@ public class WorkTaskDto extends PageDto implements Serializable {
     public void setQueryEndTime(String queryEndTime) {
         this.queryEndTime = queryEndTime;
     }
+
+    public String getCreateUserNameLike() {
+        return createUserNameLike;
+    }
+
+    public void setCreateUserNameLike(String createUserNameLike) {
+        this.createUserNameLike = createUserNameLike;
+    }
 }

java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml

@@ -21,10 +21,19 @@
         statusCd,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.store_id,t.store_id
         storeId,t.task_id,t.task_id taskId,t.work_id,t.work_id workId,t.staff_id,t.staff_id staffId,t.create_time
         createTime,
-        td.`name` stateName
+        td.`name` stateName,
+        wp.work_cycle workCycle,wp.create_user_id
+        createUserId,wp.create_user_name createUserName,wp.work_name workName,wp.wt_id wtId,wp.create_user_tel createUserTel,
+        wt.type_name typeName
         from work_task t
         left join t_dict td on t.state = td.status_cd and td.table_name = 'work_pool' and td.table_columns = 'state'
-        where 1 =1
+        left join work_pool wp on t.work_id = wp.work_id and wp.status_cd = '0'
+        left join work_type wt on wp.wt_id = wt.wt_id
+        where 1=1
+        and wp.status_cd = '0'
+        <if test="createUserNameLike !=null and createUserNameLike != ''">
+            and wp.create_user_name like concat('%', #{createUserNameLike},'%')
+        </if>
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>