计算应收

java110-bean/src/main/java/com/java110/dto/reportFeeYearCollection/ReportFeeYearCollectionDto.java

@@ -29,6 +29,7 @@ public class ReportFeeYearCollectionDto extends PageDto implements Serializable
     private String communityId;
     private String collectionId;
     private String objType;
+    private String receivableAmount;
 
     private List<ReportFeeYearCollectionDetailDto> reportFeeYearCollectionDetailDtos;
 
@@ -158,4 +159,12 @@ public class ReportFeeYearCollectionDto extends PageDto implements Serializable
     public void setReportFeeYearCollectionDetailDtos(List<ReportFeeYearCollectionDetailDto> reportFeeYearCollectionDetailDtos) {
         this.reportFeeYearCollectionDetailDtos = reportFeeYearCollectionDetailDtos;
     }
+
+    public String getReceivableAmount() {
+        return receivableAmount;
+    }
+
+    public void setReceivableAmount(String receivableAmount) {
+        this.receivableAmount = receivableAmount;
+    }
 }

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

@@ -149,6 +149,9 @@
         <if test="endTime !=null ">
             and t.create_time &lt;= #{endTime}
         </if>
+        <if test="curYear != null and curYear != ''">
+            and DATE_FORMAT(t.end_time,'%Y') = #{curYear}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}

service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java

@@ -211,7 +211,7 @@ public class GeneratorFeeYearStatisticsInnerServiceSMOImpl implements IGenerator
             reportFeeYearCollectionPo.setObjId(tmpReportCarDto.getCarId());
             reportFeeYearCollectionPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
             reportFeeYearCollectionPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
-            reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "停车场" + tmpReportCarDto.getNum() + "车位)");
+            reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getCarNum());
             reportFeeYearCollectionPo.setOwnerId(tmpReportCarDto.getOwnerId());
             reportFeeYearCollectionPo.setOwnerName(tmpReportCarDto.getOwnerName());
             reportFeeYearCollectionPo.setOwnerLink(tmpReportCarDto.getLink());
@@ -297,9 +297,9 @@ public class GeneratorFeeYearStatisticsInnerServiceSMOImpl implements IGenerator
             reportFeeYearCollectionPo.setObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
             reportFeeYearCollectionPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
             if (RoomDto.ROOM_TYPE_ROOM.equals(reportRoomDto.getRoomType())) {
-                reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "栋" + reportRoomDto.getUnitNum() + "单元" + reportRoomDto.getRoomNum() + "室");
+                reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "-" + reportRoomDto.getUnitNum() + "-" + reportRoomDto.getRoomNum() );
             } else {
-                reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "栋" + reportRoomDto.getRoomNum() + "室");
+                reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "-" + reportRoomDto.getRoomNum() );
             }
             reportFeeYearCollectionPo.setOwnerId(reportRoomDto.getOwnerId());
             reportFeeYearCollectionPo.setOwnerName(reportRoomDto.getOwnerName());

service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java

@@ -97,6 +97,11 @@ public class ReportFeeYearCollectionInnerServiceSMOImpl extends BaseServiceSMO i
                     tmpReportFeeYearCollectionDetailDtos.add(tmpReportFeeYearCollectionDetailDto);
                 }
             }
+            if (tmpReportFeeYearCollectionDetailDtos.size() > 0) {
+                reportFeeYearCollectionDto.setReceivableAmount(tmpReportFeeYearCollectionDetailDtos.get(0).getReceivableAmount());
+            } else {
+                reportFeeYearCollectionDto.setReceivableAmount("0");
+            }
             reportFeeYearCollectionDto.setReportFeeYearCollectionDetailDtos(tmpReportFeeYearCollectionDetailDtos);
         }
     }