anderx 1 год назад
Родитель
Сommit
ebce768065

+ 1 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -2,6 +2,7 @@ package com.goafanti.common.constant;
 
 public class AFTConstants {
 	public static final String	YYYYMMDDHHMMSS						= "yyyy-MM-dd HH:mm:ss";
+	public static final String	YYYYMMDDHHMM						= "yyyy-MM-dd HH:mm";
 	public static final String	YMDHMS_CHINESE						= "yyyy年MM月dd日 HH:mm:ss";
 	public static final String	YYYYMMDD							= "yyyy-MM-dd";
 	public static final String	YYYYMM								= "yyyy-MM";

+ 14 - 12
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java

@@ -16,23 +16,29 @@ public class OutExpenseAccountDetailsList {
     private Integer type;
     @Excel(name = "类型")
     private String  typeOther;
+    @Excel(name = "报销时间",width = 26)
+    private String releaseTimeStr;
+    @Excel(name = "工时",width = 5)
+    private Double duration ;
+    @Excel(name = "天数",width = 5)
+    private Integer days;
     private Integer sonId;
     private Integer sonType;
     private String  sonTypeOther;
     /**
      * 金额
      */
-    @Excel(name = "报销金额", scale = 2)
+    @Excel(name = "报销金额", scale = 2,width = 8)
     private BigDecimal amount;
     /**
      * 实付金额
      */
-    @Excel(name = "实报金额", scale = 2)
+    @Excel(name = "实报金额", scale = 2,width = 8)
     private BigDecimal realAmount;
     /**
      * 报销查询编号
      */
-    @Excel(name = "报销编号")
+    @Excel(name = "报销编号",width = 20)
     private String checkNo;
     @Excel(name = "报销至订单")
     private String targetName;
@@ -54,17 +60,17 @@ public class OutExpenseAccountDetailsList {
     /**
      * 状态 0=草稿,1=审核中,2=完成,3=驳回 ,4=撤销
      */
-    @Excel(name = "状态",readConverterExp = "0=草稿,1=审核中,2=完成,3=驳回,4=删除")
+    @Excel(name = "状态",readConverterExp = "0=草稿,1=审核中,2=完成,3=驳回,4=删除",width = 8)
     private Integer status;
     /**
      * 申请公司
      */
-    @Excel(name = "申请公司")
+    @Excel(name = "申请公司",width = 20)
     private String applyDepName;
     /**
      * 支付公司
      */
-    @Excel(name = "支付公司")
+    @Excel(name = "支付公司",width = 20)
     private String payDepName;
     /**
      * 流程状态 0=巴员发起,1=上级审核,2=财务审核,3=总经理审核,4=董事长审核
@@ -87,12 +93,8 @@ public class OutExpenseAccountDetailsList {
 
     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;

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

@@ -372,7 +372,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 }
             }
             if(e.getReleaseStart()!=null&&e.getReleaseEnd()!=null){
-                e.setReleaseTimeStr(DateUtils.formatDate(e.getReleaseStart(),AFTConstants.YYYYMMDDHHMMSS)+"~"+DateUtils.formatDate(e.getReleaseEnd(),AFTConstants.YYYYMMDDHHMMSS));
+                e.setReleaseTimeStr(DateUtils.formatDate(e.getReleaseStart(),AFTConstants.YYYYMMDDHHMM)+"~"+DateUtils.formatDate(e.getReleaseEnd(),AFTConstants.YYYYMMDDHHMM));
             }
 
         }