Sfoglia il codice sorgente

优化交费明细报表

Your Name 2 anni fa
parent
commit
52a9f192ef

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

@@ -69,6 +69,9 @@
         <if test="receiptId !=null and receiptId != ''">
             and t.receipt_id= #{receiptId}
         </if>
+        <if test="receiptCode !=null and receiptCode != ''">
+            and t.receipt_code= #{receiptCode}
+        </if>
         <if test="receiptIds !=null">
             and t.receipt_id in
             <foreach collection="receiptIds" item="item" open="(" close=")" separator=",">
@@ -329,6 +332,9 @@
         <if test="receiptId !=null and receiptId != ''">
             and t.receipt_id= #{receiptId}
         </if>
+        <if test="receiptCode !=null and receiptCode != ''">
+            and t.receipt_code= #{receiptCode}
+        </if>
         <if test="receiptIds !=null">
             and t.receipt_id in
             <foreach collection="receiptIds" item="item" open="(" close=")" separator=",">

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

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