优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -174,6 +174,8 @@ public class FeeDto extends PageDto implements Serializable {
 
     private String monthCycle;
 
+    private String curYear;
+
     public String getAmount() {
         return amount;
     }
@@ -856,4 +858,12 @@ public class FeeDto extends PageDto implements Serializable {
     public void setMonthCycle(String monthCycle) {
         this.monthCycle = monthCycle;
     }
+
+    public String getCurYear() {
+        return curYear;
+    }
+
+    public void setCurYear(String curYear) {
+        this.curYear = curYear;
+    }
 }

java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml

@@ -234,6 +234,9 @@
         <if test="deductFrom !=null and deductFrom != ''">
             and pfc.deduct_from = #{deductFrom}
         </if>
+        <if test="curYear !=null and curYear != ''">
+            and DATE_FORMAT(t.end_time,'%Y') = #{curYear}
+        </if>
         order by t.payer_obj_id,pfc.fee_name,t.end_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -376,6 +379,9 @@
         <if test="deductFrom !=null and deductFrom != ''">
             and pfc.deduct_from = #{deductFrom}
         </if>
+        <if test="curYear !=null and curYear != ''">
+            and DATE_FORMAT(t.end_time,'%Y') = #{curYear}
+        </if>
 
     </select>