From 4caf35c0152a2ac3f4d416384e9d8a2b19818363 Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期二, 05 十二月 2023 08:57:58 +0800
Subject: [PATCH] 添加接单超时标识和结单超时标识在iot_device_Order表里面，在对应的类中添加，完成安装单/维修单完成后用户对此单进行打分和评价20231204wmz
---
wumei-smart-master/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/wumei-smart-master/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index a2b7c25..51ccf99 100644
--- a/wumei-smart-master/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/wumei-smart-master/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -75,15 +75,34 @@
}
}
+ public static String timeXJ(String timeOne, String timeTwo) {
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String timeMS = null;
+ try {
+ Date d1 = df.parse(timeOne);
+ Date d2 = df.parse(timeTwo);
+ long diff = d1.getTime() - d2.getTime();//杩欐牱寰楀埌鐨勫樊鍊兼槸姣绾у埆
+ timeMS = String.valueOf(diff / 1000);
+ System.out.println(timeMS);
+ long days = diff / (1000 * 60 * 60 * 24);
+
+ long hours = (diff - days * (1000 * 60 * 60 * 24)) / (1000 * 60 * 60);
+ long minutes = (diff - days * (1000 * 60 * 60 * 24) - hours * (1000 * 60 * 60)) / (1000 * 60);
+ System.out.println("" + days + "澶�" + hours + "灏忔椂" + minutes + "鍒�");
+ } catch (Exception e) {
+ }
+ return timeMS;
+ }
/**
* 鏍规嵁鏃ユ湡鑾峰彇鏍煎紡鍖栫殑鏃ユ湡瀛楃涓�
+ *
* @param date
* @param format
* @return
* @throws ParseException
*/
- public static final String format(Date date,String format) throws ParseException {
+ public static final String format(Date date, String format) throws ParseException {
DateFormat df = new SimpleDateFormat(format);
return df.format(date);
}
@@ -106,7 +125,7 @@
}
/**
- * 鏃ユ湡鍨嬪瓧绗︿覆杞寲涓烘棩鏈� 鏍煎紡
+ * 鏃ユ湡鍨嬪瓧绗︿覆杞寲涓烘棩鏈熸牸寮�
*/
public static Date parseDate(Object str) {
if (str == null) {
--
Gitblit v1.8.0