优化代码

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

@@ -1,8 +1,11 @@
 package com.java110.dto.reportFeeYearCollection;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.reportFeeYearCollectionDetail.ReportFeeYearCollectionDetailDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,17 +18,19 @@ import java.util.Date;
 public class ReportFeeYearCollectionDto extends PageDto implements Serializable {
 
     private String ownerLink;
-private String objName;
-private String ownerId;
-private String feeId;
-private String builtUpArea;
-private String ownerName;
-private String configId;
-private String objId;
-private String feeName;
-private String communityId;
-private String collectionId;
-private String objType;
+    private String objName;
+    private String ownerId;
+    private String feeId;
+    private String builtUpArea;
+    private String ownerName;
+    private String configId;
+    private String objId;
+    private String feeName;
+    private String communityId;
+    private String collectionId;
+    private String objType;
+
+    private List<ReportFeeYearCollectionDetailDto> reportFeeYearCollectionDetailDtos;
 
 
     private Date createTime;
@@ -36,73 +41,96 @@ private String objType;
     public String getOwnerLink() {
         return ownerLink;
     }
-public void setOwnerLink(String ownerLink) {
+
+    public void setOwnerLink(String ownerLink) {
         this.ownerLink = ownerLink;
     }
-public String getObjName() {
+
+    public String getObjName() {
         return objName;
     }
-public void setObjName(String objName) {
+
+    public void setObjName(String objName) {
         this.objName = objName;
     }
-public String getOwnerId() {
+
+    public String getOwnerId() {
         return ownerId;
     }
-public void setOwnerId(String ownerId) {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getBuiltUpArea() {
+
+    public String getBuiltUpArea() {
         return builtUpArea;
     }
-public void setBuiltUpArea(String builtUpArea) {
+
+    public void setBuiltUpArea(String builtUpArea) {
         this.builtUpArea = builtUpArea;
     }
-public String getOwnerName() {
+
+    public String getOwnerName() {
         return ownerName;
     }
-public void setOwnerName(String ownerName) {
+
+    public void setOwnerName(String ownerName) {
         this.ownerName = ownerName;
     }
-public String getConfigId() {
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getCollectionId() {
+
+    public String getCollectionId() {
         return collectionId;
     }
-public void setCollectionId(String collectionId) {
+
+    public void setCollectionId(String collectionId) {
         this.collectionId = collectionId;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 
@@ -122,4 +150,12 @@ public void setObjType(String objType) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<ReportFeeYearCollectionDetailDto> getReportFeeYearCollectionDetailDtos() {
+        return reportFeeYearCollectionDetailDtos;
+    }
+
+    public void setReportFeeYearCollectionDetailDtos(List<ReportFeeYearCollectionDetailDto> reportFeeYearCollectionDetailDtos) {
+        this.reportFeeYearCollectionDetailDtos = reportFeeYearCollectionDetailDtos;
+    }
 }

java110-bean/src/main/java/com/java110/dto/reportFeeYearCollectionDetail/ReportFeeYearCollectionDetailDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.reportFeeYearCollectionDetail;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,13 @@ import java.util.Date;
 public class ReportFeeYearCollectionDetailDto extends PageDto implements Serializable {
 
     private String collectionYear;
-private String relationYear;
-private String detailId;
-private String receivableAmount;
-private String receivedAmount;
-private String communityId;
-private String collectionId;
+    private String relationYear;
+    private String detailId;
+    private String receivableAmount;
+    private String receivedAmount;
+    private String communityId;
+    private String collectionId;
+    private String[] collectionIds;
 
 
     private Date createTime;
@@ -31,43 +33,56 @@ private String collectionId;
     public String getCollectionYear() {
         return collectionYear;
     }
-public void setCollectionYear(String collectionYear) {
+
+    public void setCollectionYear(String collectionYear) {
         this.collectionYear = collectionYear;
     }
-public String getRelationYear() {
+
+    public String getRelationYear() {
         return relationYear;
     }
-public void setRelationYear(String relationYear) {
+
+    public void setRelationYear(String relationYear) {
         this.relationYear = relationYear;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getReceivableAmount() {
+
+    public String getReceivableAmount() {
         return receivableAmount;
     }
-public void setReceivableAmount(String receivableAmount) {
+
+    public void setReceivableAmount(String receivableAmount) {
         this.receivableAmount = receivableAmount;
     }
-public String getReceivedAmount() {
+
+    public String getReceivedAmount() {
         return receivedAmount;
     }
-public void setReceivedAmount(String receivedAmount) {
+
+    public void setReceivedAmount(String receivedAmount) {
         this.receivedAmount = receivedAmount;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getCollectionId() {
+
+    public String getCollectionId() {
         return collectionId;
     }
-public void setCollectionId(String collectionId) {
+
+    public void setCollectionId(String collectionId) {
         this.collectionId = collectionId;
     }
 
@@ -87,4 +102,12 @@ public void setCollectionId(String collectionId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getCollectionIds() {
+        return collectionIds;
+    }
+
+    public void setCollectionIds(String[] collectionIds) {
+        this.collectionIds = collectionIds;
+    }
 }

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

@@ -5,165 +5,164 @@
 <mapper namespace="reportFeeYearCollectionServiceDaoImpl">
 
 
-
-
-
     <!-- 保存费用年收费信息 add by wuxw 2018-07-03 -->
     <insert id="saveReportFeeYearCollectionInfo" parameterType="Map">
         insert into report_fee_year_collection(
-owner_link,obj_name,owner_id,fee_id,built_up_area,owner_name,config_id,obj_id,fee_name,community_id,collection_id,obj_type
-) values (
-#{ownerLink},#{objName},#{ownerId},#{feeId},#{builtUpArea},#{ownerName},#{configId},#{objId},#{feeName},#{communityId},#{collectionId},#{objType}
-)
+        owner_link,obj_name,owner_id,fee_id,built_up_area,owner_name,config_id,obj_id,fee_name,community_id,collection_id,obj_type
+        ) values (
+        #{ownerLink},#{objName},#{ownerId},#{feeId},#{builtUpArea},#{ownerName},#{configId},#{objId},#{feeName},#{communityId},#{collectionId},#{objType}
+        )
     </insert>
 
 
-
     <!-- 查询费用年收费信息 add by wuxw 2018-07-03 -->
     <select id="getReportFeeYearCollectionInfo" parameterType="Map" resultType="Map">
-        select  t.owner_link,t.owner_link ownerLink,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name objName,t.owner_id,t.owner_id ownerId,t.fee_id,t.fee_id feeId,t.built_up_area,t.built_up_area builtUpArea,t.owner_name,t.owner_name ownerName,t.config_id,t.config_id configId,t.obj_id,t.obj_id objId,t.fee_name,t.fee_name feeName,t.community_id,t.community_id communityId,t.collection_id,t.collection_id collectionId,t.obj_type,t.obj_type objType 
-from report_fee_year_collection t 
-where 1 =1 
-<if test="ownerLink !=null and ownerLink != ''">
-   and t.owner_link= #{ownerLink}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="objName !=null and objName != ''">
-   and t.obj_name= #{objName}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-   and t.built_up_area= #{builtUpArea}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="objId !=null and objId != ''">
-   and t.obj_id= #{objId}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="collectionId !=null and collectionId != ''">
-   and t.collection_id= #{collectionId}
-</if> 
-<if test="objType !=null and objType != ''">
-   and t.obj_type= #{objType}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.owner_link,t.owner_link ownerLink,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name
+        objName,t.owner_id,t.owner_id ownerId,t.fee_id,t.fee_id feeId,t.built_up_area,t.built_up_area
+        builtUpArea,t.owner_name,t.owner_name ownerName,t.config_id,t.config_id configId,t.obj_id,t.obj_id
+        objId,t.fee_name,t.fee_name feeName,t.community_id,t.community_id communityId,t.collection_id,t.collection_id
+        collectionId,t.obj_type,t.obj_type objType
+        from report_fee_year_collection t
+        where 1 =1
+        <if test="ownerLink !=null and ownerLink != ''">
+            and t.owner_link= #{ownerLink}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="objName !=null and objName != ''">
+            and t.obj_name= #{objName}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="collectionId !=null and collectionId != ''">
+            and t.collection_id= #{collectionId}
+        </if>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改费用年收费信息 add by wuxw 2018-07-03 -->
     <update id="updateReportFeeYearCollectionInfo" parameterType="Map">
-        update  report_fee_year_collection t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="ownerLink !=null and ownerLink != ''">
-, t.owner_link= #{ownerLink}
-</if> 
-<if test="objName !=null and objName != ''">
-, t.obj_name= #{objName}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-, t.fee_id= #{feeId}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-, t.built_up_area= #{builtUpArea}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-, t.owner_name= #{ownerName}
-</if> 
-<if test="configId !=null and configId != ''">
-, t.config_id= #{configId}
-</if> 
-<if test="objId !=null and objId != ''">
-, t.obj_id= #{objId}
-</if> 
-<if test="feeName !=null and feeName != ''">
-, t.fee_name= #{feeName}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="objType !=null and objType != ''">
-, t.obj_type= #{objType}
-</if> 
- where 1=1 <if test="collectionId !=null and collectionId != ''">
-and t.collection_id= #{collectionId}
-</if> 
+        update report_fee_year_collection t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="ownerLink !=null and ownerLink != ''">
+            , t.owner_link= #{ownerLink}
+        </if>
+        <if test="objName !=null and objName != ''">
+            , t.obj_name= #{objName}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            , t.fee_id= #{feeId}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            , t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            , t.owner_name= #{ownerName}
+        </if>
+        <if test="configId !=null and configId != ''">
+            , t.config_id= #{configId}
+        </if>
+        <if test="objId !=null and objId != ''">
+            , t.obj_id= #{objId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            , t.fee_name= #{feeName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="objType !=null and objType != ''">
+            , t.obj_type= #{objType}
+        </if>
+        where 1=1
+        <if test="collectionId !=null and collectionId != ''">
+            and t.collection_id= #{collectionId}
+        </if>
 
     </update>
 
     <!-- 查询费用年收费数量 add by wuxw 2018-07-03 -->
-     <select id="queryReportFeeYearCollectionsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from report_fee_year_collection t 
-where 1 =1 
-<if test="ownerLink !=null and ownerLink != ''">
-   and t.owner_link= #{ownerLink}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="objName !=null and objName != ''">
-   and t.obj_name= #{objName}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-   and t.built_up_area= #{builtUpArea}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="objId !=null and objId != ''">
-   and t.obj_id= #{objId}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="collectionId !=null and collectionId != ''">
-   and t.collection_id= #{collectionId}
-</if> 
-<if test="objType !=null and objType != ''">
-   and t.obj_type= #{objType}
-</if> 
+    <select id="queryReportFeeYearCollectionsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from report_fee_year_collection t
+        where 1 =1
+        <if test="ownerLink !=null and ownerLink != ''">
+            and t.owner_link= #{ownerLink}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="objName !=null and objName != ''">
+            and t.obj_name= #{objName}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="collectionId !=null and collectionId != ''">
+            and t.collection_id= #{collectionId}
+        </if>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

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

@@ -111,26 +111,31 @@ public class ReportFeeYearCollectionApi {
      *
      * @param communityId 小区ID
      * @return
-     * @serviceCode /reportFeeYearCollection/queryReportFeeYearCollection
-     * @path /app/reportFeeYearCollection/queryReportFeeYearCollection
+     * @serviceCode /reportFeeYearCollection/queryReportFeeYear
+     * @path /app/reportFeeYearCollection/queryReportFeeYear
      */
-    @RequestMapping(value = "/queryReportFeeYearCollection", method = RequestMethod.GET)
-    public ResponseEntity<String> queryReportFeeYearCollection(@RequestParam(value = "communityId") String communityId,
-                                                               @RequestParam(value = "page") int page,
-                                                               @RequestParam(value = "row") int row) {
+    @RequestMapping(value = "/queryReportFeeYear", method = RequestMethod.GET)
+    public ResponseEntity<String> queryReportFeeYear(@RequestParam(value = "communityId") String communityId,
+                                                     @RequestParam(value = "objType") String objType,
+                                                     @RequestParam(value = "objName",required = false) String objName,
+                                                     @RequestParam(value = "page") int page,
+                                                     @RequestParam(value = "row") int row) {
         ReportFeeYearCollectionDto reportFeeYearCollectionDto = new ReportFeeYearCollectionDto();
         reportFeeYearCollectionDto.setPage(page);
         reportFeeYearCollectionDto.setRow(row);
         reportFeeYearCollectionDto.setCommunityId(communityId);
+        reportFeeYearCollectionDto.setObjType(objType);
+        reportFeeYearCollectionDto.setObjName(objName);
         return getReportFeeYearCollectionBMOImpl.get(reportFeeYearCollectionDto);
     }
 
     /**
      * 微信保存消息模板
-     * @serviceCode /reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
+     *
      * @param reqJson
      * @return
+     * @serviceCode /reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollectionDetail/saveReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/saveReportFeeYearCollectionDetail", method = RequestMethod.POST)
     public ResponseEntity<String> saveReportFeeYearCollectionDetail(@RequestBody JSONObject reqJson) {
@@ -147,10 +152,11 @@ public class ReportFeeYearCollectionApi {
 
     /**
      * 微信修改消息模板
-     * @serviceCode /reportFeeYearCollection/updateReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollection/updateReportFeeYearCollectionDetail
+     *
      * @param reqJson
      * @return
+     * @serviceCode /reportFeeYearCollection/updateReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollection/updateReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/updateReportFeeYearCollectionDetail", method = RequestMethod.POST)
     public ResponseEntity<String> updateReportFeeYearCollectionDetail(@RequestBody JSONObject reqJson) {
@@ -168,10 +174,11 @@ public class ReportFeeYearCollectionApi {
 
     /**
      * 微信删除消息模板
-     * @serviceCode /reportFeeYearCollection/deleteReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollection/deleteReportFeeYearCollectionDetail
+     *
      * @param reqJson
      * @return
+     * @serviceCode /reportFeeYearCollection/deleteReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollection/deleteReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/deleteReportFeeYearCollectionDetail", method = RequestMethod.POST)
     public ResponseEntity<String> deleteReportFeeYearCollectionDetail(@RequestBody JSONObject reqJson) {
@@ -186,10 +193,11 @@ public class ReportFeeYearCollectionApi {
 
     /**
      * 微信删除消息模板
-     * @serviceCode /reportFeeYearCollection/queryReportFeeYearCollectionDetail
-     * @path /app/reportFeeYearCollection/queryReportFeeYearCollectionDetail
+     *
      * @param communityId 小区ID
      * @return
+     * @serviceCode /reportFeeYearCollection/queryReportFeeYearCollectionDetail
+     * @path /app/reportFeeYearCollection/queryReportFeeYearCollectionDetail
      */
     @RequestMapping(value = "/queryReportFeeYearCollectionDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryReportFeeYearCollectionDetail(@RequestParam(value = "communityId") String communityId,

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

@@ -4,6 +4,8 @@ package com.java110.report.smo.impl;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.reportFeeYearCollection.ReportFeeYearCollectionDto;
+import com.java110.dto.reportFeeYearCollectionDetail.ReportFeeYearCollectionDetailDto;
+import com.java110.intf.report.IReportFeeYearCollectionDetailInnerServiceSMO;
 import com.java110.intf.report.IReportFeeYearCollectionInnerServiceSMO;
 import com.java110.po.reportFeeYearCollection.ReportFeeYearCollectionPo;
 import com.java110.report.dao.IReportFeeYearCollectionServiceDao;
@@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,9 @@ public class ReportFeeYearCollectionInnerServiceSMOImpl extends BaseServiceSMO i
     @Autowired
     private IReportFeeYearCollectionServiceDao reportFeeYearCollectionServiceDaoImpl;
 
+    @Autowired
+    private IReportFeeYearCollectionDetailInnerServiceSMO reportFeeYearCollectionDetailInnerServiceSMOImpl;
+
 
     @Override
     public int saveReportFeeYearCollection(@RequestBody ReportFeeYearCollectionPo reportFeeYearCollectionPo) {
@@ -64,9 +70,37 @@ public class ReportFeeYearCollectionInnerServiceSMOImpl extends BaseServiceSMO i
 
         List<ReportFeeYearCollectionDto> reportFeeYearCollections = BeanConvertUtil.covertBeanList(reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDto)), ReportFeeYearCollectionDto.class);
 
+        freshDetails(reportFeeYearCollections);
         return reportFeeYearCollections;
     }
 
+    private void freshDetails(List<ReportFeeYearCollectionDto> reportFeeYearCollections) {
+        if (reportFeeYearCollections == null || reportFeeYearCollections.size() < 1 || reportFeeYearCollections.size() > 20) {
+            return;
+        }
+
+        List<String> collectionIds = new ArrayList<>();
+        for (ReportFeeYearCollectionDto reportFeeYearCollectionDto : reportFeeYearCollections) {
+            collectionIds.add(reportFeeYearCollectionDto.getCollectionId());
+        }
+        ReportFeeYearCollectionDetailDto reportFeeYearCollectionDetailDto = new ReportFeeYearCollectionDetailDto();
+        reportFeeYearCollectionDetailDto.setCommunityId(reportFeeYearCollections.get(0).getCommunityId());
+        reportFeeYearCollectionDetailDto.setCollectionIds(collectionIds.toArray(new String[collectionIds.size()]));
+        List<ReportFeeYearCollectionDetailDto> reportFeeYearCollectionDetailDtos
+                = reportFeeYearCollectionDetailInnerServiceSMOImpl.queryReportFeeYearCollectionDetails(reportFeeYearCollectionDetailDto);
+
+        List<ReportFeeYearCollectionDetailDto> tmpReportFeeYearCollectionDetailDtos = null;
+        for (ReportFeeYearCollectionDto reportFeeYearCollectionDto : reportFeeYearCollections) {
+            tmpReportFeeYearCollectionDetailDtos = new ArrayList<>();
+            for (ReportFeeYearCollectionDetailDto tmpReportFeeYearCollectionDetailDto : reportFeeYearCollectionDetailDtos) {
+                if (reportFeeYearCollectionDto.getCollectionId().equals(tmpReportFeeYearCollectionDetailDto.getCollectionId())) {
+                    tmpReportFeeYearCollectionDetailDtos.add(tmpReportFeeYearCollectionDetailDto);
+                }
+            }
+            reportFeeYearCollectionDto.setReportFeeYearCollectionDetailDtos(tmpReportFeeYearCollectionDetailDtos);
+        }
+    }
+
 
     @Override
     public int queryReportFeeYearCollectionsCount(@RequestBody ReportFeeYearCollectionDto reportFeeYearCollectionDto) {