Merge remote-tracking branch 'origin/dev_海西州_惠牧' into dev_海西州_惠牧

云

11 小时以前 a3a58429a92b8f729bc1f88391d27042255b377f

Merge remote-tracking branch 'origin/dev_海西州_惠牧' into dev_海西州_惠牧

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanMapper.java

@@ -22,6 +22,7 @@
                .eqIfPresent(MesDvCheckPlanDO::getType, reqVO.getType())
                .eqIfPresent(MesDvCheckPlanDO::getStatus, reqVO.getStatus())
                .betweenIfPresent(MesDvCheckPlanDO::getCreateTime, reqVO.getCreateTime())
                .orderByDesc(MesDvCheckPlanDO::getCreateTime)
                .orderByDesc(MesDvCheckPlanDO::getId));
    }


 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkrecord/MesDvCheckRecordMapper.java

@@ -22,6 +22,7 @@
                .eqIfPresent(MesDvCheckRecordDO::getUserId, reqVO.getUserId())
                .eqIfPresent(MesDvCheckRecordDO::getStatus, reqVO.getStatus())
                .betweenIfPresent(MesDvCheckRecordDO::getCheckTime, reqVO.getCheckTime())
                .orderByDesc(MesDvCheckRecordDO::getCreateTime)
                .orderByDesc(MesDvCheckRecordDO::getId));
    }


 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/maintenrecord/MesDvMaintenRecordMapper.java

@@ -21,6 +21,7 @@
                .eqIfPresent(MesDvMaintenRecordDO::getMachineryId, reqVO.getMachineryId())
                .eqIfPresent(MesDvMaintenRecordDO::getUserId, reqVO.getUserId())
                .betweenIfPresent(MesDvMaintenRecordDO::getMaintenTime, reqVO.getMaintenTime())
                .orderByDesc(MesDvMaintenRecordDO::getCreateTime)
                .orderByDesc(MesDvMaintenRecordDO::getId));
    }