汇总表数据问题修改

common/src/main/resources/mapper/base/FundIncomeInfo.xml

@@ -264,9 +264,11 @@
 				<![CDATA[
 				and serial_number like #{serialNumber}
 				and serial_number <> #{serialNumberStr}
+
 				]]>
 			</if>
 			<![CDATA[
+					and is_sum = false
 					and year_>=#{startDate}
 					and year_<=#{endDate}
 					and template_id=#{templateId}

web/src/main/java/com/jpsoft/employment/modules/base/controller/FundIncomeInfoController.java

@@ -843,7 +843,7 @@ public class FundIncomeInfoController {
 
                         BigDecimal accumulatedArrearsSum = BigDecimal.ZERO;
 
-                        Map<String, BigDecimal> mapSum = fundIncomeInfoService.sumBudgetRevenue(templateOption.getSerialNum() + ".%", startDate, endDate, templateInfo.getId());
+                        Map<String, BigDecimal> mapSum = fundIncomeInfoService.sumBudgetRevenue2(templateOption.getSerialNum() + ".%", startDate, endDate, templateInfo.getId(),templateOption.getSerialNum());
 
                         BigDecimal sumCurBudgetRevenue = BigDecimal.ZERO;
                         if (mapSum.get("sumCurBudgetRevenue") != null) {
@@ -859,7 +859,7 @@ public class FundIncomeInfoController {
 
                         map1.put("curBudgetRevenue", sumCurBudgetRevenue);
 
-                        Map<String, BigDecimal> accSumMap = fundIncomeInfoService.sumBudgetRevenue(templateOption.getSerialNum() + "%", startYearDate, endDate, templateOption.getTemplateId());
+                        Map<String, BigDecimal> accSumMap = fundIncomeInfoService.sumBudgetRevenue2(templateOption.getSerialNum() + "%", startYearDate, endDate, templateOption.getTemplateId(),templateOption.getSerialNum());
 
                         BigDecimal actualTotalRevenue = BigDecimal.ZERO;
                         if (accSumMap.get("sumCurMonthReceived") != null) {