From 4afeb19e445e8396ca2cf06d9972dd995e561497 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Sat, 4 Jul 2020 22:06:37 +0800
Subject: [PATCH] update

---
 .../lyms/platform/biz/service/SieveService.java    |  9 ++++-
 .../platform/operate/web/facade/SieveFacade.java   | 38 +++++++++++++++++++++-
 .../platform/operate/web/worker/SieveWorker2.java  |  2 +-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
index 16f3645..0973373 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
@@ -98,7 +98,14 @@ public class SieveService {
         }
         return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, "order").addOrder(Sort.Direction.DESC, "modified"));
     }
-
+    public List<SieveModel> queryListOrderFiled(SieveQuery sieveQuery, String filed) {
+        MongoQuery mongoQuery = sieveQuery.convertToQuery();
+        if (StringUtils.isNotEmpty(sieveQuery.getNeed())) {
+            sieveQuery.mysqlBuild((int) iSieveDao.count(sieveQuery.convertToQuery()));
+            mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit());
+        }
+        return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, "order").addOrder(Sort.Direction.DESC, filed));
+    }
     /**
      * 根据id删除数据
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index c0fa760..ff9e179 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -51,6 +51,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -733,7 +734,8 @@ public class SieveFacade {
         }
 
         //查询产筛list
-        List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
+//        List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
+        List<SieveModel> list = sieveService.queryListOrderFiled(sieveQuery, "applyTime");
         int batchSize = 4;
         int end = 0;
         List<Future> listFuture = new ArrayList<>();
@@ -751,8 +753,42 @@ public class SieveFacade {
                 ExceptionUtils.catchException(e, "cqSieve list  get result Future error.");
             }
         }
+        try {
+            ListSort(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo());
     }
+    private static void ListSort(List<SieveListResult2> list) {
+        Collections.sort(list, new Comparator<SieveListResult2>() {
+            @Override
+            public int compare(SieveListResult2 o1, SieveListResult2 o2) {
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                try {
+                    if(o1.getCollectionDate()!=null && o2.getCollectionDate()!=null){
+                        Date dt1 = format.parse(o1.getCollectionDate());//排序字段
+                        Date dt2 = format.parse(o2.getCollectionDate());
+//                    Date dt1 = o1.getCheckTime();//排序字段
+//                    Date dt2 = o2.getCheckTime();
+//                    Date dt1 = o1.getCreated();//排序字段
+//                    Date dt2 = o2.getCreated();
+                        if (dt1.getTime() > dt2.getTime()) {
+                            return 1;
+                        } else if (dt1.getTime() < dt2.getTime()) {
+                            return -1;
+                        } else {
+                            return 0;
+                        }
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return 0;
+            }
+        });
+    }
 
     public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
         try {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java
index 6773b18..307c25c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java
@@ -174,7 +174,7 @@ public class SieveWorker2 implements Callable<List<SieveListResult2>> {
                 //版本号
                 sieveListResult.setNumber(sieveApplyOrderModel.getNumber());
                 //采血日期
-                sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd(sieveApplyOrderModel.getCollectionDate()));
+                sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd_hms(sieveApplyOrderModel.getCollectionDate()));
                 collectionDate = sieveApplyOrderModel.getCollectionDate();
                 //B超信息
                 //血清
-- 
1.8.3.1