diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java index 0ff8daa..78dc7b5 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java +++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java @@ -44,7 +44,6 @@ public class GetClockInTimeListCmd extends AbstractCommonCommand> clockInTimeMap = (Map>)params.get("clockInTimeMap"); //当天班次 List> needGetDateScheduling = schedulingResultCollect.get(needGetDate); - needGetDateScheduling = needGetDateScheduling.stream().sorted(Comparator.comparing(e -> DateUtil.getTime(Utils.getkssjTime(e, needGetDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList()); // Map>> collect = (Map>>)params.get("clockInTimeCollect"); @@ -73,6 +72,7 @@ public class GetClockInTimeListCmd extends AbstractCommonCommand DateUtil.getTime(Utils.getkssjTime(e, needGetDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList()); List> scheduleList = needGetDateScheduling.stream().filter(e -> { if (!ClassSegmentTypeEnum.REST_AND_DINE.getKey().equals(e.get("bdlx")) && !ClassSegmentTypeEnum.REST_PERIOD.getKey().equals(e.get("bdlx")) && diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java index aa573af..0a42580 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java +++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java @@ -340,7 +340,9 @@ public class AttendanceAnalysisWrapper extends Service { */ public Map analysis(String userId, String analysisDate, List> clockInTimeList, List> scheduleResult, List> attendanceItems, List> workHourItems ,Map clockInTimeDataMap,List> evectionList,List> askforList) { - scheduleResult = scheduleResult.stream().sorted(Comparator.comparing(e -> DateUtil.getTime(Utils.getkssjTime(e, analysisDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList()); + if (scheduleResult != null){ + scheduleResult = scheduleResult.stream().sorted(Comparator.comparing(e -> DateUtil.getTime(Utils.getkssjTime(e, analysisDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList()); + } Map recordParam = Maps.newHashMap(); Map formModeIdMap = Utils.getFormmodeIdMap(); recordParam.put("userId", userId); diff --git a/src/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.java b/src/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.java index f0cc177..f0827a4 100644 --- a/src/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.java +++ b/src/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.java @@ -108,15 +108,4 @@ public class VocationCmd extends AbstractCommonCommand> { return null; } - public List getUserIds(Map vocation){ - List userIds = Lists.newArrayList(); - String edyj = Util.null2String(vocation.get("edyj")); - if (edyj.equals("3") || edyj.equals("4")){ - String zyz = Util.null2String(vocation.get("zyz")); - zyz = Utils.converSQL(zyz); - List> dataList = DbTools.getSqlToList(zyz); - userIds = dataList.stream().map(e->Util.null2String(e.get("id"))).collect(Collectors.toList()); - } - return userIds; - } } diff --git a/src/com/engine/jucailinkq/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.java b/src/com/engine/jucailinkq/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.java index d2f3af2..4861b62 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.java +++ b/src/com/engine/jucailinkq/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.java @@ -144,17 +144,17 @@ public class RevokeEliminationsAskForLeaveAction implements Action { for(Map.Entry>> entry: datagroupbyId.entrySet()){ String jqyeId = entry.getKey(); List> list = entry.getValue(); - double qjscTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qjsc").toString())).sum(); - double qtjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum(); - double btjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum(); - double qjsc = 0; - - if (AccountingUnitEnum.DAY.getKey().equals(hsdw)){ - qjsc = qtjTotal+btjTotal; - }else if (AccountingUnitEnum.HOUR.getKey().equals(hsdw)){ - qjsc = qjscTotal + (qtjTotal+btjTotal)*8; - } - sql = "update uf_jcl_kq_jqye set yxsc=yxsc-"+qjsc+",wxsc=wxsc+"+qjsc+" where id=?"; + double syscTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("sysc").toString())).sum(); + //double qtjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum(); + //double btjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum(); + //double qjsc = 0; + +// if (AccountingUnitEnum.DAY.getKey().equals(hsdw)){ +// qjsc = qtjTotal+btjTotal; +// }else if (AccountingUnitEnum.HOUR.getKey().equals(hsdw)){ +// qjsc = qjscTotal + (qtjTotal+btjTotal)*8; +// } + sql = "update uf_jcl_kq_jqye set yxsc=yxsc-"+syscTotal+",wxsc=wxsc+"+syscTotal+" where id=?"; log.debug("updateHoliday sql : [{}]",sql); DbTools.update(sql,jqyeId); } diff --git a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.java b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.java index 0e8924e..3e0ba99 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.java +++ b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.java @@ -59,7 +59,7 @@ public class BatchAskForLeaveWorkFlowSubmitAction implements Action { //20241127需求变更，明细表1存在数据时，直接走原有校验逻辑；明细表1没有数据时，就根据明细表3重新生成明细表1数据，然后继续原有校验逻辑 Map params = new HashMap<>(); List> reCreateDetailList = new ArrayList<>(); - if (detailTableData.size() == 0 && detailTable3Data.size() > 0) { + if (detailTable3Data.size() > 0) { List> insertDetail1List = new ArrayList<>(); Map itemResult = new HashMap<>(); List> itemDetailList = new ArrayList<>(); @@ -103,7 +103,8 @@ public class BatchAskForLeaveWorkFlowSubmitAction implements Action { } } log.info("insertDetail1List : [{}]", insertDetail1List); - if (insertDetail1List.size() > 0 && !CommonUtil.insertBatch(insertDetail1List, detail1TableName)) { + String deleteSql="delete from "+detail1TableName+" where mainid=?"; + if (insertDetail1List.size() > 0 && DbTools.update(deleteSql,mainTableData.get("id")) && !CommonUtil.insertBatch(insertDetail1List, detail1TableName)) { //更新流程明细表2失败 String message = "新增流程明细表1失败"; log.error(message); diff --git a/src/com/engine/jucailinkq/common/cmd/GetPersonVocationBySuitOrganzation.java b/src/com/engine/jucailinkq/common/cmd/GetPersonVocationBySuitOrganzation.java index 08054e7..ceeeced 100644 --- a/src/com/engine/jucailinkq/common/cmd/GetPersonVocationBySuitOrganzation.java +++ b/src/com/engine/jucailinkq/common/cmd/GetPersonVocationBySuitOrganzation.java @@ -155,9 +155,9 @@ public class GetPersonVocationBySuitOrganzation extends AbstractCommonCommand entry : departMentMap.entrySet()){ String departMentId = entry.getKey(); //部门（假别，假期规则id） @@ -183,7 +183,7 @@ public class GetPersonVocationBySuitOrganzation extends AbstractCommonCommand entry : subCompanyMap.entrySet()){ String subCompanyId = entry.getKey(); //分部（假别，假期规则id） @@ -208,7 +208,7 @@ public class GetPersonVocationBySuitOrganzation extends AbstractCommonCommand newpersonMap = Maps.newHashMap(); for (Map.Entry entry :personMap.entrySet()){ String userId = entry.getKey();