liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考勤-出差流程，明细数据生成接口

Browse Source
main
liuliang 4 days ago
parent b87e36e250
commit 7c304d6b13
12 changed files with 209 additions and 47 deletions
Show Stats Download Patch File Download Diff File

30
src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java
Unescape Escape View File

@ -164,6 +164,36 @@ public class GetClockInTimeListCmd extends AbstractCommonCommand<Map<String,Obje
earliestTime = DateUtil.AfterSeconds(earliestTime,1);
}
mark = false;
String afterestDate = DateUtil.AfterDay(needGetDate,1);
clockIntime = clockInTimeMap.get(afterestDate);
if (clockIntime!= null && CheckBoxEnum.CHECKED.getKey().equals(clockIntime.get("sgsj"))){
if (clockIntime !=null && clockIntime.size()>0){
for (int i=1;i<=8;i++){
String in = Util.null2String(clockIntime.get("j"+i));
String out = Util.null2String(clockIntime.get("c"+i));
if (!"".equals(in) && !"NULL".equals(in)){
if (DateUtil.getTime(in).compareTo(DateUtil.getTime(lastestTime)) <= 0){
mark = true;
lastestTime = in;
}
break;
}else if (!"".equals(out) && !"NULL".equals(out)){
if (DateUtil.getTime(out).compareTo(DateUtil.getTime(lastestTime)) <= 0){
mark = true;
lastestTime = out;
}
break;
}
}
}
if (mark){
lastestTime = DateUtil.beforeSeconds(lastestTime,1);
}
}
log.debug("earliestTime :[{}],lastestTime: [{}]",earliestTime,lastestTime);
String finalEarliestTime = earliestTime;
String finalLastestTime = lastestTime;

3
src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java
Unescape Escape View File

