巡检

platform-dao/src/main/java/com/platform/dao/vo/query/fill/FillGatherTaskVO.java

@@ -108,5 +108,8 @@ public class FillGatherTaskVO extends BaseVO implements Serializable {
      */
     private Integer period;
 
+    private String checkerName; // 巡检人名称
+    private String leaderName; // 巡检主管名称
+
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/fill/FillUpdateRecordVO.java

@@ -69,5 +69,8 @@ public class FillUpdateRecordVO extends BaseVO implements Serializable {
      */
     private Integer type;
 
+    private String checkerName; // 巡检人名称
+    private String leaderName; // 巡检主管名称
+
 
 }

platform-dao/src/main/resources/mapper/fill/FillGatherTaskMapper.xml

@@ -102,8 +102,9 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.fill.FillGatherTaskDTO"
             resultType="com.platform.dao.vo.query.fill.FillGatherTaskVO">
-        select fill.*
-        from t_fill_gather_task as fill
+        select fill.*,cuser.real_name as checkerName,luser.real_name as leaderName
+        from t_fill_gather_task as fill join t_sys_user cuser on fill.checker = cuser.user_id
+        join t_sys_user luser on fill.check_leader = luser.user_id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-dao/src/main/resources/mapper/fill/FillUpdateRecordMapper.xml

@@ -67,8 +67,9 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.fill.FillUpdateRecordDTO"
             resultType="com.platform.dao.vo.query.fill.FillUpdateRecordVO">
-        select fill.*
-        from t_fill_update_record as fill
+        select fill.*,cuser.real_name as checkerName,luser.real_name as leaderName
+        from t_fill_update_record as fill join t_sys_user cuser on fill.created_user_id = cuser.user_id
+        join t_sys_user luser on fill.update_user_id = luser.user_id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -94,6 +94,7 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         boolean overTimeFlag = Boolean.FALSE;
         // 修改任务状态
         FillGatherTask updTask = new FillGatherTask();
+        updTask.setId(model.getId());
         FillUpdateRecord record = new FillUpdateRecord();
         record.setUpdateUserId(task.getCheckLeader());
         record.setTaskId(task.getId());