加班管理功能调整

Lius

2024-01-26 09e22d89710364548fa896917506a372795a7bd3

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

@@ -7,12 +7,12 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.EquipmentMachingDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -47,6 +47,7 @@
            MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
            MdcTorqueConfig torqueConfig = new MdcTorqueConfig();
            torqueConfig.setEquipmentId(equipmentId);
            torqueConfig.setFeedParameter(mdcTorqueConfig.getFeedParameter());
            torqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
            torqueConfig.setTorqueDate(mdcTorqueConfig.getTorqueDate());
            torqueConfig.setTorqueValue(mdcTorqueConfig.getTorqueValue());
@@ -72,11 +73,6 @@
    @Override
    public Boolean deleteBatchTorque(String ids) {
        return this.removeBatchByIds(Arrays.asList(ids.split(",")));
    }

    @Override
    public List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue, String equipmentId) {
        return this.baseMapper.findSpindleRunningCurve(torqueValue, equipmentId);
    }

    @Override
@@ -170,9 +166,14 @@
        //获取当前登录用户
        //update-begin---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("扭矩配置列表数据", "导出人:"+user.getRealname(), "导出信息"));
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("扭矩配置列表数据", "导出人:"+user.getRealname(), "扭矩配置"));
        //update-end---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        mv.addObject(NormalExcelConstants.DATA_LIST, mdcTorqueConfigs);
        return mv;
    }

    @Override
    public List<EquipmentMachingDto> getWorkLineList(String equipmentId, Date startTime, Date endTime) {
        return this.baseMapper.getWorkLineList(equipmentId, startTime, endTime);
    }
}