java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
7956a51bcb

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/feeReceiptDetail/FeeReceiptDetailDto.java

@@ -23,6 +23,7 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     private String endTime;
     private String communityId;
     private String receiptId;
+    private String[] receiptIds;
     private String feeId;
     private String cycle;
     private String squarePrice;
@@ -155,4 +156,12 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     public void setFeeFlag(String feeFlag) {
         this.feeFlag = feeFlag;
     }
+
+    public String[] getReceiptIds() {
+        return receiptIds;
+    }
+
+    public void setReceiptIds(String[] receiptIds) {
+        this.receiptIds = receiptIds;
+    }
 }

+ 14 - 1
java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml

@@ -22,7 +22,8 @@
         communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
         pfd.remark,pf.fee_flag feeFlag
         from fee_receipt_detail t
-        left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id = pfd.community_id
+        left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id =
+        pfd.community_id
         left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and t.community_id = pf.community_id
         where 1 =1
 
@@ -53,6 +54,12 @@
         <if test="receiptId !=null and receiptId != ''">
             and t.receipt_id= #{receiptId}
         </if>
+        <if test="receiptIds !=null">
+            and t.receipt_id in
+            <foreach collection="receiptIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
@@ -139,6 +146,12 @@
         <if test="receiptId !=null and receiptId != ''">
             and t.receipt_id= #{receiptId}
         </if>
+        <if test="receiptIds !=null">
+            and t.receipt_id in
+            <foreach collection="receiptIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>

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

@@ -43,6 +43,12 @@
         <if test="receiptId !=null and receiptId != ''">
             and t.receipt_id= #{receiptId}
         </if>
+        <if test="receiptIds !=null">
+            and t.receipt_id in
+            <foreach collection="receiptIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>
@@ -207,6 +213,7 @@
         <if test="receiptId !=null and receiptId != ''">
             and t.receipt_id= #{receiptId}
         </if>
+
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>

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

@@ -254,6 +254,7 @@ public class FeeReceiptApi {
     @RequestMapping(value = "/queryFeeReceiptDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
                                                         @RequestParam(value = "receiptId", required = false) String receiptId,
+                                                        @RequestParam(value = "receiptIds", required = false) String receiptIds,
                                                         @RequestParam(value = "page") int page,
                                                         @RequestParam(value = "row") int row) {
         FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -261,6 +262,9 @@ public class FeeReceiptApi {
         feeReceiptDetailDto.setRow(row);
         feeReceiptDetailDto.setCommunityId(communityId);
         feeReceiptDetailDto.setReceiptId(receiptId);
+        if (!StringUtil.isEmpty(receiptIds)) {
+            feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
+        }
         return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
     }