From d627df25e0b4b343e0568ffaefdea582a2b3db17 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 25 Jun 2025 15:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E5=B7=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/oa/controller/OaProjectReportController.java | 1 +
 .../java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java
index 44bcda5..732a3b5 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java
@@ -75,6 +75,7 @@ public class OaProjectReportController extends BaseController {
         for (OaProjectReportVo reportVo : list) {
             reportVo.setContent(stripHtml(reportVo.getContent()));
             reportVo.setTrip(reportVo.getIsTrip() == 1 ? "是" : "否");
+            reportVo.setWorkTypeName(reportVo.getWorkType() == 1 ? "国外" : "国内");
             if (reportVo.getIsTrip() == null) {
                 reportVo.setIsTrip(0L); // 防止ExcelDictConvert NPE
             }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java
index a220258..39354d5 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java
@@ -123,9 +123,14 @@ public class OaProjectReportVo {
     private Date createTime;
 
      /**
-     * 报工时间
+     * 国内外标志
      */
     private Long workType;
+    /**
+     * 国内外
+     */
+    @ExcelProperty(value = "国内/国外")
+    private String workTypeName;
 
     /**
      * inWorkNum