Lianxun_Java.git

			@@ -157,6 +157,22 @@
			double[] col4Fee = new double[doYear - 1 + 20];
			double[] colByCar = new double[doYear - 1 + 20];
			double[] colByOther = new double[doYear - 1 + 20];

			LinkedList carFeeList = new LinkedList();
			FeeDto fee = new FeeDto();
			fee.setCurYear("停车费合计（3+...+7）");
			fee.setReport(colByCar);
			fee.setRow(0);
			carFeeList.add(fee);


			LinkedList otherFeeList = new LinkedList();
			FeeDto fee2 = new FeeDto();
			fee2.setCurYear("其他类合计（8+...+22）");
			fee2.setReport(colByOther);
			fee2.setRow(0);
			otherFeeList.add(fee2);

			reportFeeDtoLists.add(col1);
			reportFeeDtoLists.add(col2);
			reportFeeDtoLists.add(col2);
			@@ -168,6 +184,37 @@
			arr[i-startYear] = i;
			}
			List<Map> result = reportFeeInnerServiceSMOImpl.repostPaidInFee(feeQueryParams);
			List<Map> resultLT = reportFeeInnerServiceSMOImpl.repostPaidInFeeTwo(feeQueryParams);
			for (Map map : result) {
			if (map.containsKey("fee_type_cd") && map.get("fee_type_cd").equals("630000007")){
			for (Map map2 : resultLT) {
			if (!map.get("费用所属年份").equals("类型总计") && map2.containsKey("年份")&&((Long)map2.get("年份")) == Integer.parseInt((String)map.get("费用所属年份"))){
			map.put("该年应缴总额",((BigDecimal)map.get("该年应缴总额")).add((BigDecimal)map2.get("应缴金额")));
			map.put(map2.get("年份")+"年实缴", ((BigDecimal)map.get(map2.get("年份")+"年实缴")).add((BigDecimal)map2.get("实缴金额")));
			}
			if (!map.get("费用所属年份").equals("类型总计") && (Long)map2.get("年份") == currentYear && map2.containsKey("月份") && Integer.parseInt((String) map.get("费用所属年份")) == currentYear){
			Long month = (Long)map2.get("月份");
			map.put("当年"+(month > 9 ? month : "0" + month)+"月实缴",((BigDecimal)map.get("当年"+(month > 9 ? month : "0" + month)+"月实缴")).add((BigDecimal) map2.get("实缴金额")));
			}

			if (map.get("费用所属年份").equals("类型总计") && map2.containsKey("年份")){
			map.put("该年应缴总额",((BigDecimal)map.get("该年应缴总额")).add((BigDecimal)map2.get("应缴金额")));
			map.put(map2.get("年份")+"年实缴", ((BigDecimal)map.get(map2.get("年份")+"年实缴")).add((BigDecimal)map2.get("实缴金额")));
			}
			if (map.get("费用所属年份").equals("类型总计") && (Long)map2.get("年份") == currentYear && map2.containsKey("月份")){
			Long month = (Long)map2.get("月份");
			map.put("当年"+(month > 9 ? month : "0" + month)+"月实缴",((BigDecimal)map.get("当年"+(month > 9 ? month : "0" + month)+"月实缴")).add((BigDecimal) map2.get("实缴金额")));
			}
			}
			BigDecimal allPayable = new BigDecimal(0);
			for (int a : arr){
			BigDecimal bigDecimal = (BigDecimal) map.get(a+"年实缴");
			allPayable=allPayable.add(bigDecimal);
			}
			map.put("每月费用", new BigDecimal(((BigDecimal) map.get("该年应缴总额")).doubleValue() / ((Long) map.get("应收月份数"))));
			map.put("当年收缴率", new BigDecimal(allPayable.doubleValue() / ((BigDecimal) map.get("该年应缴总额")).doubleValue() * 100));
			}
			}
			DictDto dictDto = new DictDto();
			dictDto.setTableName("pay_fee_config");
			dictDto.setTableColumns("fee_type_cd");
			@@ -205,12 +252,12 @@
			for(int i = 0 ; i < doubles.length ; i++){
			if(i == 3){
			if (doubles[i] != 0){
			col1Fee[i] = (doubles[i]+col1Fee[i])/2;
			col2Fee[i] = (doubles[i]+col2Fee[i])/2;
			col1Fee[i] = doubleUse((doubles[i]+col1Fee[i])/2);
			col2Fee[i] = doubleUse((doubles[i]+col2Fee[i])/2);
			}
			}else{
			col1Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
			col2Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
			col2Fee[i] = doubleUse(doubles[i]+col2Fee[i]);
			}
			}
			}
			@@ -218,24 +265,24 @@
			for(int i = 0 ; i < doubles.length ; i++){
			if(i == 3){
			if (doubles[i] != 0){
			col1Fee[i] = (doubles[i]+col1Fee[i])/2;
			// col2Fee[i] = (doubles[i]+col2Fee[i])/2;
			col1Fee[i] = doubleUse((doubles[i]+col1Fee[i])/2);
			colByCar[i] = doubleUse((doubles[i]+colByCar[i])/2);
			}
			}else{
			col1Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
			// col2Fee[i] += doubleUse(doubles[i]);
			colByCar[i] = doubleUse(colByCar[i] + doubles[i]);
			}
			}
			}else{
			for(int i = 0 ; i < doubles.length ; i++){
			if(i == 3){
			if (doubles[i] != 0){
			col1Fee[i] = (doubles[i]+col1Fee[i])/2;
			// col2Fee[i] = (doubles[i]+col2Fee[i])/2;
			col1Fee[i] = doubleUse((doubles[i]+col1Fee[i])/2);
			colByOther[i] = doubleUse((doubles[i]+colByOther[i])/2);
			}
			}else{
			col1Fee[i] = doubleUse(doubles[i]+col1Fee[i]);
			// col2Fee[i] += doubleUse(doubles[i]);
			colByOther[i] = doubleUse(colByOther[i] + doubles[i]);
			}
			}
			}
			@@ -265,15 +312,15 @@
			if(map.get("费用所属年份").equals(i+"") && map.get("fee_type_cd").equals(dictDto1.getStatusCd())){
			double[] doubles = new double[doYear - 1 + 20];
			doubles[0] = doubleUse(((BigDecimal) map.get("该年应缴总额")).doubleValue());
			doubles[1] = doubleUse(((BigDecimal) map.get("每月费用")).doubleValue());
			doubles[1] = map.get("每月费用") == null ? 0 : doubleUse(((BigDecimal) map.get("每月费用")).doubleValue());
			doubles[2] = doubleUse(((Long) map.get("应收月份数")).doubleValue());
			doubles[3] = doubleUse(((BigDecimal) map.get("当年收缴率")).doubleValue());
			doubles[4] = doubleUse(((BigDecimal) map.get("折扣金额")).doubleValue());
			int inde = 0;
			for (int in : arr){
			if(in < currentYear && (in+"").equals(map.get("费用所属年份"))){
			if(in < currentYear && !(map.get("费用所属年份").equals("类型总计"))){
			inde++;
			doubles[in - startYear + 5] = doubleUse(((BigDecimal) map.get(i + "年实缴")).doubleValue());
			doubles[in - startYear + 5] = doubleUse(((BigDecimal) map.get(in + "年实缴")).doubleValue());
			}
			}
			doubles[inde + 5] =doubleUse(((BigDecimal) map.get("当年预算")).doubleValue());
			@@ -318,20 +365,16 @@
			reportFeeDtoLists.add(linkedList);
			}
			if (ind == 3){
			LinkedList linkedList = new LinkedList();
			FeeDto feeDto1 = new FeeDto();
			feeDto1.setCurYear("停车费合计（3+...+7）");
			feeDto1.setReport(colByCar);
			linkedList.add(feeDto1);
			reportFeeDtoLists.add(linkedList);
			// fee.setCurYear("停车费合计（3+...+7）");
			// fee.setReport(colByCar);
			// carFeeList.add(fee);
			reportFeeDtoLists.add(carFeeList);
			}
			if (ind == 8){
			LinkedList linkedList = new LinkedList();
			FeeDto feeDto1 = new FeeDto();
			feeDto1.setCurYear("其他类合计（8+...+22）");
			feeDto1.setReport(colByOther);
			linkedList.add(feeDto1);
			reportFeeDtoLists.add(linkedList);
			// fee2.setCurYear("其他类合计（8+...+22）");
			// fee2.setReport(colByOther);
			// otherFeeList.add(fee2);
			reportFeeDtoLists.add(otherFeeList);
			}
			ind ++;
			}