From e26f658b93744eccd024c42bdf4e2ebbcdbd65e5 Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Mon, 1 Apr 2024 17:02:37 +0800
Subject: [PATCH] =?UTF-8?q?#E10-17#=20=E8=81=8A=E5=A4=A9=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=92=8C=E7=BE=A4=E9=87=8C=E6=95=B0=E9=87=8F=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jcldoor/controller/HrmSelfHelpController.java     |  8 ++------
 .../seconddev/jcldoor/util/JucailinPortalUtils.java   | 11 +++++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
index 9a35bec..efe7d9b 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
@@ -98,12 +98,7 @@ public class HrmSelfHelpController {
             Calendar cal = Calendar.getInstance();
             int year = cal.get(Calendar.YEAR);
             String startDate = "2018-01-01";
-
-            //设置当前时间
-            cal.setTime(new Date());
-            //同理增加一天的方法：
-            cal.add(Calendar.DATE, 1);
-            String endDate = format.format(cal.getTime());
+            String endDate = "2024-03-29";
 
             log.error("startDate:"+startDate);
             log.error("endDate:"+endDate);
@@ -125,6 +120,7 @@ public class HrmSelfHelpController {
             com.weaver.em.msg.api.entity.Request emrequest = new com.weaver.em.msg.api.entity.Request();
             emrequest.setUrl("/user-profile/groupSession");
             emrequest.setParamsMap(json);
+            emrequest.setAsync(false);
             com.weaver.em.msg.api.entity.Response response2 = oaRest.executeIm(emrequest);
 
             String data = response2.getData();
diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
index c58deb0..a9f60bb 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
@@ -1,12 +1,10 @@
 package com.weaver.seconddev.jcldoor.util;
 
-import com.weaver.common.base.entity.result.WeaResult;
 import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
 import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
 import com.weaver.em.msg.api.entity.Request;
 import com.weaver.em.msg.api.entity.Response;
 import com.weaver.framework.rpc.annotation.RpcReference;
-import com.weaver.seconddev.jcldoor.controller.JucailinPortalController;
 import com.weaver.teams.domain.user.SimpleEmployee;
 import com.weaver.teams.security.context.UserContext;
 import org.apache.commons.collections.CollectionUtils;
@@ -105,10 +103,11 @@ public class JucailinPortalUtils {
             json.put("startDate",startDate);
             json.put("endDate",endDate);
 
-            Request emrequest = new Request();
-            emrequest.setUrl("/user-profile/groupSession");
-            emrequest.setParamsMap(json);
-            Response response = oaRest.executeIm(emrequest);
+            Request request = new Request();
+            request.setUrl("/user-profile/groupSession");
+            request.setParamsMap(json);
+            request.setAsync(false);
+            Response response = oaRest.executeIm(request);
             log.error("getChatGroup--isSuccess"+response.isSuccess());
             if (response.isSuccess()){
                 String data = response.getData();