今日砂价筛选条件别名少了一个master

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java

@@ -117,8 +117,8 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
 
         KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.DETAIL_ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
-        detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
         detachedCriteria.createAlias("master", "master");
+        detachedCriteria.add(Restrictions.eq("master."+BaseConstants.DEL, false));
         detachedCriteria.add(Restrictions.in("master.applyStatus", BizProcessState.DONE_WITH_AGREE.getValue()));
         detachedCriteria.add(Restrictions.in("master.adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.PROCESSING.getValue()));
         detachedCriteria.add(Restrictions.in("dinasType.id", dinasTypeIds));
@@ -191,8 +191,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
         detachedCriteria.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
         List<HashMap<String, Object>> byCriteria = (List<HashMap<String, Object>>) template.findByCriteria(detachedCriteria);
 
-        List<PriceAdjustmentEchartReturnEntity> priceAdjustmentEchartReturnEntities = getPriceAdjustmentEchartReturnEntities(byCriteria, priceAdjustmentEchartSearchEntity.getAdjustmentStartDate(), priceAdjustmentEchartSearchEntity.getAdjustmentEndDate());
-        return priceAdjustmentEchartReturnEntities;
+        return getPriceAdjustmentEchartReturnEntities(byCriteria, priceAdjustmentEchartSearchEntity.getAdjustmentStartDate(), priceAdjustmentEchartSearchEntity.getAdjustmentEndDate());
     }
 
     @Override
@@ -203,16 +202,22 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
     @Override
     public void updateToEnd(Date date) {
         //先查询出当前即将生效的记录.获取到砂石类型与之前没有结束的砂石类型比较. 如果有相同的砂石类型,则将非该记录下的砂石类型结束
+        //获取master审批通过的&&生效结束时间为空的&&生效日为今天之前的砂石价格记录
         Date endDateTimeOfDay = DateTimeUtils.getEndDateTimeOfDay(date);
         Date startDateTimeOfDay = DateTimeUtils.getStartDateTimeOfDay(date);
+        KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.DETAIL_ENTITY, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+
+        detachedCriteria.add(Restrictions.eq("master." + BaseConstants.DEL, false))
+                .add(Restrictions.in("master.applyStatus", BizProcessState.DONE_WITH_AGREE.getValue()))
+                .createAlias("master", "master")
+                .createAlias("master.station", "station")
+                .createAlias("master.regionalCompany", "regionalCompany")
+                .createAlias("dinasType", "dinasType");
 
 
     }
 
-    private List<UUID> getLastPriceByDateAndStatus(Date date) {
-        //获取
-        return null;
-    }
 
     private List<UUID> getNoOverPrice(Date date) {