From 8e2c9ba0f8e7f6e8472e388a095046b9cf50ac2e Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 30 Apr 2024 15:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E8=AF=B7=E5=81=87?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9action=E7=B1=BB=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AskForLeaveWorkFlowSubmitAction.java | 30 ++++++++----------- .../impl/EnterpriseCalendarServiceImpl.java | 8 +++-- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java b/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java index 4c8cc1c..393d7d5 100644 --- a/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java +++ b/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java @@ -156,24 +156,20 @@ public class AskForLeaveWorkFlowSubmitAction implements Action { return Action.FAILURE_AND_CONTINUE; } } - } - - log.info("detailTable2 : [{}]", detailTable2); - - //更新流程明细表2 - String delteSql = "delete from " + detail2TableName + " where mainid=?"; - DbTools.update(delteSql, requestid); - if (!CommonUtil.insertBatch(detailTable2, detail2TableName)) { - //更新流程明细表2失败 - String message = "更新流程明细表2失败"; - log.error(message); - requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222"); - requestInfo.getRequestManager().setMessagecontent(message); - return Action.FAILURE_AND_CONTINUE; - } + log.info("detailTable2 : [{}]", detailTable2); + + //更新流程明细表2 + String delteSql = "delete from " + detail2TableName + " where mainid=?"; + DbTools.update(delteSql, requestid); + if (detailTable2.size() > 0 && !CommonUtil.insertBatch(detailTable2, detail2TableName)) { + //更新流程明细表2失败 + String message = "更新流程明细表2失败"; + log.error(message); + requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222"); + requestInfo.getRequestManager().setMessagecontent(message); + return Action.FAILURE_AND_CONTINUE; + } - //当前假期类型需要校验剩余额度时则更新假期余额在途时长，否则跳过 - if (checkAmountJqIdList.contains(jqlx)) { //更新假期余额在途时长 Map balanceMap = Maps.newHashMap(); for (Map data : detailTable2) { diff --git a/src/com/engine/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java index 2102e42..f19334f 100644 --- a/src/com/engine/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java +++ b/src/com/engine/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java @@ -100,9 +100,11 @@ public class EnterpriseCalendarServiceImpl extends Service implements Enterprise bs.writeLog("delSign : " + delSign + ", delSql : " + delSql); //插入新数据 String tableName = "uf_jcl_kq_rlxx"; - bs.writeLog("入库开始---"); - boolean insertSign = CommonUtil.insertBatch(dateInfoList, tableName); - bs.writeLog("insertSign : " + insertSign); + if (dateInfoList.size() > 0) { + bs.writeLog("入库开始---"); + boolean insertSign = CommonUtil.insertBatch(dateInfoList, tableName); + bs.writeLog("insertSign : " + insertSign); + } return new HashMap<>(); }