优化费用

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

@@ -102,6 +102,9 @@ public class FeeConfigDto extends PageDto implements Serializable {
 
     private String staffNameLike;
 
+    private String logStartTime;
+    private String logEndTime;
+
 
     public String getFeeTypeCd() {
         return feeTypeCd;
@@ -417,4 +420,20 @@ public class FeeConfigDto extends PageDto implements Serializable {
     public void setFeeNameLike(String feeNameLike) {
         this.feeNameLike = feeNameLike;
     }
+
+    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;
+    }
 }

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

@@ -160,6 +160,15 @@ public class FeeDto extends PageDto implements Serializable {
     private String deleteFlag;
 
     private String prepaymentPeriod;
+
+
+    private String feeNameLike;
+
+    private String staffNameLike;
+
+    private String logStartTime;
+    private String logEndTime;
+
     public String getAmount() {
         return amount;
     }
@@ -786,4 +795,36 @@ public class FeeDto extends PageDto implements Serializable {
     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;
+    }
 }

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

@@ -355,13 +355,23 @@
         <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 pfc.fee_name like concat('%',#{feeNameLike},'%')
+        </if>
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </if>
         and t.community_id = #{communityId}
     </select>
 
     <select id="queryHisFees" parameterType="Map" resultType="Map">
         select t.operate,t.start_time startTime,t.end_time endTime,t.create_time createTime,pfc.fee_name feeName,
         t.amount,
-        uu.`name` userName,pfa.`value` payerObjName,pfa1.value ownerName
+        uu.`name` userName,pfa.`value` payerObjName,pfa1.value ownerName,co.create_time createTime
         from business_pay_fee t
         left join  pay_fee_config pfc on t.config_id = pfc.config_id
         left join c_business cb on t.b_id = cb.b_id
@@ -379,6 +389,16 @@
         <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 pfc.fee_name like concat('%',#{feeNameLike},'%')
+        </if>
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </if>
         and t.community_id = #{communityId}
         order by t.create_time desc,t.operate
         <if test="page != -1 and page != null ">
@@ -408,7 +428,10 @@
         <if test="feeNameLike != null and staffNameLike != ''">
             and t.fee_name like concat('%',#{feeNameLike},'%')
         </if>
-
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </if>
         and t.community_id = #{communityId}
     </select>
 
@@ -450,6 +473,10 @@
         <if test="feeNameLike != null and feeNameLike != ''">
             and t.fee_name like concat('%',#{feeNameLike},'%')
         </if>
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </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/QueryHisFeeCmd.java

@@ -31,10 +31,6 @@ public class QueryHisFeeCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
-        if (reqJson.containsKey("deleteFlag")) {
-            return;
-        }
-        Assert.hasKeyAndValue(reqJson,"feeId","未包含费用ID");
 
 
     }