Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance

src/com/engine/jucailinkq/attendance/workflow/action/OvertimePlanCheckAction.java

@@ -39,6 +39,7 @@ public class OvertimePlanCheckAction implements Action {
         HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
         // 流程表单明细表数据
         List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
+        log.info("OvertimePlanCheckAction_start, detailTableData_size : {}",detailTableData.size());
         //加班人员
         String jbry = mainTableData.get("jbry");
         try {

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<String, Object> qjllData = DbTools.getSqlToMap(sql);
@@ -45,6 +47,9 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action {
         List<Map<String, String>> 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<Map<String,Object>> 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){

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);

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);

src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java

@@ -234,7 +234,7 @@ public class OvertimePlanServiceImpl extends Service implements OvertimePlanServ
                     //获取人员在归属日被设置的考勤项目
                     List<Map<String, Object>> attendanceItemSetList = CommonUtil.getAttendanceItemsByEmpIdDate(empId, belongDate);
                     List<String> 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<String, Object> matchItemInfo = new HashMap<>();
                     for (Map<String, Object> attendanceItemInfo : jblxAttendanceList) {
                         //判断该加班类型考勤项目是否被该人员使用，且考勤项目的绑定的日期类型是否包含归属日期类型