加入报表工鞥呢

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

@@ -4,6 +4,7 @@ import com.java110.dto.PageDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -43,6 +44,8 @@ public class ReportOwnerPayFeeDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos;
+
 
 
 
@@ -238,4 +241,12 @@ public class ReportOwnerPayFeeDto extends PageDto implements Serializable {
     public void setFeeIds(String[] feeIds) {
         this.feeIds = feeIds;
     }
+
+    public List<ReportOwnerPayFeeDto> getReportOwnerPayFeeDtos() {
+        return reportOwnerPayFeeDtos;
+    }
+
+    public void setReportOwnerPayFeeDtos(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos) {
+        this.reportOwnerPayFeeDtos = reportOwnerPayFeeDtos;
+    }
 }

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

@@ -21,6 +21,9 @@
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
+        <if test="pfYear !=null and pfYear != ''">
+            and t.pf_year= #{pfYear}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

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

@@ -94,12 +94,14 @@ 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 = "page") int page,
                                                          @RequestParam(value = "row") int row) {
         ReportOwnerPayFeeDto reportOwnerPayFeeDto = new ReportOwnerPayFeeDto();
         reportOwnerPayFeeDto.setPage(page);
         reportOwnerPayFeeDto.setRow(row);
         reportOwnerPayFeeDto.setCommunityId(communityId);
+        reportOwnerPayFeeDto.setPfYear(pfYear);
         return getReportOwnerPayFeeBMOImpl.get(reportOwnerPayFeeDto);
     }
 }

service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java

@@ -4,6 +4,7 @@ import com.java110.dto.fee.FeeDto;
 import com.java110.dto.reportOwnerPayFee.ReportOwnerPayFeeDto;
 import com.java110.intf.report.IReportOwnerPayFeeInnerServiceSMO;
 import com.java110.report.bmo.reportOwnerPayFee.IGetReportOwnerPayFeeBMO;
+import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +33,7 @@ public class GetReportOwnerPayFeeBMOImpl implements IGetReportOwnerPayFeeBMO {
         List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos = null;
         if (count > 0) {
             reportOwnerPayFeeDtos = reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerPayFees(reportOwnerPayFeeDto);
-            refreshOwnerPayFeeDto(reportOwnerPayFeeDtos);
+            refreshOwnerPayFeeDto(reportOwnerPayFeeDtos,reportOwnerPayFeeDto);
         } else {
             reportOwnerPayFeeDtos = new ArrayList<>();
         }
@@ -47,7 +48,7 @@ public class GetReportOwnerPayFeeBMOImpl implements IGetReportOwnerPayFeeBMO {
     /**
      * @param reportOwnerPayFeeDtos
      */
-    private void refreshOwnerPayFeeDto(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos) {
+    private void refreshOwnerPayFeeDto(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos,ReportOwnerPayFeeDto tmpReportOwnerPayFeeDto) {
         if (reportOwnerPayFeeDtos == null || reportOwnerPayFeeDtos.size() < 1) {
             return;
         }
@@ -66,6 +67,29 @@ public class GetReportOwnerPayFeeBMOImpl implements IGetReportOwnerPayFeeBMO {
             feeIds.add(reportOwnerPayFeeDto.getFeeId());
         }
 
+        ReportOwnerPayFeeDto reportOwnerPayFeeDto = new ReportOwnerPayFeeDto();
+        reportOwnerPayFeeDto.setFeeIds(feeIds.toArray(new String[feeIds.size()]));
+        reportOwnerPayFeeDto.setPfYear(tmpReportOwnerPayFeeDto.getPfYear());
+
+        if(StringUtil.isEmpty(reportOwnerPayFeeDto.getPfYear())){
+            reportOwnerPayFeeDto.setPfYear(DateUtil.getYear()+"");
+        }
+        List<ReportOwnerPayFeeDto> tmpReportOwnerPayFeeDtos
+                = reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerMonthPayFees(reportOwnerPayFeeDto);
+
+
+
+        List<ReportOwnerPayFeeDto> tmoNewReportOwnerPayFeeDtos = new ArrayList<>();
+
+        for(ReportOwnerPayFeeDto oldReportOwnerPayFeeDto : reportOwnerPayFeeDtos){
+            for(ReportOwnerPayFeeDto newReportOwnerPayFeeDto : tmpReportOwnerPayFeeDtos){
+                if(oldReportOwnerPayFeeDto.getFeeId().equals(newReportOwnerPayFeeDto.getFeeId())){
+                    tmoNewReportOwnerPayFeeDtos.add(newReportOwnerPayFeeDto);
+                }
+            }
+            oldReportOwnerPayFeeDto.setReportOwnerPayFeeDtos(tmoNewReportOwnerPayFeeDtos);
+        }
+
 
     }