Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

5 天以前 44eb64bef08ce231ac95d5ee482b046014dc8afa

 pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/ModelCalculator.java

@@ -44,7 +44,7 @@
                            this.executeOnCrop(crop, voWeather);
                        }
                    }catch (Exception e){
                        log.error("计算作物（id=" + crop.id + "）蒸腾数据时异常", e);
                        log.error("计算作物（id=" + crop.id + "）蒸散数据时异常", e);
                    }
                }
            }
@@ -60,7 +60,7 @@
            if(tmps != null && tmps.size() > 0){
                VoWeatherMaxMinTmp voMmTmp = tmps.get(0);//只能有一条记录
                if(voMmTmp != null && voMmTmp.maxAirTemperature != null && voMmTmp.minAirTemperature != null){
                    Double et0 = this.calculateEt0(yesterday_ymd, vo, voWeather, voMmTmp, factor) ;//计算蒸腾数据
                    Double et0 = this.calculateEt0(yesterday_ymd, vo, voWeather, voMmTmp, factor) ;//计算蒸散数据
                    this.saveEt0(yesterday_ymd, vo, voWeather, voMmTmp, factor, et0) ;
                }
            }