添加orderBy字段排序

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -510,6 +510,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         if (CollectionUtils.isEmpty(voList)) {
             return null;
         }
+        voList = voList.stream().sorted(Comparator.comparing(item -> item.getOrderBy())).collect(Collectors.toList());
         Entrust entrust = entrustService.getById(voList.get(0).getEntrustId());
         InputStream io = ossClient.download(template.getObjectKey());
         if (null == io) {
@@ -542,7 +543,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
             for (EntrustSampleItemVO itemVO : voList) {
                 sampleIdsList.add(itemVO.getEntrustSampleId());
             }
-            List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().in("id", sampleIdsList));
+            List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().in("id", sampleIdsList).orderBy("order_by",true));
             if (CollectionUtils.isNotEmpty(sampleList)) {
                 mapReplace.put("#{sampleFrom}", sampleList.get(0).getSampleFrom());
                 mapReplace.put("#{sampleName}", sampleList.get(0).getName());

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -249,7 +249,7 @@
     <select id="selectVOListByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
         SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS
         "sampleCode",s.name AS "sampleName",
-
+        s.order_by,
         s.sample_shape ,s.sample_quantity, s.standard, s.sample_from,s.product_code,s.name_code
         FROM
         entrust_sample_item i