1、作物蒸腾量定时计算任务修改逻辑，以保证数据源准确性；2、修改null值bug。

liurunyu

2025-08-27 e5025d27ea3bbaad002227c7f4b2871f0d9e12df

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAlarmStateLast.java

@@ -220,10 +220,10 @@
        this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt) ;
        this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
        if(alarmVo != null){
            this.alarmBatteryVolt = alarmVo.batteryVolt ;
            this.alarmLoss = alarmVo.loss ;
            this.alarmWaterMeterBreak = alarmVo.meter ;
            this.alarmValve = alarmVo.valve ;
            this.alarmWaterMeterFault = alarmVo==null?null:alarmVo.meter; // 流量计故障(1：报警，0：正常)
            this.alarmLoss = alarmVo==null?null:alarmVo.loss; // 漏损(偷水)报警(1：报警， 0：正常)
            this.alarmBatteryVolt = alarmVo==null?null:alarmVo.batteryVolt; //电池电压(1：报警，0：正常)
            this.alarmValve = alarmVo==null?null:alarmVo.valve; //阀门报警(1：报警，0：正常)
        }/*else{
            this.alarmBatteryVolt = null ;
            this.alarmLoss = null ;
@@ -249,10 +249,10 @@
        this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt) ;
        this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(rtuDt) ;
        if(alarmVo != null){
            this.alarmBatteryVolt = alarmVo.batteryVolt ;
            this.alarmLoss = alarmVo.loss ;
            this.alarmWaterMeterBreak = alarmVo.meter ;
            this.alarmValve = alarmVo.valve ;
            this.alarmWaterMeterFault = alarmVo==null?null:alarmVo.meter; // 流量计故障(1：报警，0：正常)
            this.alarmLoss = alarmVo==null?null:alarmVo.loss; // 漏损(偷水)报警(1：报警， 0：正常)
            this.alarmBatteryVolt = alarmVo==null?null:alarmVo.batteryVolt; //电池电压(1：报警，0：正常)
            this.alarmValve = alarmVo==null?null:alarmVo.valve; //阀门报警(1：报警，0：正常)
        }/*else{
            this.alarmBatteryVolt = null ;
            this.alarmLoss = null ;