@ -384,12 +384,15 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
if (newDataList != null && newDataList.size() > 0 && newDataList.get(0).size() > 1){
double totalKtsc = newDataList.stream().mapToDouble(e->Double.valueOf(e.get("ktsc").toString())).sum();
double totalJxsc = newDataList.stream().mapToDouble(e->Double.valueOf(e.get("jxsc").toString())).sum();
double totalWxsc = newDataList.stream().mapToDouble(e->Double.valueOf(e.get("wxsc").toString())).sum();
Map<String,Object> newData = newDataList.get(0);
List<Map<String,Object>> oldData = oldHolidayGroupByType.get(jblx);
if (oldData == null || oldData.size() == 0){
newData.put("ktsc",totalKtsc);
newData.put("jxsc",totalJxsc);
newData.put("wxsc",totalWxsc);
beforeHolidays.put(newData.get("jqid").toString(),DbTools.getSqlToList(queryHolidaySql,newData.get("ygid"),newData.get("jqid")));
//老数据不存在，新数据存在。新增数据
insertList.add(newData);

54
src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustLastWorkPointCmd.java
Unescape Escape View File

@ -0,0 +1,54 @@
package com.engine.jucailinkq.attendance.attendanceanalysis.cmd.getclockInpoint;
import com.engine.jucailinkq.attendance.attendanceanalysis.cmd.getclockInpoint.biz.AbstractAdjustClockPointAction;
import com.engine.jucailinkq.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO;
import com.engine.jucailinkq.attendance.attendanceanalysis.dto.clockpoint.ClockPointInfo;
import com.engine.jucailinkq.attendance.enums.ClassSegmentTypeEnum;
import com.engine.jucailinkq.attendance.enums.ClockPointEnum;
import com.engine.jucailinkq.common.util.DateUtil;
import java.time.ZoneOffset;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class AdjustLastWorkPointCmd extends AbstractAdjustClockPointAction {
@Override
public List<ClockPointDTO> execute(ClockPointInfo clockPointInfo) {
//卡点集合
List<ClockPointDTO> clcokInPointList = clockPointInfo.getClcokInPointList();
String analysisDate = clockPointInfo.getAnalysisDate();
clcokInPointList = clcokInPointList.stream().sorted(Comparator.comparing(e-> DateUtil.getTime(e.getClassTime()).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
int lastWorkPoint = clcokInPointList.size()-3;
if (lastWorkPoint >0 && clcokInPointList.get(lastWorkPoint).getPointType().equals(ClockPointEnum.END) &&(clcokInPointList.get(lastWorkPoint).getClassSegmentType().equals(ClassSegmentTypeEnum.WORK_TIME.getKey()) ||
clcokInPointList.get(lastWorkPoint).getClassSegmentType().equals(ClassSegmentTypeEnum.OVERTIME_PLAN.getKey()))){
ClockPointDTO lastWorkClockPoint = clcokInPointList.get(lastWorkPoint);
String lastclassTime = lastWorkClockPoint.getClassTime();
Map<String, Object> signClockMap = null;
for (int i=clcokInPointList.size()-1;i>lastWorkPoint;i--){
signClockMap = clcokInPointList.get(i).getClockTime();
if (signClockMap != null){
break;
}
}
if (signClockMap != null && DateUtil.getTime(lastclassTime).compareTo(DateUtil.getTime(signClockMap.get("signdate")+" "+signClockMap.get("signtime"))) >0){
lastWorkClockPoint.setClockTime(signClockMap);
lastWorkClockPoint.setTimeType(ClockPointEnum.BEFORE);
lastWorkClockPoint.setElasticTime(null);
lastWorkClockPoint.setResetCard(true);
for (int i=lastWorkPoint+1;i<clcokInPointList.size();i++){
clcokInPointList.get(i).setTimeType(ClockPointEnum.EMPTY);
clcokInPointList.get(i).setClockTime(null);
clcokInPointList.get(i).setElasticTime(null);
}
}
}
return clcokInPointList;
}
}

8
src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java
Unescape Escape View File

@ -226,7 +226,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
String firstKssj = Utils.getkssjTime(scheduleResult.get(0),analysisDate);
String kssj = Utils.getkssjTime(scheduleResult.get(i),analysisDate);
scheduleResult.get(i).put("ksdk",CheckBoxEnum.CHECKED.getKey());
scheduleResult.get(i).put("tqdkfzs",DateUtil.getBetWeenMinutes(firstKssj,kssj));
scheduleResult.get(i).put("tqdkfzs",ExtensionClassHolder.getGlobalSetMap().get("defaultClockRange") == null?DateUtil.getBetWeenMinutes(firstKssj,kssj):ExtensionClassHolder.getGlobalSetMap().get("defaultClockRange"));
needClockDateList.add(0,dtkssj);
break;
}
@ -237,7 +237,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
String lastjssj = Utils.getjssjTime(scheduleResult.get(scheduleResult.size()-1),analysisDate);
String jssj = Utils.getjssjTime(scheduleResult.get(i),analysisDate);
scheduleResult.get(i).put("jsdk",CheckBoxEnum.CHECKED.getKey());
scheduleResult.get(i).put("thdkfzs",DateUtil.getBetWeenMinutes(jssj,lastjssj));
scheduleResult.get(i).put("thdkfzs",ExtensionClassHolder.getGlobalSetMap().get("defaultClockRange") == null?DateUtil.getBetWeenMinutes(jssj,lastjssj):ExtensionClassHolder.getGlobalSetMap().get("defaultClockRange"));
needClockDateList.add(dtjssj);
break;
}
@ -620,7 +620,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(beforejssj)) == 0 && ifWorkClassSegment(beforeScheduleMap.get("bdlx").toString()) &&
scheduleMap.get("jsdk").equals(CheckBoxEnum.UNCHECKED.getKey()) && scheduleMap.get("ksdk").equals(CheckBoxEnum.UNCHECKED.getKey()) &&
beforeScheduleMap.get("jsdk").equals(CheckBoxEnum.CHECKED.getKey())){
int thdkfzs = DateUtil.getBetWeenMinutes(Utils.getjssjTime(beforeScheduleMap,analysisDate),Utils.getjssjTime(scheduleMap,analysisDate))+Integer.valueOf(beforeScheduleMap.get("thdkfzs") == null?"60":beforeScheduleMap.get("thdkfzs").toString());
int thdkfzs = DateUtil.getBetWeenMinutes(Utils.getjssjTime(beforeScheduleMap,analysisDate),Utils.getjssjTime(scheduleMap,analysisDate))+Integer.valueOf(Util.null2String(beforeScheduleMap.get("thdkfzs")).equals("")?"60":beforeScheduleMap.get("thdkfzs").toString());
beforeScheduleMap.put("thdkfzs",thdkfzs);
}
@ -642,7 +642,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
if (DateUtil.getTime(jssj).compareTo(DateUtil.getTime(afterkssj)) == 0 && ifWorkClassSegment(afterScheduleMap.get("bdlx").toString()) &&
scheduleMap.get("ksdk").equals(CheckBoxEnum.UNCHECKED.getKey()) &&scheduleMap.get("jsdk").equals(CheckBoxEnum.UNCHECKED.getKey()) &&
afterScheduleMap.get("ksdk").equals(CheckBoxEnum.CHECKED.getKey())){
int tqdkfzs = DateUtil.getBetWeenMinutes(Utils.getkssjTime(scheduleMap,analysisDate),Utils.getkssjTime(afterScheduleMap,analysisDate))+Integer.valueOf(afterScheduleMap.get("tqdkfzs")==null?"60":afterScheduleMap.get("tqdkfzs").toString());
int tqdkfzs = DateUtil.getBetWeenMinutes(Utils.getkssjTime(scheduleMap,analysisDate),Utils.getkssjTime(afterScheduleMap,analysisDate))+Integer.valueOf(Util.null2String(afterScheduleMap.get("tqdkfzs")).equals("")?"60":afterScheduleMap.get("tqdkfzs").toString());
afterScheduleMap.put("tqdkfzs",tqdkfzs);
}
}

