From 1ac555ce49a45e2c7fc015dbb16b104840788c21 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期一, 18 八月 2025 11:51:42 +0800
Subject: [PATCH] 费用导入修复2025/08/15

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java |  151 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 150 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
index 2550c8b..9b7117c 100755
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -1,5 +1,6 @@
 package com.java110.dto.fee;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.java110.dto.PageDto;
 
 import java.io.Serializable;
@@ -36,7 +37,11 @@
     private String incomeObjId;
     private String incomeObjName;
     private String feeTypeCd;
+    private String secondaryFeeTypeCd;
+    private String secondaryFeeTypeCdName;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endTime;
     private String communityId;
     private String feeId;
@@ -46,7 +51,9 @@
     private String[] payerObjIds;
     private String[] feeTypeCds;
     private String configId;
-
+    private String[] configIds;
+    private String isContractFee;
+    private String contractFee;
     //鏄犲皠鍏崇郴寮�鍏冲��
     private String val;
 
@@ -110,6 +117,7 @@
 
     private Date deadlineTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date maxEndTime;
 
     private Date importFeeEndTime;
@@ -157,6 +165,26 @@
     private String customStartTime;
     private String customEndTime;
 
+    private String deleteFlag;
+
+    private String prepaymentPeriod;
+
+
+    private String feeNameLike;
+
+    private String staffNameLike;
+
+    private String logStartTime;
+    private String logEndTime;
+
+    private String ruleId;
+
+    private String monthCycle;
+
+    private String curYear;
+
+    private String targetEndTime;
+
     public String getAmount() {
         return amount;
     }
@@ -180,6 +208,23 @@
     public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
+
+public String getSecondaryFeeTypeCd() {
+        return secondaryFeeTypeCd;
+    }
+
+    public void setSecondaryFeeTypeCd(String secondaryFeeTypeCd) {
+        this.secondaryFeeTypeCd= secondaryFeeTypeCd;
+    }
+
+    public String getSecondaryFeeTypeCdName() {
+        return secondaryFeeTypeCdName;
+    }
+
+    public void setSecondaryFeeTypeCdName(String secondaryFeeTypeCdName) {
+        this.secondaryFeeTypeCdName = secondaryFeeTypeCdName;
+    }
+
 
     public String getCommunityId() {
         return communityId;
@@ -767,4 +812,108 @@
     public void setCustomEndTime(String customEndTime) {
         this.customEndTime = customEndTime;
     }
+
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getPrepaymentPeriod() {
+        return prepaymentPeriod;
+    }
+
+    public void setPrepaymentPeriod(String prepaymentPeriod) {
+        this.prepaymentPeriod = prepaymentPeriod;
+    }
+
+    public String getFeeNameLike() {
+        return feeNameLike;
+    }
+
+    public void setFeeNameLike(String feeNameLike) {
+        this.feeNameLike = feeNameLike;
+    }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
+
+    public String getLogStartTime() {
+        return logStartTime;
+    }
+
+    public void setLogStartTime(String logStartTime) {
+        this.logStartTime = logStartTime;
+    }
+
+    public String getLogEndTime() {
+        return logEndTime;
+    }
+
+    public void setLogEndTime(String logEndTime) {
+        this.logEndTime = logEndTime;
+    }
+
+    public String[] getConfigIds() {
+        return configIds;
+    }
+
+    public void setConfigIds(String[] configIds) {
+        this.configIds = configIds;
+    }
+
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public String getMonthCycle() {
+        return monthCycle;
+    }
+
+    public void setMonthCycle(String monthCycle) {
+        this.monthCycle = monthCycle;
+    }
+
+    public String getCurYear() {
+        return curYear;
+    }
+
+    public void setCurYear(String curYear) {
+        this.curYear = curYear;
+    }
+
+    public String getTargetEndTime() {
+        return targetEndTime;
+    }
+
+    public void setTargetEndTime(String targetEndTime) {
+        this.targetEndTime = targetEndTime;
+    }
+
+    public String getIsContractFee() {
+        return isContractFee;
+    }
+
+    public void setIsContractFee(String isContractFee) {
+        this.isContractFee = isContractFee;
+    }
+
+    public String getContractFee() {
+        return contractFee;
+    }
+
+    public void setContractFee(String contractFee) {
+        this.contractFee = contractFee;
+    }
 }

--
Gitblit v1.8.0