Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/TBTaskMapper.java

@@ -23,5 +23,6 @@ public interface TBTaskMapper extends BaseMapper<TBTask> {
                                        @Param("printPlanId") Long printPlanId,
                                        @Param("status") String status,
                                        @Param("type") String type,
-                                       @Param("result") String result);
+                                       @Param("result") String result,
+                                       @Param("createId")Long createId);
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TBTaskServiceImpl.java

@@ -199,7 +199,8 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
      */
     @Override
     public IPage<TaskListResult> query(IPage<Map> iPage, Long schoolId, Long printPlanId, TaskStatusEnum status, TaskTypeEnum type, TaskResultEnum result) {
-        return tbTaskMapper.query(iPage, schoolId, printPlanId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return tbTaskMapper.query(iPage, schoolId, printPlanId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null,sysUser.getId());
     }
 
     /**

teachcloud-common/src/main/resources/mapper/TBTaskMapper.xml

@@ -43,6 +43,9 @@
                 <if test="result != null and result != ''">
                     and tbt.result = #{result}
                 </if>
+                <if test="createId != null and createId != ''">
+                    and tbt.create_id = #{createId}
+                </if>
             </where>
             order by tbt.create_time desc
     </select>