shilei
/
weaver-ningbojinghua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#weaver-ningbojinghua-3# 修复排班的问题

Browse Source
pull/3/head
shilei 1 year ago
parent dacdefba71
commit bf259a7658
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

46
src/com/engine/kq/biz/KQFormatData.java
Unescape Escape View File

@ -133,8 +133,8 @@ public class KQFormatData extends BaseBean {
" resourceid,kqdate,groupid,serialid,serialnumber,workbegindate,workbegintime,workenddate,workendtime,workmins," + " resourceid,kqdate,groupid,serialid,serialnumber,workbegindate,workbegintime,workenddate,workendtime,workmins," +
" signindate,signintime,signinid,signoutdate,signouttime,signoutid,signMins," + " signindate,signintime,signinid,signoutdate,signouttime,signoutid,signMins," +
" attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins," + " attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins," +
" leaveMins,leaveinfo,evectionMins,outMins,forgotbeginworkcheckmins,otherinfo,flowinfo" + (definedField.length() > 0 ? "," + definedField + "" : "") + ") " + " leaveMins,leaveinfo,evectionMins,outMins,forgotbeginworkcheckmins,otherinfo" + (definedField.length() > 0 ? "," + definedField + "" : "") + ") " +
" values(?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?,?,?,?,?" + (definedField.length() > 0 ? "," + definedParam + "" : "") + ")"; " values(?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?,?,?,?" + (definedField.length() > 0 ? "," + definedParam + "" : "") + ")";
for (int i = 0; i < lsParam.size(); i++) { for (int i = 0; i < lsParam.size(); i++) {
List<Object> param = lsParam.get(i); List<Object> param = lsParam.get(i);
boolean isok = rs.executeUpdate(sql, param); boolean isok = rs.executeUpdate(sql, param);
@ -285,7 +285,7 @@ public class KQFormatData extends BaseBean {
//用来计算实际打卡时长用的 //用来计算实际打卡时长用的
int signInTimeIndx4Sign = -1; int signInTimeIndx4Sign = -1;
int signInTimeOutdx4Sign = -1; int signInTimeOutdx4Sign = -1;
Map<String,Object> flowinfo = new HashMap<>();//流程信息 // Map<String,Object> flowinfo = new HashMap<>();//流程信息
String signBeginDateTime = signTimeScope.getBeginTimeAcross() ? nextDate : kqDate; String signBeginDateTime = signTimeScope.getBeginTimeAcross() ? nextDate : kqDate;
@ -551,7 +551,7 @@ public class KQFormatData extends BaseBean {
if (workFlowInfo.get(dateKey) != null) { if (workFlowInfo.get(dateKey) != null) {
workFlow = (List<Object>) workFlowInfo.get(dateKey); workFlow = (List<Object>) workFlowInfo.get(dateKey);
} }
List<Object> flowList = Lists.newArrayList(); // List<Object> flowList = Lists.newArrayList();
for (int j = 0; workFlow != null && j < workFlow.size(); j++) { for (int j = 0; workFlow != null && j < workFlow.size(); j++) {
Map<String, Object> data = (Map<String, Object>) workFlow.get(j); Map<String, Object> data = (Map<String, Object>) workFlow.get(j);
String flowType = Util.null2String(data.get("flowtype")); String flowType = Util.null2String(data.get("flowtype"));
@ -559,27 +559,27 @@ public class KQFormatData extends BaseBean {
String signtype = Util.null2String(data.get("signtype")); String signtype = Util.null2String(data.get("signtype"));
String serial = Util.null2String(data.get("serial")); String serial = Util.null2String(data.get("serial"));
String requestId = Util.null2String(data.get("requestId")); String requestId = Util.null2String(data.get("requestId"));
// beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("begintime"))); beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("begintime")));
// endIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("endtime"))); endIdx = kqTimesArrayComInfo.getArrayindexByTimes(Util.null2String(data.get("endtime")));
String begintime = Util.null2String(data.get("begintime")); // String begintime = Util.null2String(data.get("begintime"));
String endtime = Util.null2String(data.get("endtime")); // String endtime = Util.null2String(data.get("endtime"));
beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(begintime); // beginIdx = kqTimesArrayComInfo.getArrayindexByTimes(begintime);
endIdx = kqTimesArrayComInfo.getArrayindexByTimes(endtime); // endIdx = kqTimesArrayComInfo.getArrayindexByTimes(endtime);
if (beginIdx >= endIdx) { if (beginIdx >= endIdx) {
continue; continue;
} }
Map<String,String> flowMap = Maps.newHashMap(); // Map<String,String> flowMap = Maps.newHashMap();
flowMap.put("newLeaveType", newLeaveType); // flowMap.put("newLeaveType", newLeaveType);
flowMap.put("begintime", begintime); // flowMap.put("begintime", begintime);
flowMap.put("endtime", endtime); // flowMap.put("endtime", endtime);
List<Map<String,String>> flowMapList = Lists.newArrayList(); // List<Map<String,String>> flowMapList = Lists.newArrayList();
if(flowinfo.containsKey(flowType)){ // if(flowinfo.containsKey(flowType)){
List<Map<String,String>> tmpFlowMapList = (List<Map<String, String>>) flowinfo.get(flowType); // List<Map<String,String>> tmpFlowMapList = (List<Map<String, String>>) flowinfo.get(flowType);
tmpFlowMapList.add(flowMap); // tmpFlowMapList.add(flowMap);
}else{ // }else{
flowMapList.add(flowMap); // flowMapList.add(flowMap);
flowinfo.put(flowType, flowMapList); // flowinfo.put(flowType, flowMapList);
} // }
if (flowType.equals(FlowReportTypeEnum.EVECTION.getFlowType())) { if (flowType.equals(FlowReportTypeEnum.EVECTION.getFlowType())) {
Arrays.fill(dayMins, beginIdx, endIdx, 7);//出差抵扣时段标识 7 Arrays.fill(dayMins, beginIdx, endIdx, 7);//出差抵扣时段标识 7
@ -881,7 +881,7 @@ public class KQFormatData extends BaseBean {
params.add(outMins); params.add(outMins);
params.add(forgotBeginWorkCheckMins); params.add(forgotBeginWorkCheckMins);
params.add(JSONObject.toJSONString(otherinfo)); params.add(JSONObject.toJSONString(otherinfo));
params.add(JSONObject.toJSONString(flowinfo)); // params.add(JSONObject.toJSONString(flowinfo));
Map<String, Object> definedFieldInfo = new KQFormatBiz().getDefinedField(); Map<String, Object> definedFieldInfo = new KQFormatBiz().getDefinedField();
String[] definedFields = Util.splitString(Util.null2String(definedFieldInfo.get("definedField")), ","); String[] definedFields = Util.splitString(Util.null2String(definedFieldInfo.get("definedField")), ",");

Write Preview
Loading…
Cancel
Save