杰生

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -80,19 +80,21 @@
     </select>
 
     <select id="remainingTodayPage" resultType="java.util.LinkedHashMap">
-        SELECT m.ID                                                                               materialId,
-               mc.Name                                                                            categoryName,
-               m.Name                                                                             materialName,
-               m.Code                                                                             materialCode,
-               m.Width                                                                            materialWidth,
-               sum(sd.Quantity)                                                                   sum,
-               count(sd.Quantity)                                                                 count,
-               sum(IF(datediff(now(), sd.CreatedTime) > m.DelayPeriod, sd.Quantity, 0))           retentionQuantity,
-               m.SafetyStock                                                                      materialSafetyStock,
-               IF((a.CheckTagCount = a.TagQuantity) and (a.CheckTagCount = a.HandTagCount), 1, 0) inventoryResults,
-               a.CheckTagCount - a.TagQuantity                                                    correctionQuantity,
-               a.CheckTime                                                                        checkTime,
-               uu.RealName                                                                        OperUserName
+        SELECT m.ID                            materialId,
+               mc.Name                         categoryName,
+               m.Name                          materialName,
+               m.Code                          materialCode,
+               m.Width                         materialWidth,
+               sum(sd.Quantity)                sum,
+               count(sd.Quantity)              count,
+               sum(IF(datediff(now(), sd.CreatedTime) > m.DelayPeriod, sd.Quantity,
+                      0))                      retentionQuantity,
+               m.SafetyStock                   materialSafetyStock,
+               IF((a.CheckTagCount = a.TagQuantity) and (a.CheckTagCount = a.HandTagCount), 1,
+                  0)                           inventoryResults,
+               a.CheckTagCount - a.TagQuantity correctionQuantity,
+               a.CheckTime                     checkTime,
+               uu.RealName                     OperUserName
         FROM material m
                  INNER JOIN stock_detail sd ON sd.MaterialCode = m.Code
                  LEFT JOIN (

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -399,7 +399,9 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
                         this::remainingTodayMerge
                 ));
 
-        result.put("purposeStatistics", new ArrayList<>(purposeStatistics.values()));
+        result.put("purposeStatistics", purposeStatistics.values().stream()
+                .sorted((v1, v2) -> ((BigDecimal) v2.get("measureArea")).compareTo((BigDecimal) v1.get("measureArea")))
+                .collect(Collectors.toList()));
 
         return result;
     }
@@ -445,6 +447,8 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
             }
         }
 
+        wrapper.orderByAsc("m.Name");
+
         // 查询基本信息
         Page<Map<String, Object>> page = baseMapper.remainingTodayPage(createPage(condition), wrapper);