Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
杨海航
2025-04-01 10:24:06 +08:00
parent f5c7f04bff
commit c26bd5ad30
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -3438,7 +3438,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
.or() .or()
.like("c.case_name", keywords)) .like("c.case_name", keywords))
.eq("status", status) .eq("status", status)
.orderByDesc("accept_no") .orderByDesc("CAST(SUBSTRING_INDEX(accept_no, '-', 1) AS UNSIGNED)", // 按年份降序
"CAST(SUBSTRING_INDEX(accept_no, '-', -1) AS UNSIGNED)") // 按流水号降序
); );
List<EntrustmentVO> records = voPage.getRecords(); List<EntrustmentVO> records = voPage.getRecords();
@@ -3447,12 +3448,13 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService
.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery() .list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
.eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustmentVO.getId()) .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustmentVO.getId())
.orderByAsc(EntrustmentIdentificationMaterial::getAcceptNo)); .orderByDesc(EntrustmentIdentificationMaterial::getAcceptNo)); // 确保材料也按正确顺序排列
entrustmentVO.setMaterialList(materialList); entrustmentVO.setMaterialList(materialList);
} }
return voPage; return voPage;
} }
/** /**
* 判断是否已经生成好了检材照片，如果生成了，返回给前端true 如果没有就返回false * 判断是否已经生成好了检材照片，如果生成了，返回给前端true 如果没有就返回false
* *