mdc_430后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Lius
2025-06-09 a79d1641ab162cf1e96d3af666d1e77abde68c1b 
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java


@@ -22,9 +22,7 @@


import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.math.BigDecimal;


import java.time.Duration;


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.math.RoundingMode;


import java.util.ArrayList;


import java.util.Collections;


import java.util.List;


@@ -143,13 +141,7 @@


        BigDecimal result = new BigDecimal("0");


        if (list != null && !list.isEmpty()) {


            for (MdcEquipmentOvertime equipmentOvertime : list) {


                String date = DateUtils.format(DateUtils.toDate(validDate + "-01", DateUtils.STR_DATE), DateUtils.STR_DATE) + " ";


                String startTime = date + equipmentOvertime.getStartTime();


                String endTime = date + equipmentOvertime.getEndTime();


                LocalDateTime localStartTime = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern(DateUtils.STR_DATE_TIME_SMALL));


                LocalDateTime localEndTime = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern(DateUtils.STR_DATE_TIME_SMALL));


                int minutes = Math.toIntExact(Duration.between(localStartTime, localEndTime).toMinutes());


                result = result.add(new BigDecimal(minutes));


                result = result.add(equipmentOvertime.getDuration().divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP));


            }


        }


        return result;


@@ -163,7 +155,7 @@


     */


    @Override


    public boolean addOvertime(MdcEquipmentOvertime mdcEquipmentOvertime) {


        String[] equipmentIds = mdcEquipmentOvertime.getEquipmentIds().split(",");


        String[] equipmentIds = mdcEquipmentOvertime.getEquipmentId().split(",");


        List<MdcEquipmentOvertime> mdcEquipmentOvertimes = new ArrayList<>();


        // 计算时长(秒)


        String startTime = mdcEquipmentOvertime.getStartTime();