From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
index 34140f8..331b46d 100755
--- a/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
@@ -30,6 +30,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -290,7 +291,16 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void updateShellRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
+ //鑾峰彇鎴垮眿鐘舵��
+ String state = paramInJson.getString("state");
+ if (!StringUtil.isEmpty(paramInJson.getString("startTime")) && !StringUtil.isEmpty(state) && state.equals("2006")) {
+ String startTime = paramInJson.getString("startTime");
+ paramInJson.put("startTime", startTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(paramInJson.getString("endTime")) && !StringUtil.isEmpty(state) && state.equals("2006")) {
+ String endTime = paramInJson.getString("endTime");
+ paramInJson.put("endTime", endTime + " 23:59:59");
+ }
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(paramInJson);
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
--
Gitblit v1.8.0