Przeglądaj źródła

费用明细表导出修改

anderx 1 rok temu
rodzic
commit
facc4e4849

+ 13 - 1
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java

@@ -81,15 +81,27 @@ public class OutExpenseAccountDetailsList {
     /**
      * 创建时间
      */
-    @Excel(name = "报销时间")
+    @Excel(name = "报销发起时间")
     private String createTimeStr;
     private Integer targetType;
 
     private Date releaseStart;
     private Date releaseEnd;
+    @Excel(name = "报销时间")
+    private String releaseTimeStr;
+    @Excel(name = "工时")
     private Double duration ;
+    @Excel(name = "天数")
     private Integer days;
 
+    public String getReleaseTimeStr() {
+        return releaseTimeStr;
+    }
+
+    public void setReleaseTimeStr(String releaseTimeStr) {
+        this.releaseTimeStr = releaseTimeStr;
+    }
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     public Date getReleaseStart() {
         return releaseStart;

+ 4 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -371,6 +371,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     e.setTypeOther(String.format("其他(%s)",e.getTypeOther()));
                 }
             }
+            if(e.getReleaseStart()!=null&&e.getReleaseEnd()!=null){
+                e.setReleaseTimeStr(DateUtils.formatDate(e.getReleaseStart(),AFTConstants.YYYYMMDDHHMMSS)+"~"+DateUtils.formatDate(e.getReleaseEnd(),AFTConstants.YYYYMMDDHHMMSS));
+            }
+
         }
         NewExcelUtil excelUtil=new NewExcelUtil(OutExpenseAccountDetailsList.class);
         return excelUtil.exportExcel(list,"费用详细列表",uploadPath);