优化月缴费明细

java110-bean/src/main/java/com/java110/dto/reportOwnerPayFee/ReportOwnerPayFeeDto.java

@@ -38,6 +38,9 @@ public class ReportOwnerPayFeeDto extends PageDto implements Serializable {
     private String contractCode;
     private String communityId;
     private String objType;
+    private String floorNum;
+    private String unitNum;
+    private String roomNum;
 
 
     private Date createTime;
@@ -249,4 +252,28 @@ public class ReportOwnerPayFeeDto extends PageDto implements Serializable {
     public void setReportOwnerPayFeeDtos(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos) {
         this.reportOwnerPayFeeDtos = reportOwnerPayFeeDtos;
     }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
 }

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

@@ -65,6 +65,15 @@
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
+        <if test="floorNum !=null and floorNum != ''">
+            and ff.floor_num = #{floorNum}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and bu.unit_num = #{unitNum}
+        </if>
+        <if test="roomNum !=null and roomNum != ''">
+            and br.room_num = #{roomNum}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -159,6 +168,15 @@
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
+        <if test="floorNum !=null and floorNum != ''">
+            and ff.floor_num = #{floorNum}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and bu.unit_num = #{unitNum}
+        </if>
+        <if test="roomNum !=null and roomNum != ''">
+            and br.room_num = #{roomNum}
+        </if>
     </select>
 
 </mapper>

service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java

@@ -9,6 +9,7 @@ import com.java110.report.bmo.reportOwnerPayFee.ISaveReportOwnerPayFeeBMO;
 import com.java110.report.bmo.reportOwnerPayFee.IUpdateReportOwnerPayFeeBMO;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -94,7 +95,10 @@ public class ReportOwnerPayFeeApi {
      */
     @RequestMapping(value = "/queryReportOwnerPayFee", method = RequestMethod.GET)
     public ResponseEntity<String> queryReportOwnerPayFee(@RequestParam(value = "communityId") String communityId,
-                                                         @RequestParam(value = "pfYear",required = false) String pfYear,
+                                                         @RequestParam(value = "pfYear", required = false) String pfYear,
+                                                         @RequestParam(value = "configId", required = false) String configId,
+                                                         @RequestParam(value = "roomName", required = false) String roomName,
+                                                         @RequestParam(value = "ownerName", required = false) String ownerName,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row) {
         ReportOwnerPayFeeDto reportOwnerPayFeeDto = new ReportOwnerPayFeeDto();
@@ -102,6 +106,18 @@ public class ReportOwnerPayFeeApi {
         reportOwnerPayFeeDto.setRow(row);
         reportOwnerPayFeeDto.setCommunityId(communityId);
         reportOwnerPayFeeDto.setPfYear(pfYear);
+        reportOwnerPayFeeDto.setConfigId(configId);
+        reportOwnerPayFeeDto.setRoomName(roomName);
+        reportOwnerPayFeeDto.setOwnerName(ownerName);
+        if (!StringUtil.isEmpty(roomName) && roomName.contains("-")) {
+            String[] datas = roomName.split("-");
+            if (datas.length != 3) {
+                throw new IllegalArgumentException("房屋格式错误，请填写 楼栋-单元-房屋格式");
+            }
+            reportOwnerPayFeeDto.setFloorNum(datas[0]);
+            reportOwnerPayFeeDto.setUnitNum(datas[1]);
+            reportOwnerPayFeeDto.setRoomNum(datas[2]);
+        }
         return getReportOwnerPayFeeBMOImpl.get(reportOwnerPayFeeDto);
     }
 }