zenglf
2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java
@@ -294,7 +294,7 @@
            queryWrapper.like(MdcNoplanClose::getEquipmentId, mdcNoplanClose.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcNoplanClose.getEquipmentName())) {
            queryWrapper.like(MdcNoplanClose::getEquipmentId, mdcNoplanClose.getEquipmentId());
            queryWrapper.like(MdcNoplanClose::getEquipmentName, mdcNoplanClose.getEquipmentName());
        }
        if (mdcNoplanClose.getEndTime() != null) {
            queryWrapper.le(MdcNoplanClose::getStartTime, mdcNoplanClose.getEndTime());
@@ -312,7 +312,7 @@
        //获取当前登录用户
        //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, mdcNoplanCloses);
        return mv;