优化费用

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

@@ -53,6 +53,8 @@ public class FeeConfigDto extends PageDto implements Serializable {
     private String[] configIds;
     private String feeFlag;
     private String feeName;
+
+    private String feeNameLike;
     private String feeNameEq;
     private String startTime;
     private String endTime;
@@ -98,6 +100,8 @@ public class FeeConfigDto extends PageDto implements Serializable {
 
     private String prepaymentPeriod;
 
+    private String staffNameLike;
+
 
     public String getFeeTypeCd() {
         return feeTypeCd;
@@ -397,4 +401,20 @@ public class FeeConfigDto extends PageDto implements Serializable {
         this.prepaymentPeriod = prepaymentPeriod;
 
     }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
+
+    public String getFeeNameLike() {
+        return feeNameLike;
+    }
+
+    public void setFeeNameLike(String feeNameLike) {
+        this.feeNameLike = feeNameLike;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -402,6 +402,13 @@
         <if test="deleteFlag != null and deleteFlag != ''">
             and t.operate = 'DEL'
         </if>
+        <if test="staffNameLike != null and staffNameLike != ''">
+            and uu.name like concat('%',#{staffNameLike},'%')
+        </if>
+        <if test="feeNameLike != null and staffNameLike != ''">
+            and t.fee_name like concat('%',#{feeNameLike},'%')
+        </if>
+
         and t.community_id = #{communityId}
     </select>
 
@@ -437,6 +444,12 @@
         <if test="deleteFlag != null and deleteFlag != ''">
             and t.operate = 'DEL'
         </if>
+        <if test="staffNameLike != null and staffNameLike != ''">
+            and uu.name like concat('%',#{staffNameLike},'%')
+        </if>
+        <if test="feeNameLike != null and staffNameLike != ''">
+            and t.fee_name like concat('%',#{feeNameLike},'%')
+        </if>
         and t.community_id = #{communityId}
         order by t.create_time desc,t.operate
         <if test="page != -1 and page != null ">

service-report/src/main/java/com/java110/report/cmd/fee/QueryHisFeeConfigCmd.java

@@ -33,12 +33,6 @@ public class QueryHisFeeConfigCmd extends Cmd {
 
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
 
-        if (reqJson.containsKey("deleteFlag")) {
-            return;
-        }
-
-        Assert.hasKeyAndValue(reqJson, "configId", "未包含费用ID");
-
     }
 
     @Override