删除采砂许可的排序字段,接驳管理按照创建时间降序.

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/DischargingDaoImpl.java

@@ -41,6 +41,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
     @Override
     public Page<KObject> listDischargingInfoPaging(Page<KObject> page, UUID transportShipId, Integer type, Date startDate, Date endDate, Integer sandMiningAreaType, List<UUID> stationIds, UUID sandMiningAreaId, UUID shipId, UUID parentId) {
         DetachedCriteria detachedCriteria = getDetachedCriteria(type, transportShipId, startDate, endDate, sandMiningAreaType, stationIds, sandMiningAreaId, shipId, parentId);
+        detachedCriteria.addOrder(Order.desc("createTime"));
         int offset = page.getPageSize() * (page.getPageNo() - 1);
         page.setTotal(template.findByCriteria(detachedCriteria).size());
         List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/SandMiningDaoImpl.java

@@ -49,7 +49,7 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
         if(null!=currentLoginRegionalCompany){
             detachedCriteria.add(Restrictions.eq("regionalCompany.id",currentLoginRegionalCompany.getUuid("id")));
         }
-        detachedCriteria.addOrder(Order.desc("sortOrder"));
+        detachedCriteria.addOrder(Order.desc("createTime"));
         int offset = page.getPageSize() * (page.getPageNo() - 1);
         page.setTotal(template.findByCriteria(detachedCriteria).size());
         List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria,offset,page.getPageSize());

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMining.jmx

@@ -257,16 +257,6 @@
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>
-				<m:attribute>
-					<m:annotations>
-					</m:annotations>
-					<m:id>e4ef9412-c841-44d5-ade5-180af98d4f00</m:id>
-					<m:name>sortOrder</m:name>
-					<m:title>排序</m:title>
-					<m:type>int</m:type>
-					<m:description></m:description>
-					<m:default></m:default>
-				</m:attribute>
 			</m:attributes>
 		</m:class>
 	</content>

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/query/SandMining.jmx

@@ -314,16 +314,6 @@
 					</m:ref>
 					<m:desc></m:desc>
 				</m:field>
-				<m:field>
-					<m:name>sortOrder</m:name>
-					<m:title>排序</m:title>
-					<m:type>string</m:type>
-					<m:ref>
-						<m:name></m:name>
-						<m:type></m:type>
-					</m:ref>
-					<m:desc></m:desc>
-				</m:field>
 			</m:fields>
 		</m:query>
 	</content>

backend/xyst.dinas.production/src/main/resources/config/SandMining.hbm.xml

@@ -135,11 +135,6 @@
                 <comment>采砂功率</comment>
             </column>
         </property>
-        <property name="sortOrder" type="int" not-null="true"  unique="true" update="false" insert="false" index="sand_mining_index" >
-            <column name="sort_order" length="5">
-                <comment >排序</comment>
-            </column>
-        </property>
     </class>
 
     <class entity-name="com.xyst.dinas.production.datamodel.SandMining$SandMiningStationDetail" table="xyst_dinas_production_sand_mining_station_detail">