Lianxun_Java.git

			@@ -6,13 +6,12 @@
			import com.java110.core.context.ICmdDataFlowContext;
			import com.java110.core.event.cmd.Cmd;
			import com.java110.core.event.cmd.CmdEvent;
			import com.java110.dto.RoomDto;
			import com.java110.dto.room.RoomDto;
			import com.java110.dto.report.QueryStatisticsDto;
			import com.java110.report.statistics.IBaseDataStatistics;
			import com.java110.report.statistics.IFeeStatistics;
			import com.java110.utils.exception.CmdException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.BeanConvertUtil;
			import com.java110.utils.util.StringUtil;
			import com.java110.vo.ResultVo;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -22,6 +21,7 @@
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			@@ -165,13 +165,17 @@
			}

			List<Map> tmpInfos = null;
			Map dInfo = null;
			for (Map nInfo : newInfos) {
			for (Map info : infos) {
			if (!nInfo.get("payerObjId").equals(info.get("payerObjId"))) {
			continue;
			}
			tmpInfos = getTmpInfos(nInfo, info);
			tmpInfos.add(BeanConvertUtil.beanCovertMap(info));
			//todo 深拷贝
			dInfo = new HashMap();
			dInfo.putAll(info);
			tmpInfos.add(dInfo);
			//计算单项欠费金额
			computeOweAmount(tmpInfos, info.get("feeTypeCd").toString(), nInfo);
			nInfo.put(info.get("feeTypeCd").toString(), tmpInfos);