根据场站id获取砂石类型的接口修改为从单独的子表获取

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java

@@ -91,15 +91,19 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
 //        detachedCriteria.add(Restrictions.eq("del", false));
 //        detachedCriteria.add(Restrictions.eq("station.id", stationId));
 
-        KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
+        KClass bean = Amino.getStaticMetadataContext().getBean(STATION_DINAS_TYPE_DETAIL_ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         addRegionalCompanyFilter(detachedCriteria);
         detachedCriteria.add(Restrictions.eq("del", false));
-        detachedCriteria.createAlias("stations","station");
-        detachedCriteria.add(Restrictions.eq("station.station.id", stationId));
+        detachedCriteria.createAlias("station","station");
+        detachedCriteria.add(Restrictions.eq("station.id", stationId));
         detachedCriteria.add(Restrictions.eq("station.del", false));
-        detachedCriteria.addOrder(Order.desc("sortOrder"));
-        return (List<KObject>) template.findByCriteria(detachedCriteria);
+        List<KObject> byCriteria = (List<KObject>) template.findByCriteria(detachedCriteria);
+        ArrayList<KObject> dinasTypes = new ArrayList<>();
+        for (KObject byCriterion : byCriteria) {
+            dinasTypes.add(byCriterion.get("dinasType"));
+        }
+        return dinasTypes;
     }
 
     @Override

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station$DinasTypeDetail.jmx

@@ -26,9 +26,6 @@
 				</m:attribute>
 				<m:attribute>
 					<m:annotations>
-						<m:annotation>
-							<m:type>bcp.type.json.JsonIgnore</m:type>
-						</m:annotation>
 					</m:annotations>
 					<m:id>61699557-6afc-43c2-adeb-fecfeb844536</m:id>
 					<m:name>dinasType</m:name>