From a7dbc191f485dfe89c798c61a87e6e43274e60a8 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 27 十二月 2024 16:50:59 +0800 Subject: [PATCH] 1、移动文件位置;2、删除两个无用文档。 --- pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java index a3c517f..a63881b 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java @@ -37,12 +37,24 @@ List<VoIntakeLossStatistics> list = rmLossDayDao.statisticsByIntake(statisticsStartId, statisticsEndId) ; if(list != null && list.size() > 0){ for(VoIntakeLossStatistics vo : list){ - StLossMonth po = new StLossMonth() ; + List<StLossMonth> listOfMonth = this.stLossMonthDao.selectByIntakeIdAndYearAndMonth(vo.intakeId, statisticsYear, statisticsMonth) ; + StLossMonth po = null ; + if (listOfMonth != null && listOfMonth.size() > 0){ + //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞� + po = listOfMonth.get(0) ; + } + if(po == null){ + po = new StLossMonth() ; + } po.intakeId = vo.intakeId ; po.year = statisticsYear ; po.month = statisticsMonth ; po.amount = vo.amount; - stLossMonthDao.insert(po) ; + if(po.id == null) { + stLossMonthDao.insert(po); + }else{ + stLossMonthDao.updateByPrimaryKey(po) ; + } } } } @@ -55,11 +67,23 @@ List<VoIntakeLossStatistics> list = stLossMonthDao.statisticsByIntake(statisticsYear) ; if(list != null && list.size() > 0){ for(VoIntakeLossStatistics vo : list){ - StLossYear po = new StLossYear() ; + List<StLossYear> listOfYear = this.stLossYearDao.selectByIntakeIdAndYear(vo.intakeId, statisticsYear) ; + StLossYear po = null ; + if(listOfYear != null && listOfYear.size() > 0){ + //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞� + po = listOfYear.get(0) ; + } + if(po == null) { + po = new StLossYear(); + } po.intakeId = vo.intakeId ; po.year = statisticsYear ; po.amount = vo.amount; - stLossYearDao.insert(po) ; + if(po.id == null) { + stLossYearDao.insert(po); + }else{ + stLossYearDao.updateByPrimaryKey(po) ; + } } } } -- Gitblit v1.8.0