修改紧急订单按优先级排序 同时只查询80一下的订单

dao/om/implments/SerialOrder.dao.impl.go

@@ -440,15 +440,14 @@ func (impl *SerialOrderDAOImplement) SelectOrderByResource(resourceId string, st
 	session := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.SerialOrderStatus.TableName, condition).Where(where, parameters...)
 	// 紧急工单页查询
 	if urgency {
-		where += fmt.Sprintf(" and %s > ? ", meta.SerialOrder_Priority.ColumnName)
-		parameters = append(parameters, 0)
-		session = session.Where(fmt.Sprintf("%s > ? ", meta.SerialOrder_Priority.ColumnName), 0)
+		where += fmt.Sprintf(" and %s > ? and %s < ? ", meta.SerialOrder_Priority.ColumnName, meta.SerialOrderStatus_Status.ColumnName)
+		parameters = append(parameters, 0, common.WO_STATUS_FINISHED)
+		session = session.Where(fmt.Sprintf("%s > ? and %s < ?", meta.SerialOrder_Priority.ColumnName, meta.SerialOrderStatus_Status.ColumnName), 0, common.WO_STATUS_FINISHED)
 		count, err := session.Count(impl.meta.Indicator)
 		if err != nil {
 			return grmi.EmptyPagingResult, err
 		}
-		orderBy := " order by " + meta.SerialOrder_PlantNr.ColumnName + ", " + meta.SerialOrder_Priority.ColumnName
-
+		orderBy := " order by " + meta.SerialOrder_PlantNr.ColumnName + ", " + meta.SerialOrder_Priority.ColumnName + " desc "
 		data := make([]model.VOmSerialorder, 0, 10)
 		parameters = append(parameters, (pageNumber-1)*pageSize, pageSize)
 		err = impl.session.Table(impl.meta.TableName).SQL(fmt.Sprintf(" select %s.*, %s.* from "+impl.meta.TableName+joinStr + " where " + where+orderBy+" offset ? row fetch next ? row only",