优化实收计算错误问题

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

@@ -74,9 +74,7 @@
             , t.received_amount= #{receivedAmount}
         </if>
 
-        <if test="collectionId !=null and collectionId != ''">
-            , t.collection_id= #{collectionId}
-        </if>
+
         where 1=1
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}
@@ -84,6 +82,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="collectionId !=null and collectionId != ''">
+            and t.collection_id= #{collectionId}
+        </if>
 
     </update>
 

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

@@ -422,9 +422,9 @@ public class GeneratorFeeYearStatisticsInnerServiceSMOImpl implements IGenerator
         feeDetailDto.setFeeId(tmpReportFeeDto.getFeeId());
         String flag = CommonCache.getValue(RECEIVED_TIME);
         if (RECEIVED_TIME_START.equals(flag)) {
-            feeDetailDto.setStartTime(year + "");
+            feeDetailDto.setCurStartYear(year + "");
         } else {
-            feeDetailDto.setEndTime(year + "");
+            feeDetailDto.setCurEndYear(year + "");
         }
         double receivedAmount = reportFeeServiceDaoImpl.getFeeReceivedAmount(feeDetailDto);