yuanchao před 1 měsícem
rodič
revize
9cd14a1d9a

+ 3 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillOrderMapper.java

@@ -47,6 +47,8 @@ public interface IotOpeationFillOrderMapper extends BaseMapperX<IotOpeationFillO
                 .likeIfPresent(IotOpeationFillOrderDO::getUserName, reqVO.getUserName())
                 .eqIfPresent(IotOpeationFillOrderDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(IotOpeationFillOrderDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(IotOpeationFillOrderDO::getId));
+                .orderByDesc(IotOpeationFillOrderDO::getCreateTime)
+                .orderByAsc(IotOpeationFillOrderDO::getDeptId));
+
     }
 }

+ 4 - 4
yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -441,10 +441,10 @@
         SELECT
         dept_id,
         name,
-        total_count,
-        filled_count,
-        unfilled_count,
-        filling_count
+        COALESCE(total_count, 0) AS total_count,
+        COALESCE(filled_count, 0) AS filled_count,
+        COALESCE(unfilled_count, 0) AS unfilled_count,
+        COALESCE(filling_count, 0) AS filling_count
         FROM (
         -- 第一行:汇总数据
         SELECT