pipIrr-SV.git - Gitblit

			@@ -5,9 +5,7 @@
			import com.dy.pipIrrGlobal.daoSt.StIntakeAmountYearMapper;
			import com.dy.pipIrrGlobal.pojoSt.StIntakeAmountMonth;
			import com.dy.pipIrrGlobal.pojoSt.StIntakeAmountYear;
			import com.dy.pipIrrGlobal.pojoSt.StLossYear;
			import com.dy.pipIrrGlobal.voSt.VoIntakeAmountStatistics;
			import com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;
			import org.springframework.transaction.annotation.Transactional;
			@@ -39,7 +37,12 @@
			List<VoIntakeAmountStatistics> list = rmIntakeAmountDayDao.statisticsByIntake(statisticsStartId, statisticsEndId) ;
			if(list != null && list.size() > 0){
			for(VoIntakeAmountStatistics vo : list){
			StIntakeAmountMonth po = this.stIntakeAmountMonthDao.selectByIntakeIdAndYearAndMonth(vo.intakeId, statisticsYear, statisticsMonth) ;
			List<StIntakeAmountMonth> listOfMonth = this.stIntakeAmountMonthDao.selectByIntakeIdAndYearAndMonth(vo.intakeId, statisticsYear, statisticsMonth) ;
			StIntakeAmountMonth po = null ;
			if(listOfMonth != null && listOfMonth.size() > 0) {
			//程序逻辑控制上，集合中只有一个对象
			po = listOfMonth.get(0);
			}
			if(po == null){
			po = new StIntakeAmountMonth() ;
			}
			@@ -64,7 +67,12 @@
			List<VoIntakeAmountStatistics> list = stIntakeAmountMonthDao.statisticsByIntake(statisticsYear) ;
			if(list != null && list.size() > 0){
			for(VoIntakeAmountStatistics vo : list){
			StIntakeAmountYear po = stIntakeAmountYearDao.selectByIntakeIdAndYear(vo.intakeId, statisticsYear) ;
			List<StIntakeAmountYear> listOfYear = stIntakeAmountYearDao.selectByIntakeIdAndYear(vo.intakeId, statisticsYear) ;
			StIntakeAmountYear po = null ;
			if(listOfYear != null && listOfYear.size() > 0) {
			//程序逻辑控制上，集合中只有一个对象
			po = listOfYear.get(0);
			}
			if(po == null){
			po = new StIntakeAmountYear() ;
			}