pipIrr-SV.git - Gitblit

			@@ -5,7 +5,9 @@
			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;
			@@ -37,12 +39,19 @@
			List<VoIntakeAmountStatistics> list = rmIntakeAmountDayDao.statisticsByIntake(statisticsStartId, statisticsEndId) ;
			if(list != null && list.size() > 0){
			for(VoIntakeAmountStatistics vo : list){
			StIntakeAmountMonth po = new StIntakeAmountMonth() ;
			StIntakeAmountMonth po = this.stIntakeAmountMonthDao.selectByIntakeIdAndYearAndMonth(vo.intakeId, statisticsYear, statisticsMonth) ;
			if(po == null){
			po = new StIntakeAmountMonth() ;
			}
			po.intakeId = vo.intakeId ;
			po.year = statisticsYear ;
			po.month = statisticsMonth ;
			po.amount = vo.amount;
			stIntakeAmountMonthDao.insert(po) ;
			if(po.id == null) {
			stIntakeAmountMonthDao.insert(po);
			}else{
			stIntakeAmountMonthDao.updateByPrimaryKey(po) ;
			}
			}
			}
			}
			@@ -55,12 +64,20 @@
			List<VoIntakeAmountStatistics> list = stIntakeAmountMonthDao.statisticsByIntake(statisticsYear) ;
			if(list != null && list.size() > 0){
			for(VoIntakeAmountStatistics vo : list){
			StIntakeAmountYear po = new StIntakeAmountYear() ;
			StIntakeAmountYear po = stIntakeAmountYearDao.selectByIntakeIdAndYear(vo.intakeId, statisticsYear) ;
			if(po == null){
			po = new StIntakeAmountYear() ;
			}
			po.intakeId = vo.intakeId ;
			po.year = statisticsYear ;
			po.amount = vo.amount;
			stIntakeAmountYearDao.insert(po) ;
			if(po.id == null){
			stIntakeAmountYearDao.insert(po) ;
			}else{
			stIntakeAmountYearDao.updateByPrimaryKey(po) ;
			}
			}
			}
			}

			}