Переглянути джерело

Merge remote-tracking branch 'origin/master'

wangxuan 9 місяців тому
батько
коміт
cb9e689a79

+ 2 - 1
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -434,7 +434,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         List<ZhcxProjectRectifyDo> rectifyDos = projectRectifyService.list(
                 Wrappers.<ZhcxProjectRectifyDo>lambdaQuery()
                         .eq(ZhcxProjectRectifyDo::getBatchid, batchId)
-                        .eq(ZhcxProjectRectifyDo::getDeleted, "0"));
+                        .eq(ZhcxProjectRectifyDo::getDeleted, "0")
+                        .orderByAsc(ZhcxProjectRectifyDo::getSeqsort));
         List<ZhcxProjectRectifyMachineVo> listData = zhcxProjectManageDao.getRectifyListData(map);
         ZhcxProjectManageRectifyBatchDo rectifyBatchDo =  projectManageRectifyBatchService.getById(batchId);
         String machineno = rectifyBatchDo.getMachineno();