样品排序处理；

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

@@ -435,7 +435,18 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         if (null == dto){
             return false;
         }
-        EntrustSample sample =  dto.convert(EntrustSample.class);
+        // 添加后排序，不论是否成功添加标样
+        List<EntrustSample> sampleList = list(Condition.create().eq("entrust_id",dto.getEntrustId())
+                .orderBy("order_by",true).orderBy("ctime",false));
+        // 若为一个样品，则不进行排序处理
+        if(CollectionUtils.isNotEmpty(sampleList) && sampleList.size() > 1){
+            for(int i=0;i< sampleList.size();i++){
+                sampleList.get(i).setOrderBy(i);
+            }
+            updateBatchById(sampleList);
+        }
+
+        EntrustSample sample = dto.convert(EntrustSample.class);
         //标样
         sample.setType(1);
        if (save(sample)){
@@ -444,7 +455,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                for (EntrustSampleItem item : itemList) {
                    item.setEntrustSampleId(sample.getId());
                    item.setStatus(EntrustSampleItemStatusEnum.TEST);
-                   item.setStatus(EntrustSampleItemStatusEnum.TEST);
+                   item.setProgress(EntrustSampleItemStatusEnum.TEST);
+                   item.setTester(account.getUserName());
+                   item.setTesterId(account.getUserId());
                }
              entrustSampleItemService.saveBatch(itemList);
            }

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

@@ -207,13 +207,14 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
                 List<EntrustSample> saveSampleList = new ArrayList<>();
                 List<EntrustSampleItem> saveEntrustSampleItemList = new ArrayList<>();
-                for (EntrustSampleDTO sampleDTO : sampleDTOList) {
+                for (int x = 0; x < sampleDTOList.size(); x++) {
+                    EntrustSampleDTO sampleDTO = sampleDTOList.get(x);
                     EntrustSample sample = sampleDTO.convert(EntrustSample.class);
                     sample.setEntrustId(entrust.getId());
                     //生成样品编号
                     initSampleCode(sample);
                     sample.setId(IdWorker.getId());
-
+                    sample.setOrderBy(x);
                     saveSampleList.add(sample);
                     List<EntrustSampleItem> experiments = sampleDTO.getItemList();
                     if (CollectionUtils.isEmpty(experiments)) {
@@ -373,20 +374,18 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             List<EntrustSample> saveSampleList = new ArrayList<>();
 
             List<EntrustSampleItem> saveItemList = new ArrayList<>();
-            for (EntrustSampleDTO dto : sampleList) {
-
+            for (int x = 0; x < sampleList.size(); x++) {
+                EntrustSampleDTO dto = sampleList.get(x);
                 EntrustSample sample = dto.convert(EntrustSample.class);
-
+                sample.setOrderBy(x);
                 if (null != sample.getId()) {
                     updateSampleList.add(sample);
                     sampleIdsList.add(sample.getId());
                 } else {
                     sample.setEntrustId(entrust.getId());
-
                     initSampleCode(sample);
                     sample.setId(IdWorker.getId());
                     saveSampleList.add(sample);
-
                 }
 
                 List<EntrustSampleItem> viewItemList = dto.getItemList();

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

@@ -58,6 +58,7 @@
                 #{sampleId}
             </foreach>
         </if>
+        order by order_by asc,ctime desc
     </select>