4
src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java
Unescape Escape View File

@ -342,6 +342,10 @@ public class GetOvertimeDurationCmd extends AbstractCommonCommand<Map<String, Ob
}
}
if (endClockPointDTO.size() >0 && endClockPointDTO.get(0).isResetCard() && scheduleMap.get("beforeClassSegment").equals(ClassSegmentTypeEnum.WORK_TIME.getKey())){
dinnerTime=0;
}
log.debug("未扣减过的加班时长: {}", jbsc);
log.debug("beLateTime :[{}],leaveElaryTime :[{}],askForLeaveTime:[{}],evectionTime:[{}],dinnerTime:[{}]", beLateTime, leaveElaryTime, askForLeaveTime, evectionTime, dinnerTime);
BigDecimal jbscbig = new BigDecimal(jbsc);

2
src/com/engine/jucailinkq/attendance/attendanceanalysis/dto/clockpoint/ClockPointDTO.java
Unescape Escape View File

@ -53,5 +53,5 @@ public class ClockPointDTO {
/**
* 来源卡点，当record为false时，该值才有值
*/
private ClockPointDTO resourceClockPointDTO;
private boolean resetCard;
}

16
src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.engine.jucailinkq.attendance.attendanceanalysis.cmd.item.*;
import com.engine.jucailinkq.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO;
import com.engine.jucailinkq.attendance.attendanceanalysis.service.AbnormalAttendanceService;
import com.engine.jucailinkq.attendance.enums.*;
import com.engine.jucailinkq.common.util.DateUtil;
import com.engine.jucailinkq.common.util.Utils;
import com.engine.core.impl.Service;
import com.google.common.collect.Lists;
@ -59,7 +60,12 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
if (clcokInTimedto.getElasticTime() != null && !"".equals(clcokInTimedto.getElasticTime())){
classStartTime = clcokInTimedto.getElasticTime();
}
int between = Utils.removeRestTime(classStartTime,clockInTime,scheduleResult,analysisDate);
int between = 0;
if (clcokInTimedto.isResetCard()){
between = DateUtil.getBetWeenMinutes(classStartTime,clockInTime);
}else {
between = Utils.removeRestTime(classStartTime,clockInTime,scheduleResult,analysisDate);
}
if (between == 0){
return resultList;
}
@ -222,8 +228,14 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
if (clockPointDTO.getElasticTime() != null && !"".equals(clockPointDTO.getElasticTime())){
classEndTime = clockPointDTO.getElasticTime();
}
int between = 0;
if (clockPointDTO.isResetCard()){
between = DateUtil.getBetWeenMinutesOver(clockInTime,classEndTime);
}else {
between = Utils.removeRestTimeForLeaveEarly(clockInTime,classEndTime,scheduleResult,analysisDate);
}
int between = Utils.removeRestTime(clockInTime,classEndTime,scheduleResult,analysisDate);
if (between == 0){
return resultList;
}

13
src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
Unescape Escape View File

