优化费用

java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java

@@ -46,6 +46,8 @@ public class FeeReceiptDto extends PageDto implements Serializable {
 
     private String feeFlag;
 
+    private String feeId;
+
     public String getAmount() {
         return amount;
     }
@@ -229,4 +231,12 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     public void setFeeFlag(String feeFlag) {
         this.feeFlag = feeFlag;
     }
+
+    public String getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
 }

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

@@ -81,6 +81,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="feeId !=null and feeId != ''">
+            and frd.fee_id = #{feeId}
+        </if>
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>
@@ -335,6 +338,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="feeId !=null and feeId != ''">
+            and frd.fee_id = #{feeId}
+        </if>
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>

service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java

@@ -131,6 +131,7 @@ public class FeeReceiptApi {
                                                   @RequestParam(value = "detailIds", required = false) String detailIds,
                                                   @RequestParam(value = "qstartTime", required = false) String qstartTime,
                                                   @RequestParam(value = "qendTime", required = false) String qendTime,
+                                                  @RequestParam(value = "feeId", required = false) String feeId,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row,
                                                   @RequestHeader(value = "user_id") String userId) {
@@ -158,6 +159,7 @@ public class FeeReceiptApi {
         feeReceiptDto.setObjId(objId);
         feeReceiptDto.setStoreName(storeName);
         feeReceiptDto.setPayObjId(payObjId);
+        feeReceiptDto.setFeeId(feeId);
         if (!StringUtil.isEmpty(qstartTime)) {
             feeReceiptDto.setQstartTime(qstartTime + " 00:00:00");
         }