From fbf3a9eb53251027300b4b192e0a47757982fc25 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 24 May 2023 15:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E5=BC=80--=E5=BA=B7=E7=91=9E=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/kr/service/impl/KqInteractiveServiceImpl.java | 4 ---- .../kr/workflow/action/KrBatchOvertimeCreateAction.java | 5 +++++ .../interfaces/kr/workflow/action/KrLeaveCreateAction.java | 5 +++++ .../kr/workflow/action/KrSingleOvertimeCreateAction.java | 5 +++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/com/engine/kr/service/impl/KqInteractiveServiceImpl.java b/src/com/engine/kr/service/impl/KqInteractiveServiceImpl.java index 721edc6..f3ae11d 100644 --- a/src/com/engine/kr/service/impl/KqInteractiveServiceImpl.java +++ b/src/com/engine/kr/service/impl/KqInteractiveServiceImpl.java @@ -48,10 +48,6 @@ public class KqInteractiveServiceImpl extends Service implements KqInteractiveSe if (rs.next()) { workCode = rs.getString("workcode"); } - if (StringUtils.isBlank(workCode)) { - workCode = Util.null2String(params.get("workCode")); - } - Map postParam = new HashMap<>(4); postParam.put("token", token); diff --git a/src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java b/src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java index 3d54f01..d8507a5 100644 --- a/src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java +++ b/src/weaver/interfaces/kr/workflow/action/KrBatchOvertimeCreateAction.java @@ -1,11 +1,13 @@ package weaver.interfaces.kr.workflow.action; import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.engine.kr.entity.kq.KqActionBO; import com.engine.kr.entity.kq.KqGlobal; import com.engine.kr.enums.KqInteractiveEnum; import com.engine.kr.service.impl.KqInteractiveServiceImpl; +import weaver.general.BaseBean; import weaver.interfaces.workflow.action.Action; import weaver.soa.workflow.request.*; @@ -114,8 +116,11 @@ public class KrBatchOvertimeCreateAction implements Action { params.put("cfmDay", operateDateTime.get("cfmDay")); // 1新增、2变动、3取消 params.put("billStat", 1); + new BaseBean().writeLog("########批量加班流程,requestid={" + requestInfo.getRequestid() + "]，传参:"+ JSON.toJSONString(params)); String returnStr = HttpUtil.post(KqGlobal.POST_URL + KqInteractiveEnum.OVERTIME_CREATE.getPostPath(), params); + new BaseBean().writeLog("########批量加班流程,requestid={" + requestInfo.getRequestid() + "]，接口响应数据:"+ returnStr); + JSONObject jsonObject = JSONObject.parseObject(returnStr); String code = jsonObject.getString("code"); if (!KqGlobal.SUC_CODE.equals(code)) { diff --git a/src/weaver/interfaces/kr/workflow/action/KrLeaveCreateAction.java b/src/weaver/interfaces/kr/workflow/action/KrLeaveCreateAction.java index 3082a7b..a05ac83 100644 --- a/src/weaver/interfaces/kr/workflow/action/KrLeaveCreateAction.java +++ b/src/weaver/interfaces/kr/workflow/action/KrLeaveCreateAction.java @@ -1,11 +1,13 @@ package weaver.interfaces.kr.workflow.action; import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.engine.kr.entity.kq.KqActionBO; import com.engine.kr.entity.kq.KqGlobal; import com.engine.kr.enums.KqInteractiveEnum; import com.engine.kr.service.impl.KqInteractiveServiceImpl; +import weaver.general.BaseBean; import weaver.interfaces.workflow.action.Action; import weaver.soa.workflow.request.MainTableInfo; import weaver.soa.workflow.request.Property; @@ -92,7 +94,10 @@ public class KrLeaveCreateAction implements Action { // 1新增、2变动、3取消 params.put("billStat", 1); + new BaseBean().writeLog("########请假流程,requestid={" + requestInfo.getRequestid() + "]，传参:"+ JSON.toJSONString(params)); + String returnStr = HttpUtil.post(KqGlobal.POST_URL + KqInteractiveEnum.LEAVE_CREATE.getPostPath(), params); + new BaseBean().writeLog("########请假流程,requestid={" + requestInfo.getRequestid() + "]，接口响应数据:"+ returnStr); JSONObject jsonObject = JSONObject.parseObject(returnStr); String code = jsonObject.getString("code"); if (KqGlobal.SUC_CODE.equals(code)) { diff --git a/src/weaver/interfaces/kr/workflow/action/KrSingleOvertimeCreateAction.java b/src/weaver/interfaces/kr/workflow/action/KrSingleOvertimeCreateAction.java index fe5ab44..43b9d6a 100644 --- a/src/weaver/interfaces/kr/workflow/action/KrSingleOvertimeCreateAction.java +++ b/src/weaver/interfaces/kr/workflow/action/KrSingleOvertimeCreateAction.java @@ -1,11 +1,13 @@ package weaver.interfaces.kr.workflow.action; import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.engine.kr.entity.kq.KqActionBO; import com.engine.kr.entity.kq.KqGlobal; import com.engine.kr.enums.KqInteractiveEnum; import com.engine.kr.service.impl.KqInteractiveServiceImpl; +import weaver.general.BaseBean; import weaver.interfaces.workflow.action.Action; import weaver.soa.workflow.request.MainTableInfo; import weaver.soa.workflow.request.Property; @@ -94,7 +96,10 @@ public class KrSingleOvertimeCreateAction implements Action { params.put("cfmDay", operateDateTime.get("addDay")); params.put("billStat", 1); + new BaseBean().writeLog("########加班流程,requestid={" + requestInfo.getRequestid() + "]，传参:"+ JSON.toJSONString(params)); + String returnStr = HttpUtil.post(KqGlobal.POST_URL + KqInteractiveEnum.OVERTIME_CREATE.getPostPath(), params); + new BaseBean().writeLog("########加班流程,requestid={" + requestInfo.getRequestid() + "]，接口响应数据:"+ returnStr); JSONObject jsonObject = JSONObject.parseObject(returnStr); String code = jsonObject.getString("code"); if (KqGlobal.SUC_CODE.equals(code)) {