优化加入保养任务

java110-db/src/main/resources/mapper/community/MaintainanceTaskDetailV1ServiceDaoImplMapper.xml

@@ -23,8 +23,11 @@
         machineName,t.act_user_name,t.act_user_name actUserName,t.task_detail_id,t.task_detail_id
         taskDetailId,t.machine_id,t.machine_id machineId,t.point_start_time,t.point_start_time
         pointStartTime,t.state,t.community_id,t.community_id communityId,t.act_user_id,t.act_user_id
-        actUserId,t.task_id,t.task_id taskId
+        actUserId,t.task_id,t.task_id taskId,mp.plan_name planName,td.name stateName,mt.plan_user_name planUserName
         from maintainance_task_detail t
+        left join maintainance_task mt on t.task_id = mt.task_id and mt.status_cd = '0'
+        left join maintainance_plan mp on mt.plan_id = mp.plan_id and mp.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'maintainance_task_detail' and td.table_columns = 'state'
         where 1 =1
         <if test="sendFlag !=null and sendFlag != ''">
             and t.send_flag= #{sendFlag}

java110-db/src/main/resources/mapper/community/MaintainanceTaskV1ServiceDaoImplMapper.xml

@@ -24,8 +24,11 @@
         authDesc,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.task_type,t.task_type
         taskType,t.plan_id,t.plan_id planId,t.plan_end_time,t.plan_end_time
         planEndTime,t.plan_user_name,t.plan_user_name planUserName,t.community_id,t.community_id
-        communityId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId,t.mps_id,t.mps_id mpsId
+        communityId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId,t.mps_id,t.mps_id mpsId,
+        mp.plan_name planName,td.`name` stateName
         from maintainance_task t
+        left join maintainance_plan mp on t.plan_id = mp.plan_id and mp.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'maintainance_task' and td.table_columns = 'state'
         where 1 =1
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}