补打票据（根据模板打印）更新

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

@@ -33,16 +33,32 @@ public class FeeReceiptDtoNew extends PageDto implements Serializable {
     private String month;
     private String type;
     private String carNum;
+    private String qstartTime; //给公摊费使用的时间
+    private String qendTime;   //给公摊费使用的时间
     private String startTime; //给公摊费使用的时间
     private String endTime;   //给公摊费使用的时间
     private String cycle;   //给公摊费使用的数量
 
-
-
     private Date createTime;
 
     private String statusCd = "0";
 
+    public String getQstartTime() {
+        return qstartTime;
+    }
+
+    public void setQstartTime(String qstartTime) {
+        this.qstartTime = qstartTime;
+    }
+
+    public String getQendTime() {
+        return qendTime;
+    }
+
+    public void setQendTime(String qendTime) {
+        this.qendTime = qendTime;
+    }
+
     public String getCycle() {
         return cycle;
     }

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

@@ -85,7 +85,8 @@
         tt.cycle as cycle,
         tt.amount amount,
         uu.NAME AS userName,
-        t.create_time AS createTime
+        t.create_time AS createTime,
+        p.remark  as remark
         FROM
         fee_receipt t
         LEFT JOIN fee_receipt_detail tt ON t.receipt_id = tt.receipt_id
@@ -137,7 +138,8 @@
         tt.cycle as cycle,
         tt.amount amount,
         uu.NAME AS userName,
-        t.create_time AS createTime
+        t.create_time AS createTime,
+        p.remark as remark
         FROM
         fee_receipt t
         LEFT JOIN fee_receipt_detail tt ON t.receipt_id = tt.receipt_id
@@ -184,8 +186,11 @@
         <if test="type !=null and type == 5">
             AND  feeName in ('公共区域公摊电费','生活水泵公摊电费','走廊楼道应急公摊电费','电梯公摊电费')
         </if>
-        <if test="month !=null and month != ''">
-            AND DATE_FORMAT(t.createTime, '%Y-%m') = #{month}
+        <if test="qstartTime !=null and qstartTime != ''">
+            AND DATE_FORMAT(t.createTime, '%Y-%m-%d') &gt;= DATE_FORMAT( #{qstartTime}, '%Y-%m-%d' )
+        </if>
+        <if test="qendTime !=null and qendTime != ''">
+            AND DATE_FORMAT(t.createTime, '%Y-%m-%d') &lt;= DATE_FORMAT( #{qendTime}, '%Y-%m-%d' )
         </if>
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}

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

@@ -140,19 +140,21 @@ public class FeeReceiptApi {
      */
     @RequestMapping(value = "/queryFeeReceiptNew", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeReceiptNew(@RequestParam(value = "communityId") String communityId,
-                                                     @RequestParam(value = "objType",required = false) String objType,
-                                                     @RequestParam(value = "roomName",required = false) String roomName,
-                                                     @RequestParam(value = "type",required = false) String type,
-                                                     @RequestParam(value = "month",required = false) String month,
+                                                  @RequestParam(value = "objType",required = false) String objType,
+                                                  @RequestParam(value = "roomName",required = false) String roomName,
+                                                  @RequestParam(value = "type",required = false) String type,
+                                                     @RequestParam(value = "qstartTime",required = false) String qstartTime,
+                                                     @RequestParam(value = "qendTime",required = false) String qendTime,
                                                      @RequestParam(value = "page") int page,
-                                                     @RequestParam(value = "row") int row
+                                                  @RequestParam(value = "row") int row
     ) {
         FeeReceiptDtoNew feeReceiptDto = new FeeReceiptDtoNew();
         feeReceiptDto.setPage(page);
         feeReceiptDto.setRow(row);
         feeReceiptDto.setCommunityId(communityId);
         feeReceiptDto.setType(type);
-        feeReceiptDto.setMonth(month);
+        feeReceiptDto.setQstartTime(qstartTime);
+        feeReceiptDto.setQendTime(qendTime);
         feeReceiptDto.setObjType(objType);
         feeReceiptDto.setObjName(roomName   );
         return getFeeReceiptBMOImpl.gets(feeReceiptDto);