update

lius

2023-08-18 4e927dc40033c016eac188e62072980b771e88dc

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java

@@ -812,9 +812,9 @@
                ert.setStartTime(logList.get(i).getCollectTime());
                ert.setEndTime(logList.get(i + 1).getCollectTime());
                ert.setDuration(DateUtils.differentSecond(ert.getStartTime(), ert.getEndTime()));
                if (ert.getDuration() > 0) {
                    erts.add(ert);
                }
//                if (ert.getDuration() > 0) {
                erts.add(ert);
//                }
            } else {
                long count = differentSecond / 86400;
                if (count % 86400 > 0) {

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcVacationManagementServiceImpl.java

@@ -112,8 +112,6 @@
     */
    @Override
    public void generateWeekDays() {
        List<String> alist = new ArrayList<>();
        String s = alist.get(10);
        MdcVacationManagement mdcVacationManagement = this.baseMapper.selectLastWeekDays();
        // 获取生成开始时间和结束时间
        LocalDate startDate;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java

@@ -75,10 +75,11 @@
    }

    /**
     * @return 获取两个date的时间差，结果为秒
     * @return 获取两个date的时间差，结果为秒 除
     */
    public static long differentSecond(Date startDate, Date endDate) {
        return (endDate.getTime() - startDate.getTime()) / 1000;
        return new BigDecimal(endDate.getTime() - startDate.getTime()).divide(new BigDecimal("1000"), 0, BigDecimal.ROUND_HALF_UP).longValue();
//        return (endDate.getTime() - startDate.getTime()) / 1000;
    }

    /**