From bf259a765836c739a28d2153bcc4de02984ee27f Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Wed, 3 Apr 2024 16:59:58 +0800 Subject: [PATCH] =?UTF-8?q?#weaver-ningbojinghua-3#=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8E=92=E7=8F=AD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/kq/biz/KQFormatData.java | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/com/engine/kq/biz/KQFormatData.java b/src/com/engine/kq/biz/KQFormatData.java index f99a049..31e20aa 100644 --- a/src/com/engine/kq/biz/KQFormatData.java +++ b/src/com/engine/kq/biz/KQFormatData.java @@ -133,8 +133,8 @@ public class KQFormatData extends BaseBean { " resourceid,kqdate,groupid,serialid,serialnumber,workbegindate,workbegintime,workenddate,workendtime,workmins," + " signindate,signintime,signinid,signoutdate,signouttime,signoutid,signMins," + " attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins," + - " leaveMins,leaveinfo,evectionMins,outMins,forgotbeginworkcheckmins,otherinfo,flowinfo" + (definedField.length() > 0 ? "," + definedField + "" : "") + ") " + - " values(?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?" + (definedField.length() > 0 ? "," + definedParam + "" : "") + ")"; + " leaveMins,leaveinfo,evectionMins,outMins,forgotbeginworkcheckmins,otherinfo" + (definedField.length() > 0 ? "," + definedField + "" : "") + ") " + + " values(?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?,?,?,?" + (definedField.length() > 0 ? "," + definedParam + "" : "") + ")"; for (int i = 0; i < lsParam.size(); i++) { List param = lsParam.get(i); boolean isok = rs.executeUpdate(sql, param); @@ -285,7 +285,7 @@ public class KQFormatData extends BaseBean { //用来计算实际打卡时长用的 int signInTimeIndx4Sign = -1; int signInTimeOutdx4Sign = -1; - Map flowinfo = new HashMap<>();//流程信息 +// Map flowinfo = new HashMap<>();//流程信息 String signBeginDateTime = signTimeScope.getBeginTimeAcross() ? nextDate : kqDate; @@ -551,7 +551,7 @@ public class KQFormatData extends BaseBean { if (workFlowInfo.get(dateKey) != null) { workFlow = (List) workFlowInfo.get(dateKey); } - List flowList = Lists.newArrayList(); +// List flowList = Lists.newArrayList(); for (int j = 0; workFlow != null && j < workFlow.size(); j++) { Map data = (Map) workFlow.get(j); String flowType = Util.null2String(data.get("flowtype")); @@ -559,27 +559,27 @@ public class KQFormatData extends BaseBean { String signtype = Util.null2String(data.get("signtype")); String serial = Util.null2String(data.get("serial")); String requestId = Util.null2String(data.get("requestId")); -// beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("begintime"))); -// endIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("endtime"))); - String begintime = Util.null2String(data.get("begintime")); - String endtime = Util.null2String(data.get("endtime")); - beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(begintime); - endIdx = kqTimesArrayComInfo.getArrayindexByTimes(endtime); + beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("begintime"))); + endIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("endtime"))); +// String begintime = Util.null2String(data.get("begintime")); +// String endtime = Util.null2String(data.get("endtime")); +// beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(begintime); +// endIdx = kqTimesArrayComInfo.getArrayindexByTimes(endtime); if (beginIdx >= endIdx) { continue; } - Map flowMap = Maps.newHashMap(); - flowMap.put("newLeaveType", newLeaveType); - flowMap.put("begintime", begintime); - flowMap.put("endtime", endtime); - List> flowMapList = Lists.newArrayList(); - if(flowinfo.containsKey(flowType)){ - List> tmpFlowMapList = (List>) flowinfo.get(flowType); - tmpFlowMapList.add(flowMap); - }else{ - flowMapList.add(flowMap); - flowinfo.put(flowType, flowMapList); - } +// Map flowMap = Maps.newHashMap(); +// flowMap.put("newLeaveType", newLeaveType); +// flowMap.put("begintime", begintime); +// flowMap.put("endtime", endtime); +// List> flowMapList = Lists.newArrayList(); +// if(flowinfo.containsKey(flowType)){ +// List> tmpFlowMapList = (List>) flowinfo.get(flowType); +// tmpFlowMapList.add(flowMap); +// }else{ +// flowMapList.add(flowMap); +// flowinfo.put(flowType, flowMapList); +// } if (flowType.equals(FlowReportTypeEnum.EVECTION.getFlowType())) { Arrays.fill(dayMins, beginIdx, endIdx, 7);//出差抵扣时段标识 7 @@ -881,7 +881,7 @@ public class KQFormatData extends BaseBean { params.add(outMins); params.add(forgotBeginWorkCheckMins); params.add(JSONObject.toJSONString(otherinfo)); - params.add(JSONObject.toJSONString(flowinfo)); +// params.add(JSONObject.toJSONString(flowinfo)); Map definedFieldInfo = new KQFormatBiz().getDefinedField(); String[] definedFields = Util.splitString(Util.null2String(definedFieldInfo.get("definedField")), ",");