全量提交

ruoyi-oa/src/main/resources/mapper/oa/PerformanceReportMapper.xml

@@ -41,6 +41,7 @@
             functionary    AS functionary,
             begin_time     AS beginTime,
             finish_time    AS finishTime,
+            original_finish_time AS originalFinishTime,
             introduction   AS introduction,
             project_grade  AS projectGrade,
             project_status AS projectStatus,
@@ -52,10 +53,13 @@
             create_by      AS createBy,
             create_time    AS createTime,
             update_by      AS updateBy,
-            update_time    AS updateTime
+            update_time    AS updateTime,
+            is_postpone    AS isPostpone,
+            postpone_reason AS postponeReason,
+            postpone_time  AS postponeTime,
+            postpone_count AS postponeCount
         FROM sys_oa_project
-        WHERE del_flag = 0
-          AND functionary IS NOT NULL
+        WHERE functionary IS NOT NULL
           AND functionary LIKE CONCAT('%', #{nickName}, '%')
         ORDER BY update_time DESC, create_time DESC
     </select>