DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导出报工表格

Browse Source
This commit is contained in:
Joshi
2025-06-25 15:06:10 +08:00
parent 3d9053f3fe
commit d627df25e0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java
View File

@@ -75,6 +75,7 @@ public class OaProjectReportController extends BaseController {
for (OaProjectReportVo reportVo : list) { for (OaProjectReportVo reportVo : list) {
reportVo.setContent(stripHtml(reportVo.getContent())); reportVo.setContent(stripHtml(reportVo.getContent()));
reportVo.setTrip(reportVo.getIsTrip() == 1 ? "是" : "否"); reportVo.setTrip(reportVo.getIsTrip() == 1 ? "是" : "否");
reportVo.setWorkTypeName(reportVo.getWorkType() == 1 ? "国外" : "国内");
if (reportVo.getIsTrip() == null) { if (reportVo.getIsTrip() == null) {
reportVo.setIsTrip(0L); // 防止ExcelDictConvert NPE reportVo.setIsTrip(0L); // 防止ExcelDictConvert NPE
} }

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java
View File

@@ -123,9 +123,14 @@ public class OaProjectReportVo {
private Date createTime; private Date createTime;
/** /**
* 报工时间 * 国内外标志
*/ */
private Long workType; private Long workType;
/**
* 国内外
*/
@ExcelProperty(value = "国内/国外")
private String workTypeName;
/** /**
* inWorkNum * inWorkNum