From 44a84f958a76ebfdb72c8f023dc8e9dc2f5ea4f6 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 22 Aug 2024 10:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4-=E8=AF=B7=E5=81=87=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E9=80=80=E5=9B=9E=E6=97=B6=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E6=98=8E=E7=BB=86=E8=A1=A81=E5=92=8C=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A82=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/OvertimePlanCheckAction.java | 1 + .../BatchAskForLeaveWorkFlowBackAction.java | 26 ++++++++++++++++++- .../tactics/AskForLeaveWorkflowDataReset.java | 15 +++++++++++ .../BatchAskForLeaveWorkflowDataReset.java | 14 ++++++++++ .../service/impl/OvertimePlanServiceImpl.java | 2 +- 5 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/com/engine/jucailinkq/attendance/workflow/action/OvertimePlanCheckAction.java b/src/com/engine/jucailinkq/attendance/workflow/action/OvertimePlanCheckAction.java index e6f412e..521195e 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/action/OvertimePlanCheckAction.java +++ b/src/com/engine/jucailinkq/attendance/workflow/action/OvertimePlanCheckAction.java @@ -39,6 +39,7 @@ public class OvertimePlanCheckAction implements Action { HashMap mainTableData = CommonUtil.getMainTableInfo(requestInfo); // 流程表单明细表数据 List> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0); + log.info("OvertimePlanCheckAction_start, detailTableData_size : {}",detailTableData.size()); //加班人员 String jbry = mainTableData.get("jbry"); try { diff --git a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java index 9375ec4..a097e62 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java +++ b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java @@ -26,6 +26,8 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action { @Override public String execute(RequestInfo requestInfo) { String requestid = requestInfo.getRequestid(); + int billid = requestInfo.getRequestManager().getBillid(); + log.info("billid : [{}]",billid); String sql = "select id, jlzt from uf_jcl_kq_qjjl where djid = " + requestid; Map qjllData = DbTools.getSqlToMap(sql); @@ -45,6 +47,9 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action { List> detailTable2 = CommonUtil.getDetailTableInfo(requestInfo,1); log.info("BatchAskForLeaveWorkFlowBackAction-detailTable2Data : [{}]",detailTable2); + String detail2TableName = requestInfo.getDetailTableInfo().getDetailTable()[1].getTableDBName(); + log.info("detail2ableName : [{}]", detail2TableName); + sql = "select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye order by sxrq"; List> holidayBalanceList = DbTools.getSqlToList(sql); @@ -120,8 +125,27 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action { } } } - //将明细表1数据 + //将明细表1数据清空 + String delSql = "delete from " + detail1TableName + " where mainid=?"; + if (!DbTools.update(delSql, billid)) { + //将明细表1数据清空 + String message = "删除流程明细表1数据失败"; + log.error(message); + requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222"); + requestInfo.getRequestManager().setMessagecontent(message); + return Action.FAILURE_AND_CONTINUE; + } + //将明细表2数据清空 + delSql = "delete from " + detail2TableName + " where mainid=?"; + if (!DbTools.update(delSql, billid)) { + //将明细表2数据清空 + String message = "删除流程明细表2数据失败"; + log.error(message); + requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222"); + requestInfo.getRequestManager().setMessagecontent(message); + return Action.FAILURE_AND_CONTINUE; + } }catch (Exception e){ diff --git a/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/AskForLeaveWorkflowDataReset.java b/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/AskForLeaveWorkflowDataReset.java index 2add3b2..5557285 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/AskForLeaveWorkflowDataReset.java +++ b/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/AskForLeaveWorkflowDataReset.java @@ -138,6 +138,21 @@ public class AskForLeaveWorkflowDataReset implements WorkFlowHandleTacis{ } } } + //将明细表1数据清空 + String delSql = "delete from " + tableName + "_dt1 where mainid=?"; + if (!DbTools.update(delSql, mainMap.get("id"))) { + //将明细表1数据清空 + String message = "删除流程明细表1数据失败"; + log.error(message); + } + + //将明细表2数据清空 + delSql = "delete from " + tableName + "_dt2 where mainid=?"; + if (!DbTools.update(delSql, mainMap.get("id"))) { + //将明细表2数据清空 + String message = "删除流程明细表2数据失败"; + log.error(message); + } }catch (Exception e){ log.error("BatchAskForLeaveWorkFlowBackAction error : [{}]",e); diff --git a/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/BatchAskForLeaveWorkflowDataReset.java b/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/BatchAskForLeaveWorkflowDataReset.java index dfa64f0..a5033db 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/BatchAskForLeaveWorkflowDataReset.java +++ b/src/com/engine/jucailinkq/attendance/workflow/proxy/tactics/BatchAskForLeaveWorkflowDataReset.java @@ -136,6 +136,20 @@ public class BatchAskForLeaveWorkflowDataReset implements WorkFlowHandleTacis{ } } } + //将明细表1数据清空 + String delSql = "delete from " + tableName + "_dt1 where mainid=?"; + if (!DbTools.update(delSql, mainMap.get("id"))) { + //将明细表1数据清空 + String message = "删除流程明细表1数据失败"; + log.error(message); + } + //将明细表2数据清空 + delSql = "delete from " + tableName + "_dt2 where mainid=?"; + if (!DbTools.update(delSql, mainMap.get("id"))) { + //将明细表2数据清空 + String message = "删除流程明细表2数据失败"; + log.error(message); + } }catch (Exception e){ log.error("BatchAskForLeaveWorkFlowBackAction error : [{}]",e); diff --git a/src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java b/src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java index b169ea9..395b484 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java +++ b/src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java @@ -234,7 +234,7 @@ public class OvertimePlanServiceImpl extends Service implements OvertimePlanServ //获取人员在归属日被设置的考勤项目 List> attendanceItemSetList = CommonUtil.getAttendanceItemsByEmpIdDate(empId, belongDate); List kqxmSetIds = attendanceItemSetList.stream().map(f->f.get("keyid").toString()).collect(Collectors.toList()); - log.info(Util.null2String(empIdToNameInfo.get(empId)) + "在日期" + date + "的可用考勤项目：" + kqxmSetIds); +// log.info(Util.null2String(empIdToNameInfo.get(empId)) + "在日期" + date + "的可用考勤项目：" + kqxmSetIds); Map matchItemInfo = new HashMap<>(); for (Map attendanceItemInfo : jblxAttendanceList) { //判断该加班类型考勤项目是否被该人员使用，且考勤项目的绑定的日期类型是否包含归属日期类型