任务分页查询增加任务操作记录返回

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -104,6 +104,12 @@
             <result column="taskExecutor_executor_id" property="executorId"/>
             <result column="executor_name" property="executorName"/>
         </collection>
+        <collection property="taskLogs"  ofType="com.management.platform.entity.TaskLog">
+            <id column="taskLogId" property="id"/>
+            <result column="taskLogModTime" property="modTime"/>
+            <result column="taskLogUserName" property="userName"/>
+            <result column="taskLogContent" property="content"/>
+        </collection>
 
     </resultMap>
 
@@ -114,7 +120,8 @@
               `order`.order_name ,
                clue.clue_name,
                contacts.name contacts_name ,contacts.phone,
-               task_executor.task_executor_id, task_executor.executor_id taskExecutor_executor_id,task_executor.executor_name
+               task_executor.task_executor_id, task_executor.executor_id taskExecutor_executor_id,task_executor.executor_name,
+               task_log.id taskLogId,task_log.mod_time taskLogModTime,task_log.user_name taskLogUserName,task_log.content taskLogContent
         from task
             left join  custom on task.custom_id=custom.id
             left join  business_opportunity on task.business_opportunity_id=business_opportunity.id
@@ -122,7 +129,7 @@
             left join  clue on task.clue_id=clue.id
             left join  contacts on task.contacts_id=contacts.id
             left join  task_executor on task.id=task_executor.task_id
-
+            left join  task_log on task.id=task_log.task_id
         <where>
             and 1=1 and task.is_delete=0
 
@@ -182,7 +189,8 @@
         `order`.order_name ,
         clue.clue_name,
         contacts.name contacts_name ,contacts.phone,
-        task_executor.task_executor_id, task_executor.executor_id taskExecutor_executor_id,task_executor.executor_name
+        task_executor.task_executor_id, task_executor.executor_id taskExecutor_executor_id,task_executor.executor_name,
+        task_log.id taskLogId,task_log.mod_time taskLogModTime,task_log.user_name taskLogUserName,task_log.content taskLogContent
         from task
         left join  custom on task.custom_id=custom.id
         left join  business_opportunity on task.business_opportunity_id=business_opportunity.id
@@ -190,6 +198,7 @@
         left join  clue on task.clue_id=clue.id
         left join  contacts on task.contacts_id=contacts.id
         left join  task_executor on task.id=task_executor.task_id
+        left join  task_log on task.id=task_log.task_id
         <where>
             and 1=1 and task.is_delete=0