Commit a49f445e by 高晓磊

趋势图多出一条记录的问题

parent 6574cc77
...@@ -362,7 +362,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju ...@@ -362,7 +362,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
*/ */
private List<UUID> getToStartStation(Date date){ private List<UUID> getToStartStation(Date date){
DetachedCriteria detachedCriteria = getDetachedCriteria(date); DetachedCriteria detachedCriteria = getDetachedCriteria(date);
detachedCriteria.setProjection(Projections.projectionList().add(Projections.property("id"))); detachedCriteria.setProjection(Projections.projectionList().add(Projections.property("station.id")));
return (List<UUID>)template.findByCriteria(detachedCriteria); return (List<UUID>)template.findByCriteria(detachedCriteria);
} }
...@@ -428,7 +428,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju ...@@ -428,7 +428,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
priceAdjustment.setValue(Double.valueOf(value.toString())); priceAdjustment.setValue(Double.valueOf(value.toString()));
priceAdjustmentList.add(priceAdjustment); priceAdjustmentList.add(priceAdjustment);
ArrayList<TimeValue> newTimeValue = setEveryDayValue(adjustmentStartDate, forDate, forValue, dinasTypeId, stationId, adjustmentId, (Date) o, (BigDecimal) value); ArrayList<TimeValue> newTimeValue = setEveryDayValue(adjustmentStartDate, forDate, forValue, dinasTypeId, stationId, adjustmentId, o1, (BigDecimal) value);
if (newTimeValue != null) { if (newTimeValue != null) {
priceAdjustmentList.addAll(priceAdjustmentList.size()-1,newTimeValue); priceAdjustmentList.addAll(priceAdjustmentList.size()-1,newTimeValue);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment