liurunyu
2024-12-14 1ac814a8d8491e432697f58daf91b73404c93b12
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
@@ -49,11 +49,19 @@
                        }else{
                            if(ad.amount != null && ad.amount > IntakeAmountDayFlag){
                                if(ad.totalAmountLast != null && lastAd.totalAmountLast != null){
                                    //重新计算日取水量
                                    ad.amount = ad.totalAmountLast - lastAd.totalAmountLast;
                                    if(ad.amount < 0){//存这种情况
                                    if(ad.amount < 0){//计算日取水量后,可能会有这种情况发生(负值)
                                        log.info("出现调整后的日取水量出现负值" + ad.amount
                                                + "情况,数据id=" + ad.id
                                                + ",取水口id=" + ad.intakeId
                                                + ",日期=" + ad.dt
                                                + ",设置水量=0.0"
                                        );
                                        ad.amount = 0.0 ;
                                    }
                                    if(ad.amount > IntakeAmountDayFlag){
                                        //计算日取水量后,仍大于IntakeAmountDayFlag
                                        log.info("出现调整后的日取水量仍大于"
                                                + IntakeAmountDayFlag
                                                + "的情况,数据id=" + ad.id
@@ -100,6 +108,7 @@
                                this.doUpdateOneIntakeAmountDay(ad.id, 0.0);
                            }
                        }
                        lastAd = ad ;
                    }
                }
            }