From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug； 2. 新建子任务时默认执行人员从全体人员改为当前用户； 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内，确保子任务执行时间不会超出总任务范围。
---
app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 b23500b..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,19 +5,22 @@
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.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
/**
* Created by linli on 2018/1/25.
*/
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