Browse Source

费用明细表新增字段

anderx 1 year ago
parent
commit
e6956a0253

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -935,7 +935,7 @@
   <select id="ExpenseDetailsList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountDetailsList">
     select mea.check_no checkNo ,ead.`type`,ead.type_other typeOther,
            ead.amount ,ead.real_amount realAmount ,o.contract_no contractNo ,dep.name applyDepName,
-    a.id sonId,a.type sonType ,a.type_other sonTypeOther ,
+    a.id sonId,a.type sonType ,a.type_other sonTypeOther ,a.release_start releaseStart ,a.release_end releaseEnd ,a.duration ,ROUND(a.duration/7.5) days,
     dep2.name payDepName ,a.aname ,ad2.name financeName,mea.status ,mea.process_status processStatus ,mea.id mainId,a.target_type targetType,
     tm.buyer_name buyerName ,date_format(mea.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id

+ 41 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java

@@ -1,8 +1,10 @@
 package com.goafanti.expenseAccount.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.goafanti.common.utils.excel.Excel;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutExpenseAccountDetailsList {
 
@@ -83,6 +85,45 @@ public class OutExpenseAccountDetailsList {
     private String createTimeStr;
     private Integer targetType;
 
+    private Date releaseStart;
+    private Date releaseEnd;
+    private Double duration ;
+    private Integer days;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
+    public Date getReleaseStart() {
+        return releaseStart;
+    }
+
+    public void setReleaseStart(Date releaseStart) {
+        this.releaseStart = releaseStart;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
+    public Date getReleaseEnd() {
+        return releaseEnd;
+    }
+
+    public void setReleaseEnd(Date releaseEnd) {
+        this.releaseEnd = releaseEnd;
+    }
+
+    public Double getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Double duration) {
+        this.duration = duration;
+    }
+
+    public Integer getDays() {
+        return days;
+    }
+
+    public void setDays(Integer days) {
+        this.days = days;
+    }
+
     public Integer getSonId() {
         return sonId;
     }