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