diff --git a/log/sdk.log b/log/sdk.log index 5274a5d..5a71668 100644 --- a/log/sdk.log +++ b/log/sdk.log @@ -768,3 +768,9 @@ 2023-11-28 15:44:22,121 [main] [com.engine.common.util.Utils] [INFO] - 请假外出时间 右边 2023-11-28 15:49:22,060 [Timer-0] [A2] [INFO] - rootPath == null 2023-11-28 15:49:22,060 [Timer-0] [A2] [INFO] - filePath == nullWEB-INF\prop\isSyncLog4j.properties +2023-11-28 19:55:32,852 [main] [com.engine.common.util.Utils] [INFO] - 请假外出时间 右边 +2023-11-28 19:55:50,741 [main] [com.engine.common.util.Utils] [INFO] - 请假外出时间 右边 +2023-11-28 19:57:09,942 [main] [com.engine.common.util.Utils] [INFO] - 请假外出时间 右边 +2023-11-28 19:57:25,603 [main] [com.engine.common.util.Utils] [INFO] - 请假外出时间 右边 +2023-11-28 20:02:25,544 [Timer-0] [A2] [INFO] - rootPath == null +2023-11-28 20:02:25,545 [Timer-0] [A2] [INFO] - filePath == nullWEB-INF\prop\isSyncLog4j.properties diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar index 5ddd083..bec84ce 100644 Binary files a/out/artifacts/hrm_attendance/hrm-attendance.jar and b/out/artifacts/hrm_attendance/hrm-attendance.jar differ diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java index df38fc4..e147cdd 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java @@ -8,11 +8,12 @@ import com.engine.common.util.Utils; import com.engine.core.impl.Service; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import lombok.extern.slf4j.Slf4j; import weaver.general.Util; import java.util.List; import java.util.Map; - +@Slf4j public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAttendanceService { @Override public Map fullDayAbsenteeism(Map params) { @@ -66,7 +67,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt } if (workTimeBeLateItems.size() > 0){ Map saveWorkTimeBeLateParam = Maps.newHashMap(); - double hsl = Float.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); + double hsl = Double.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); String hsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw")); String kczgsc = Util.null2String(workTimeBeLateItems.get(0).get("kczgsc")); if (CheckBoxEnum.CHECKED.getKey().equals(kczgsc)){ @@ -104,19 +105,20 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt lateParams.put("workfor",WorkForTimeEnum.PLAN_WORK_OVERTIME.getKey()); } Map result = commandExecutor.execute(new WorkOvertimeItemCmd(lateParams)); - List> workTimeBeLateItems = (List>)result.get("attendanceItems"); - if (workTimeBeLateItems.size() > 0){ - double hsl = Float.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); - String hsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw")); - String jbwdhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbwdhlfzs")); + List> workTimeItems = (List>)result.get("attendanceItems"); + List> lateItems = getBeLateItems(lateParams); + if (workTimeItems.size() > 0 && lateItems.size() >0){ + double hsl = Double.valueOf(Util.null2String(lateItems.get(0).get("hsl"))); + String hsdw = Util.null2String(lateItems.get(0).get("hsdw")); + String jbwdhlfzs = Util.null2String(workTimeItems.get(0).get("jbwdhlfzs")); if (!"".equals(jbwdhlfzs) && between > Integer.valueOf(jbwdhlfzs)){ Map saveWorkTimeBeLateParam = Maps.newHashMap(); - String kczgsc = Util.null2String(workTimeBeLateItems.get(0).get("kczgsc")); + String kczgsc = Util.null2String(lateItems.get(0).get("kczgsc")); if (CheckBoxEnum.CHECKED.getKey().equals(kczgsc)){ //起步扣除分钟数 - int qbkcsc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("qbkcsc"))); + int qbkcsc = Integer.valueOf(Util.null2String(lateItems.get(0).get("qbkcsc"))); //超出后单次累加扣除分钟数 - int cckcbc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("cckcbc"))); + int cckcbc = Integer.valueOf(Util.null2String(lateItems.get(0).get("cckcbc"))); if (between <= qbkcsc){ between = qbkcsc; }else { @@ -126,7 +128,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt } } double itemduration = Utils.getItemduration(hsl,hsdw,between,AccountingUnitEnum.MINUTES); - saveWorkTimeBeLateParam.put("item",getBeLateItems(lateParams).get(0).get("key")); + saveWorkTimeBeLateParam.put("item",lateItems.get(0).get("key")); saveWorkTimeBeLateParam.put("itemduration",itemduration); saveWorkTimeBeLateParam.put("betweenMinutes",between); saveWorkTimeBeLateParam.put("itemType", AttendanceItemTypeEnum.LATE); @@ -147,17 +149,18 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt lateParams.put("workfor",WorkForTimeEnum.WORK_TIME.getKey()); result = commandExecutor.execute(new BeAwayItemCmd(lateParams)); } - List> workTimeBeLateItems = (List>)result.get("attendanceItems"); - double hsl = Float.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); - String hsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw")); - String thfghlfzs = Util.null2String(workTimeBeLateItems.get(0).get("thfghlfzs")); + List> beAwayItems = (List>)result.get("attendanceItems"); + List> lateItems = getBeLateItems(lateParams); + double hsl = Double.valueOf(Util.null2String(lateItems.get(0).get("hsl"))); + String hsdw = Util.null2String(lateItems.get(0).get("hsdw")); + String thfghlfzs = Util.null2String(beAwayItems.get(0).get("thfghlfzs")); if (!"".equals(thfghlfzs) && between> Integer.valueOf(thfghlfzs)){ - String kczgsc = Util.null2String(workTimeBeLateItems.get(0).get("kczgsc")); + String kczgsc = Util.null2String(lateItems.get(0).get("kczgsc")); if (CheckBoxEnum.CHECKED.getKey().equals(kczgsc)){ //起步扣除分钟数 - int qbkcsc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("qbkcsc"))); + int qbkcsc = Integer.valueOf(Util.null2String(lateItems.get(0).get("qbkcsc"))); //超出后单次累加扣除分钟数 - int cckcbc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("cckcbc"))); + int cckcbc = Integer.valueOf(Util.null2String(lateItems.get(0).get("cckcbc"))); if (between <= qbkcsc){ between = qbkcsc; }else { @@ -168,7 +171,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt } double itemduration = Utils.getItemduration(hsl,hsdw,between,AccountingUnitEnum.MINUTES); Map saveWorkTimeBeLateParam = Maps.newHashMap(); - saveWorkTimeBeLateParam.put("item",getBeLateItems(lateParams).get(0).get("key")); + saveWorkTimeBeLateParam.put("item",lateItems.get(0).get("key")); saveWorkTimeBeLateParam.put("itemduration",itemduration); saveWorkTimeBeLateParam.put("betweenMinutes",between); saveWorkTimeBeLateParam.put("itemType", AttendanceItemTypeEnum.LATE); @@ -227,7 +230,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt } if (workTimeBeLateItems.size() > 0){ Map saveWorkTimeBeLateParam = Maps.newHashMap(); - double hsl = Float.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); + double hsl = Double.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); String hsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw")); String kczgsc = Util.null2String(workTimeBeLateItems.get(0).get("kczgsc")); if (CheckBoxEnum.CHECKED.getKey().equals(kczgsc)){ @@ -246,7 +249,8 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt double itemduration = Utils.getItemduration(hsl,hsdw,between,AccountingUnitEnum.MINUTES); // saveWorkTimeBeLateParam.put("userId",userId); // saveWorkTimeBeLateParam.put("date",analysisDate); - saveWorkTimeBeLateParam.put("item",getBeEarlyItems(earlyParams).get(0).get("key")); + + saveWorkTimeBeLateParam.put("item",workTimeBeLateItems.get(0).get("key")); saveWorkTimeBeLateParam.put("itemduration",itemduration); saveWorkTimeBeLateParam.put("betweenMinutes",between); saveWorkTimeBeLateParam.put("itemType", AttendanceItemTypeEnum.LEAVE_EARLY); @@ -267,19 +271,21 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt earlyParams.put("workfor",WorkForTimeEnum.PLAN_WORK_OVERTIME.getKey()); } Map result = commandExecutor.execute(new WorkOvertimeItemCmd(earlyParams)); - List> workTimeBeLateItems = (List>)result.get("attendanceItems"); - if (workTimeBeLateItems.size() > 0){ - double hsl = Float.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); - String hsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw")); - String jbzzhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbzzhlfzs")); + List> workTimeItems = (List>)result.get("attendanceItems"); + List> beEarlyItems = getBeEarlyItems(earlyParams); + if (workTimeItems.size() > 0 && beEarlyItems.size() >0){ + String jbzzhlfzs = Util.null2String(workTimeItems.get(0).get("jbzzhlfzs")); + String hsdw = Util.null2String(beEarlyItems.get(0).get("hsdw")); + double hsl = Double.valueOf(Util.null2String(beEarlyItems.get(0).get("hsl"))); if (!"".equals(jbzzhlfzs) && between > Integer.valueOf(jbzzhlfzs)){ + log.info("between :{},jbzzhlfzs:{}",between,jbzzhlfzs); Map saveWorkTimeBeLateParam = Maps.newHashMap(); - String kczgsc = Util.null2String(workTimeBeLateItems.get(0).get("kczgsc")); + String kczgsc = Util.null2String(beEarlyItems.get(0).get("kczgsc")); if (CheckBoxEnum.CHECKED.getKey().equals(kczgsc)){ //起步扣除分钟数 - int qbkcsc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("qbkcsc"))); + int qbkcsc = Integer.valueOf(Util.null2String(beEarlyItems.get(0).get("qbkcsc"))); //超出后单次累加扣除分钟数 - int cckcbc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("cckcbc"))); + int cckcbc = Integer.valueOf(Util.null2String(beEarlyItems.get(0).get("cckcbc"))); if (between <= qbkcsc){ between = qbkcsc; }else { @@ -289,7 +295,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt } } double itemduration = Utils.getItemduration(hsl,hsdw,between,AccountingUnitEnum.MINUTES); - saveWorkTimeBeLateParam.put("item",getBeEarlyItems(earlyParams).get(0).get("key")); + saveWorkTimeBeLateParam.put("item",beEarlyItems.get(0).get("key")); saveWorkTimeBeLateParam.put("itemduration",itemduration); saveWorkTimeBeLateParam.put("betweenMinutes",between); saveWorkTimeBeLateParam.put("itemType", AttendanceItemTypeEnum.LEAVE_EARLY); @@ -310,17 +316,18 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt earlyParams.put("workfor",WorkForTimeEnum.WORK_TIME.getKey()); result = commandExecutor.execute(new BeAwayItemCmd(earlyParams)); } - List> workTimeBeLateItems = (List>)result.get("attendanceItems"); - double hsl = Float.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); - String hsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw")); - String tqlghlfzs = Util.null2String(workTimeBeLateItems.get(0).get("tqlghlfzs")); - if (!"".equals(tqlghlfzs) && between> Integer.valueOf(tqlghlfzs)){ - String kczgsc = Util.null2String(workTimeBeLateItems.get(0).get("kczgsc")); + List> beAwayItems = (List>)result.get("attendanceItems"); + List> beEarlyItems = getBeEarlyItems(earlyParams); + double hsl = Double.valueOf(Util.null2String(beEarlyItems.get(0).get("hsl"))); + String hsdw = Util.null2String(beEarlyItems.get(0).get("hsdw")); + String tqlghlfzs = Util.null2String(beAwayItems.get(0).get("tqlghlfzs")); + if (!"".equals(tqlghlfzs) && between> Integer.valueOf(tqlghlfzs) && beEarlyItems.size()>0){ + String kczgsc = Util.null2String(beEarlyItems.get(0).get("kczgsc")); if (CheckBoxEnum.CHECKED.getKey().equals(kczgsc)){ //起步扣除分钟数 - int qbkcsc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("qbkcsc"))); + int qbkcsc = Integer.valueOf(Util.null2String(beEarlyItems.get(0).get("qbkcsc"))); //超出后单次累加扣除分钟数 - int cckcbc = Integer.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("cckcbc"))); + int cckcbc = Integer.valueOf(Util.null2String(beEarlyItems.get(0).get("cckcbc"))); if (between <= qbkcsc){ between = qbkcsc; }else { @@ -332,7 +339,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt double itemduration = Utils.getItemduration(hsl,hsdw,between,AccountingUnitEnum.MINUTES); Map saveWorkTimeBeLateParam = Maps.newHashMap(); - saveWorkTimeBeLateParam.put("item",getBeEarlyItems(earlyParams).get(0).get("key")); + saveWorkTimeBeLateParam.put("item",beEarlyItems.get(0).get("key")); saveWorkTimeBeLateParam.put("itemduration",itemduration); saveWorkTimeBeLateParam.put("betweenMinutes",between); saveWorkTimeBeLateParam.put("itemType", AttendanceItemTypeEnum.LEAVE_EARLY); diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java index 1c51560..97fa3ed 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java @@ -147,6 +147,10 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ double workOverTimeHsl = Double.valueOf(Util.null2String(workTimeBeLateItems.get(0).get("hsl"))); //核算单位 String workOverTimeHsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw")); + //晚于开始时间忽略分钟数 + String jbwdhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbwdhlfzs")); + //早于结束时间忽略分钟数 + String jbzzhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbzzhlfzs")); /** * 获得实际加班时间 @@ -160,7 +164,11 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ resultLists.add(workOverTimeItems); continue; } - String signTime = clcokInTimeData.get("signdate")+" "+clcokInTimeData.get("signtime"); + String hourTime = clcokInTimeData.get("signtime").toString(); + if (hourTime.length() > 5){ + hourTime = hourTime.substring(0,5); + } + String signTime = clcokInTimeData.get("signdate")+" "+hourTime; realityStartTime = signTime; }else { realityStartTime = kssj; @@ -174,7 +182,11 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ resultLists.add(workOverTimeItems); continue; } - String signTime = clcokInTimeData.get("signdate")+" "+clcokInTimeData.get("signtime"); + String hourTime = clcokInTimeData.get("signtime").toString(); + if (hourTime.length() > 5){ + hourTime = hourTime.substring(0,5); + } + String signTime = clcokInTimeData.get("signdate")+" "+hourTime; realityEndime = signTime; }else { realityEndime= jssj; @@ -219,6 +231,9 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ }else { if (DateUtil.getTime(realityStartTime).compareTo(DateUtil.getTime(kssj)) >0){ beLateTime = DateUtil.getBetWeenMinutes(kssj,realityStartTime); + if (!"".equals(jbwdhlfzs) && beLateTime < Integer.valueOf(jbwdhlfzs)){ + beLateTime=0; + } } } /** @@ -244,11 +259,13 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ }else if (AccountingUnitEnum.ONCE.getKey().equals(hsdw)){ leaveElaryTime = jbsc; } - } }else { if (DateUtil.getTime(realityEndime).compareTo(DateUtil.getTime(jssj)) <0){ leaveElaryTime = DateUtil.getBetWeenMinutes(realityEndime,jssj); + if (!"".equals(jbzzhlfzs) && leaveElaryTime < Integer.valueOf(jbzzhlfzs)){ + leaveElaryTime=0; + } } } @@ -278,7 +295,8 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ resultLists.add(workOverTimeItems); continue; }else if (jbsc >= Integer.valueOf(jbqsfzs) && !"".equals(ccqszhdhsfzs)){ - jbsc = Double.valueOf(Utils.getItemdurationDown(Integer.valueOf(ccqszhdhsfzs),AccountingUnitEnum.MINUTES.getKey(),Double.valueOf(jbsc).intValue(),AccountingUnitEnum.MINUTES)).intValue(); + + jbsc = Double.valueOf(Utils.getItemdurationDown(Integer.valueOf(ccqszhdhsfzs),AccountingUnitEnum.MINUTES.getKey(),Double.valueOf(jbsc).intValue()-Integer.valueOf(jbqsfzs),AccountingUnitEnum.MINUTES)).intValue()+Integer.valueOf(jbqsfzs); } } if (jbsc < 0){ @@ -343,7 +361,7 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ insertParam.put("sjkssj",realityStartTime.split(" ")[1]); insertParam.put("sjjsrq",realityEndime.split(" ")[0]); insertParam.put("sjjssj",realityEndime.split(" ")[1]); - insertParam.put("sjjbsc",String.format ("%.2f", jbsc/60)); + insertParam.put("sjjbsc",itemduration); insertParam.put("jbjgly","4"); insertParam.put("zt","1"); Utils.InsertFormTable("uf_jcl_kq_jbjg",insertParam,(Map)params.get("formmodeIdMap")); @@ -395,7 +413,7 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ //一年 insertHoliDayParam.put("jzrq",DateUtil.nextMonth(analysisDate,12,DateUtil.yyyyMMdd)); } - insertHoliDayParam.put("ktsc",String.format ("%.2f", jbsc/60)); + insertHoliDayParam.put("ktsc",itemduration); String zdyqsc = Util.null2String(workTimeBeLateItems.get(0).get("zdyqsc")); if ("0".equals(zdyqsc)){ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class index dc81a9b..1133aaf 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class and b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class differ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class index d30ef35..aed5c1d 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class and b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class differ diff --git a/target/test-classes/Test$1.class b/target/test-classes/Test$1.class index b205d27..1e2b2a0 100644 Binary files a/target/test-classes/Test$1.class and b/target/test-classes/Test$1.class differ diff --git a/target/test-classes/Test$10.class b/target/test-classes/Test$10.class index 62a2fcf..43d0708 100644 Binary files a/target/test-classes/Test$10.class and b/target/test-classes/Test$10.class differ diff --git a/target/test-classes/Test$11.class b/target/test-classes/Test$11.class index 94d1724..fe20f8a 100644 Binary files a/target/test-classes/Test$11.class and b/target/test-classes/Test$11.class differ diff --git a/target/test-classes/Test$12.class b/target/test-classes/Test$12.class index 32cafc6..7f00bf3 100644 Binary files a/target/test-classes/Test$12.class and b/target/test-classes/Test$12.class differ diff --git a/target/test-classes/Test$13.class b/target/test-classes/Test$13.class index 44d1f46..fc0363f 100644 Binary files a/target/test-classes/Test$13.class and b/target/test-classes/Test$13.class differ diff --git a/target/test-classes/Test$2.class b/target/test-classes/Test$2.class index 6874ae5..db1928d 100644 Binary files a/target/test-classes/Test$2.class and b/target/test-classes/Test$2.class differ diff --git a/target/test-classes/Test$3.class b/target/test-classes/Test$3.class index 9e5d09a..3634031 100644 Binary files a/target/test-classes/Test$3.class and b/target/test-classes/Test$3.class differ diff --git a/target/test-classes/Test$4.class b/target/test-classes/Test$4.class index 4f3eef7..66b1496 100644 Binary files a/target/test-classes/Test$4.class and b/target/test-classes/Test$4.class differ diff --git a/target/test-classes/Test$5.class b/target/test-classes/Test$5.class index 657c652..48401f1 100644 Binary files a/target/test-classes/Test$5.class and b/target/test-classes/Test$5.class differ diff --git a/target/test-classes/Test$6.class b/target/test-classes/Test$6.class index 23d4c38..90f1c11 100644 Binary files a/target/test-classes/Test$6.class and b/target/test-classes/Test$6.class differ diff --git a/target/test-classes/Test$7.class b/target/test-classes/Test$7.class index c6717db..7cff7c2 100644 Binary files a/target/test-classes/Test$7.class and b/target/test-classes/Test$7.class differ diff --git a/target/test-classes/Test$8.class b/target/test-classes/Test$8.class index 6df0d98..f4ed027 100644 Binary files a/target/test-classes/Test$8.class and b/target/test-classes/Test$8.class differ diff --git a/target/test-classes/Test$9.class b/target/test-classes/Test$9.class index 36a59f2..fd531bc 100644 Binary files a/target/test-classes/Test$9.class and b/target/test-classes/Test$9.class differ diff --git a/target/test-classes/Test.class b/target/test-classes/Test.class index 2b8f3f2..0ffb9b0 100644 Binary files a/target/test-classes/Test.class and b/target/test-classes/Test.class differ diff --git a/test/Test.java b/test/Test.java index 88624ae..58cb8ab 100644 --- a/test/Test.java +++ b/test/Test.java @@ -1,25 +1,12 @@ import com.engine.attendance.attendanceanalysis.cmd.GetClockInTimeItemCmd; -import com.engine.attendance.attendanceanalysis.service.UtilService; -import com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl; -import com.engine.attendance.enums.AccountingUnitEnum; import com.engine.common.util.DateUtil; -import com.engine.common.util.ServiceUtil; import com.engine.common.util.Utils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import io.swagger.models.auth.In; -import weaver.general.TimeUtil; import weaver.general.Util; - -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; @@ -27,6 +14,7 @@ import java.util.stream.Collectors; public class Test { public static void main(String[] args) { + System.out.println("18:13:00".substring(0,5)); // Map params = Maps.newHashMap(); // List> attendanceItems = new ArrayList<>(); // Map map = new HashMap<>(); @@ -71,13 +59,8 @@ public class Test { // System.out.println(i); // } // System.out.println("aaaa"); - Map map = Maps.newHashMap(); - map.put("ksrq","2023-11-25"); - map.put("jssj","14:00"); - map.put("jsrq","2023-11-25"); - map.put("kssj","10:00"); - System.out.println(Utils.getStartAndEndTime("2023-11-25 09:00","2023-11-25 13:00",map)); + System.out.println(DateUtil.getBetWeenMinutes("2023-11-25 20:45:00","2023-11-25 21:00")); //System.out.println(Util.getIntValue("")); // List> beforeleaveDate = Lists.newArrayList(); // for (int i=beforeleaveDate.size()-1;i>=0;i--){