瀏覽代碼

项目迁移

malk 2 周之前
父節點
當前提交
8953a30be3

+ 11 - 0
mjava-hake/src/main/java/com/malk/hake/controller/HKController_ML.java

@@ -8,6 +8,7 @@ import com.malk.server.common.McException;
 import com.malk.server.common.McR;
 import com.malk.server.common.McREnum;
 import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilDateTime;
 import com.malk.utils.UtilMap;
 import com.malk.utils.UtilServlet;
 import lombok.SneakyThrows;
@@ -17,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -113,4 +116,12 @@ public class HKController_ML {
         hkClient.syncMonitor(UtilMap.getString(data, "code"), data);
         return McR.success();
     }
+
+    @GetMapping("test")
+    McR test(HttpServletRequest request) {
+
+        log.info("111, {}", UtilDateTime.formatDate(new Date()));
+        log.info("222, {}", UtilDateTime.formatLocalDateTime(LocalDateTime.now()));
+        return McR.success();
+    }
 }

+ 1 - 1
mjava-hake/src/main/java/com/malk/hake/service/impl/HKImplClient_ML.java

@@ -168,7 +168,7 @@ public class HKImplClient_ML implements HKClient_ML {
         //}
         // 回调monitor审批信息
         data.put("Url", "https://pxi03f.aliwork.com/" + ydConf.getAppType() + "/processDetail?procInsId=" + data.get("DdProcessId"));
-        data.put("ApprovalDate", UtilDateTime.formatLocalDateTime(LocalDateTime.now()));
+        data.put("ApprovalDate", UtilDateTime.formatDateTime(new Date()));
         Map UserInfo = ddClient_contacts.getUserInfoById(ddClient.getAccessToken(), String.valueOf(data.get("Approver")));
         // prd 4.17 取消拒绝校验, 统一返回 [审核人xxx拒绝], monitor通过活动跳转
         if ("0".equals(data.get("Result")) && !data.containsKey("Remark")) {