新版430
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zenglf
2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4 
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java


@@ -2,7 +2,6 @@




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import org.apache.commons.lang3.StringUtils;


@@ -16,16 +15,11 @@


import org.jeecg.modules.mdc.vo.MdcDeviceCalendarQueryVo;


import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.time.DayOfWeek;


import java.time.LocalDate;


import java.time.format.DateTimeFormatter;


import java.time.temporal.ChronoUnit;


import java.util.*;


import java.util.stream.Collectors;


import java.util.stream.Stream;




/**


 * @Description: 设备工作日历表


@@ -81,6 +75,7 @@


    }




    @Override


    @Transactional(rollbackFor = Exception.class)


    public boolean saveCalendar(EquipmentCalendarVo calendarVo) {


        String[] equipmentIdList = calendarVo.getEquipmentId().split(",");


        List<String> dateList = calendarVo.getDateList();


@@ -89,6 +84,7 @@


        for (String equipmentId : equipmentIdList) {


            for (String date : dateList) {


                for (MdcShiftSub mdcShiftSub : mdcShiftSubList) {


                    this.baseMapper.delete(new LambdaQueryWrapper<MdcDeviceCalendar>().eq(MdcDeviceCalendar::getEquipmentId, equipmentId).eq(MdcDeviceCalendar::getEffectiveDate, date));


                    MdcDeviceCalendar mdcDeviceCalendar = new MdcDeviceCalendar();


                    mdcDeviceCalendar.setEffectiveDate(date);


                    mdcDeviceCalendar.setEquipmentId(equipmentId);