@ -80,12 +80,8 @@ public class ShiftServiceImpl extends Service implements ShiftService {
result = compareMap;
continue;
}
//1-比较各候选班次实际打卡正常的时间点个数B
String resultB = Util.null2String(result.get("judgePartB"));
if (!resultB.equals(compareB)) {
result = Double.valueOf(resultB) < Double.valueOf(compareB) ? compareMap : result;
continue;
}
//2-B相同时,比较B/A最大。各候选班次（结合了请假、出差、加班等）需要打卡的时间点个数A
String resultA = Util.null2String(result.get("judgePartA"));
String compareA = Util.null2String(compareMap.get("judgePartA"));
@ -95,6 +91,13 @@ public class ShiftServiceImpl extends Service implements ShiftService {
result = resultBDividedA < compareBDividedA ? compareMap : result;
continue;
}
//1-比较各候选班次实际打卡正常的时间点个数B
if (!resultB.equals(compareB)) {
result = Double.valueOf(resultB) < Double.valueOf(compareB) ? compareMap : result;
continue;
}
//3-B/A相同时C最小。异常总分钟数C
String resultC = Util.null2String(result.get("judgePartC"));
String compareC = Util.null2String(compareMap.get("judgePartC"));

11
src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
Unescape Escape View File

@ -355,7 +355,12 @@ public class UpdateAttendanceResultWrapper extends Service {
timeMinutes = qjscMinute;
}
log.debug("recordAskForLeave timeMinutes ：[{}] ,hsl:{},hsdw",timeMinutes,hsl,hsdw);
itemduration = Utils.getItemduration(hsl,hsdw,timeMinutes,AccountingUnitEnum.MINUTES,Double.valueOf(scheduleResult.get(0).get("edsc").toString()));
if (hsdw.equals(AccountingUnitEnum.HOUR.getKey()) && timeMinutes==qjscMinute){
itemduration = Double.valueOf(qjsc);
}else {
itemduration = Utils.getItemduration(hsl,hsdw,timeMinutes,AccountingUnitEnum.MINUTES,Double.valueOf(scheduleResult.get(0).get("edsc").toString()));
}
param.put("kssj",kssj);
param.put("jssj",jssj);
if (abnormalClockInList.size()>0){
@ -366,7 +371,7 @@ public class UpdateAttendanceResultWrapper extends Service {
}
if (sffzcx.equals(CheckBoxEnum.CHECKED.getKey())){
//按时间区间请假时 将连接的同一类型时段设置一种假别 计算出分钟时长后按核算量算出核算时长及单位即可
Map<String,Object> proportionMap = Utils.getAskLeaveAndEvctionProportion(kssj,jssj,scheduleResult,analysisDate);
Map<String,Object> proportionMap = Utils.getAskLeaveAndEvctionProportion(kssj,jssj,scheduleResult,analysisDate,zdycbcndfgzsd);
for (Map.Entry<String,Object> entry: proportionMap.entrySet()){
String bdlx = entry.getKey();
int betweenTimes = Integer.valueOf(entry.getValue().toString());
@ -560,7 +565,7 @@ public class UpdateAttendanceResultWrapper extends Service {
if (sffzcx.equals(CheckBoxEnum.CHECKED.getKey())){
//按时间区间请假时 将连接的同一类型时段设置一种假别 计算出分钟时长后按核算量算出核算时长及单位即可
Map<String,Object> proportionMap = Utils.getAskLeaveAndEvctionProportion(kssj,jssj,scheduleResult,analysisDate);
Map<String,Object> proportionMap = Utils.getAskLeaveAndEvctionProportion(kssj,jssj,scheduleResult,analysisDate,zdycbcndfgzsd);
for (Map.Entry<String,Object> entry: proportionMap.entrySet()){
String bdlx = entry.getKey();
int betweenTimes = Integer.valueOf(entry.getValue().toString());

70
src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java
Unescape Escape View File

@ -309,34 +309,35 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
entry.getValue(), editedEmpLeaveInfo.get(entry.getKey()), jbIdToHsdw, empIdToDateRatedHours.get(entry.getKey()));
}
if (detailListItem.size() > 0) {
Map<String,List<Map<String,String>>> detailGroup = detailListItem.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("ksrq"))+"&"+Util.null2String(e.get("jsrq"))));
List<Map<String,String>> newDetailListItem = Lists.newArrayList();
for (Map.Entry<String,List<Map<String,String>>> detailEntry :detailGroup.entrySet()){
String date = detailEntry.getKey();
List<Map<String,String>> detailList = detailEntry.getValue();
if (detailList.size() > 1){
String jqye = "";
double qjsc = 0;
for (Map<String,String> map:detailList){
if (!Util.null2String(map.get("jqye")).equals("")){
jqye += map.get("jqye")+",";
}
qjsc +=Double.valueOf(map.get("qjsc"));
}
if (!jqye.equals("")){
jqye = jqye.substring(0,jqye.length()-1);
}
detailList.get(0).put("jqye",jqye);
detailList.get(0).put("qjsc",Util.null2String(qjsc));
detailList.get(0).put("qjlx",holidayPriorityItemList.get(holidayPriorityItemList.size()-1).get("id").toString());
detailList.get(0).put("qjlxName",holidayPriorityItemList.get(holidayPriorityItemList.size()-1).get("mc").toString());
newDetailListItem.add(detailList.get(0));
}else {
newDetailListItem.addAll(detailList);
}
}
completeLeaveDetailList.addAll(newDetailListItem);
completeLeaveDetailList.addAll(detailListItem);
// Map<String,List<Map<String,String>>> detailGroup = detailListItem.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("ksrq"))+"&"+Util.null2String(e.get("jsrq"))));
// List<Map<String,String>> newDetailListItem = Lists.newArrayList();
// for (Map.Entry<String,List<Map<String,String>>> detailEntry :detailGroup.entrySet()){
// String date = detailEntry.getKey();
// List<Map<String,String>> detailList = detailEntry.getValue();
// if (detailList.size() > 1){
// String jqye = "";
// double qjsc = 0;
// for (Map<String,String> map:detailList){
// if (!Util.null2String(map.get("jqye")).equals("")){
// jqye += map.get("jqye")+",";
// }
// qjsc +=Double.valueOf(map.get("qjsc"));
// }
// if (!jqye.equals("")){
// jqye = jqye.substring(0,jqye.length()-1);
// }
// detailList.get(0).put("jqye",jqye);
// detailList.get(0).put("qjsc",Util.null2String(qjsc));
// detailList.get(0).put("qjlx",holidayPriorityItemList.get(holidayPriorityItemList.size()-1).get("id").toString());
// detailList.get(0).put("qjlxName",holidayPriorityItemList.get(holidayPriorityItemList.size()-1).get("mc").toString());
// newDetailListItem.add(detailList.get(0));
// }else {
// newDetailListItem.addAll(detailList);
// }
// }
//
// completeLeaveDetailList.addAll(newDetailListItem);
}
}
@ -1325,7 +1326,11 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
if (leaveHours > 0) {
holidayPriorityItemList = holidayPriorityItemList.stream().filter(f -> !checkAmountJqIdList.contains(f.get("id").toString())).collect(Collectors.toList());
if (holidayPriorityItemList.size() == 0) {
errorMessage.add(empName + "_" + ksrq + "假期余额不足！");
if (leaveDurationMap.get("minLeaveDurationSign") != null){
errorMessage.add(empName + "_" + ksrq + "不满足请假最小单位"+leaveDurationMap.get("minLeaveDurationSign")+"小时");
}else {
errorMessage.add(empName + "_" + ksrq + "假期余额不足！");
}
matchResultSign = false;
}
boolean jqlxEdited = false;
@ -1353,7 +1358,9 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
if (jqlxEdited) {
//人员id+日期+假期类型三种条件约束唯一性
message = message + "_" + ksrq + "本流程中已存在一笔该请假类型的请假明细！";
} else {
} else if (leaveDurationMap.get("minLeaveDurationSign") != null){
message = message + "_" + ksrq + "不满足请假最小单位"+leaveDurationMap.get("minLeaveDurationSign")+"小时";
}else {
//假期余额不足
message = message + "_" + ksrq + "假期余额不足！";
}
@ -1785,10 +1792,11 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic
//2-如果编辑记录中不存在，则需要判断是否满足最小使用时长
if (!minLeaveDurationSign) {
String minLeaveDuration = Util.null2String(holidayBalance.get("minLeaveDuration"));
minLeaveDurationSign = "".equals(minLeaveDuration) || totalLeaveDuration >= Double.parseDouble(minLeaveDuration);
minLeaveDurationSign = "".equals(minLeaveDuration) || leaveHours >= Double.parseDouble(minLeaveDuration);
}
//不满足最小使用时长，直接执行下一条
if (!minLeaveDurationSign) {
leaveDurationMap.put("minLeaveDurationSign",Double.valueOf(holidayBalance.get("minLeaveDuration").toString()));
continue;
}
//额定未休时长

19
src/com/engine/jucailinkq/common/util/DateUtil.java
Unescape Escape View File

@ -91,6 +91,10 @@ public class DateUtil {
LocalDateTime localDateTime = DateUtil.getTime(time);
return localDateTime.plusSeconds(seconds).format(yyyyMMddHHmmss);
}
public static String beforeSeconds(String time,long seconds){
LocalDateTime localDateTime = DateUtil.getTime(time);
return localDateTime.minusSeconds(seconds).format(yyyyMMddHHmmss);
}
public static String nowMonth(String time){
LocalDateTime localDateTime = LocalDate.parse(time, yyyyMMdd).atStartOfDay();
@ -276,6 +280,21 @@ public class DateUtil {
long daysBetween = ChronoUnit.MINUTES.between(startDate, endDate);
return Math.toIntExact(daysBetween);
}
/**
* 获得当前时间相差的分钟数
* @param startTime 开始时间 yyyy-MM-dd
* @return
*/
public static int getBetWeenMinutesOver(String startTime,String endTime){
LocalDateTime startDate = DateUtil.getTime(startTime);
LocalDateTime endDate = DateUtil.getTime(endTime);
long daysBetween = ChronoUnit.MINUTES.between(startDate, endDate);
if (daysBetween == 0 && startDate.compareTo(endDate)<0){
daysBetween=1;
}
return Math.toIntExact(daysBetween);
}
/**
* 获得两个时间相差的小时

26
src/com/engine/jucailinkq/common/util/Utils.java
Unescape Escape View File

@ -460,6 +460,22 @@ public class Utils<T> {
}
return betweenMinutes;
}
/**
* 请假、外出时间扣出休息时间
* @param kssj 开始时间
* @param jssj 结束时间
* @param scheduleResult 班次
* @return
*/
public static int removeRestTimeForLeaveEarly(String kssj,String jssj,List<Map<String, Object>> scheduleResult,String analysisDate){
scheduleResult = scheduleResult.stream().filter(e -> ClassSegmentTypeEnum.REST_AND_DINE.getKey().equals(e.get("bdlx")) ||
ClassSegmentTypeEnum.REST_PERIOD.getKey().equals(e.get("bdlx")) || ClassSegmentTypeEnum.DINING_PERIOD.getKey().equals(e.get("bdlx"))).collect(Collectors.toList());
int betweenMinutes = DateUtil.getBetWeenMinutesOver(kssj,jssj)-removeTime(kssj,jssj,scheduleResult,analysisDate);
if (betweenMinutes < 0){
betweenMinutes = 0;
}
return betweenMinutes;
}
/**
* 开始时间和结束时间在所给班次中的占比时间
@ -704,8 +720,11 @@ public class Utils<T> {
* @param analysisDate
* @return
*/
public static Map<String,Object> getAskLeaveAndEvctionProportion(String kssj,String jssj,List<Map<String, Object>> scheduleResult,String analysisDate){
public static Map<String,Object> getAskLeaveAndEvctionProportion(String kssj,String jssj,List<Map<String, Object>> scheduleResult,String analysisDate,String zdycbcndfgzsd){
Map<String,Object> resultMap = Maps.newHashMap();
List<Map<String, Object>> restSchedules = scheduleResult.stream().filter(e->(Utils.ifRestClassSegment(e.get("bdlx").toString()))).collect(Collectors.toList());
for (Map<String, Object> restSchedule :scheduleResult){
String dtkssj = Utils.getkssjTime(restSchedule,analysisDate);
String dtjssj = Utils.getjssjTime(restSchedule,analysisDate);
@ -729,6 +748,11 @@ public class Utils<T> {
log.debug("请假时间在休息时间中间");
}
if (betweenMinutes > 0){
if (zdycbcndfgzsd.equals(CheckBoxEnum.CHECKED.getKey())){
int restBetWeenMinute = removeTime(dtkssj,dtjssj,restSchedules,analysisDate);
betweenMinutes = betweenMinutes-restBetWeenMinute;
}
if (resultMap.get(restSchedule.get("bdlx")) == null){
resultMap.put(restSchedule.get("bdlx").toString(),betweenMinutes);
}else {

Write Preview
Loading…
Cancel
Save