From e102578ebfc95c27aeb13dce13fb82af53a2bead Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 25 二月 2021 17:07:23 +0800
Subject: [PATCH] 1. 新增夜间施工查询界面 2. 新增夜间施工管理统计界面

---
 app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java b/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java
index 2f318e7..143fec5 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java
@@ -5,10 +5,12 @@
 import com.ping.greendao.gen.DaoSession;
 import com.ping.greendao.gen.DomainitemDao;
 
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 
 import cn.flightfeather.thirdapp.R;
 import cn.flightfeather.thirdapp.bean.entity.Domainitem;
@@ -18,6 +20,7 @@
  */
 
 public class CommonUtils {
+
     public static List<Domainitem> getDomainItemByCalalogGuid(DaoSession daoSession, String guid) {
         return daoSession.getDomainitemDao().queryBuilder()
                 .where(DomainitemDao.Properties.Dcguid.eq(guid))
@@ -210,6 +213,26 @@
         cal.setTime(getCurrentYearEndTime());
         cal.add(Calendar.YEAR, -1);
         return cal.getTime();
+    }
+
+    /**
+     * 鑾峰彇鏃堕棿娈垫枃鏈�
+     */
+    public static String getStartEndDate(Date startDate, Date endDate) {
+        SimpleDateFormat format1 = new SimpleDateFormat("yyyy.MM.dd", Locale.CHINESE);
+        String s = format1.format(startDate);
+        String e = format1.format(endDate);
+        String str = "";
+        try {
+            if (s.substring(0, 4).equals(e.substring(0, 4))) {
+                str = s + "-" + e.substring(5);
+            } else {
+                str = s + "-" + e;
+            }
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+        return str;
     }
 
     /**
@@ -457,4 +480,5 @@
     public static byte intToByte(int x) {
         return (byte) x;
     }
+
 }

--
Gitblit v1.9.3