设备管理问题修改

qushaowei

2024-03-13 c127accdddb76d11847f41b5685f5ef5e9e988d7

设备管理问题修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java

@@ -11,9 +11,11 @@
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
@@ -21,6 +23,8 @@
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.InspectionStandardImportVo;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.service.*;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +33,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -64,6 +69,19 @@

    @Autowired
    private IInspectionCycleService inspectionCycleService;

    @Autowired
    private ISysBaseAPI sysBaseApi;
    @Autowired
    private ISysUserService sysUserService;
    @Resource
    private ISysRoleService sysRoleService;
    @Resource
    private ISysDictService sysDictService;
    @Resource
    private ISysDictItemService sysDictItemService;
    @Resource
    private ISysUserRoleService sysUserRoleService;
    /**
     * 分页列表查询
     *
@@ -142,6 +160,8 @@
            isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId());
            dailyInspectionStandardDetailService.save(isd);
        }
        //消息提醒
        this.inspectionStandardAlert(dailyInspectionStandard.getApprovalStatus(),dailyInspectionStandard.getNum());
        return Result.OK("添加成功！");
    }

@@ -179,6 +199,8 @@
            isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId());
            dailyInspectionStandardDetailService.save(isd);
        }
        //消息提醒
        this.inspectionStandardAlert(dailyInspectionStandard.getApprovalStatus(),dailyInspectionStandard.getNum());
        return Result.OK("编辑成功!");
    }

@@ -570,12 +592,81 @@
        }
        boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
        if (b){
            if(!"5".equals(approvalStatus)){//已编制
                this.inspectionStandardAlert(approvalStatus,dailyInspectionStandard.getNum());
            }

            return Result.OK("审核成功!");
        }else{
            return Result.error("审核失败!");
        }
    }

    /**
     *点检标准签审流程消息提醒
     * qsw 2024-3-11
     */
    void inspectionStandardAlert(String approvalStatus,String standardNum){

        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
        SysDictItem sysDictItem = null;
        String roleDictItem = "";
        if("1".equals(approvalStatus)){//已编制
            roleDictItem = "点检标准审核";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","点检标准审核")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("2".equals(approvalStatus)){//驳回编制
            roleDictItem = "点检标准编制";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","点检标准编制")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("3".equals(approvalStatus)){//已审核
            roleDictItem = "点检标准审批";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","点检标准审批")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("4".equals(approvalStatus)){//驳回审核
            roleDictItem = "点检标准审核";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","点检标准审核")
                    .eq("dict_id",sysDict.getId()),false);
        }
//        else if("5".equals(approvalStatus)){//通过
//            roleDictItem = "点检标准审批";
//            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
//                    .eq("item_text","点检标准审批")
//                    .eq("dict_id",sysDict.getId()),false);
//        }
        String roleCode = sysDictItem.getItemValue();
        SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false);
        List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId()));
        for(SysUserRole sysUserRole:sysUserRoles){
            SysUser user = sysUserService.getById(sysUserRole.getUserId());
            String msg = "";
            if("1".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的自主维护点检标准编制成功，请到自主维护点检标准页面审核！";
            }else if("2".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的自主维护点检标准已驳回，请到自主维护点检标准页面查看！";
            }else if("3".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的自主维护点检标准审核通过，请到自主维护点检标准页面审批！";
            }else if("4".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的自主维护点检标准已驳回，请到自主维护点检标准页面查看！";
            }
//            else if("5".equals(approvalStatus)){
//                msg = "【"+sysUser.getRealname()+"】"+"将二级保养工单号【"+standardNum+"】的完工移交单确认通过，请到二级保养页面查看！";
//            }
            MessageDTO messageDTO = new MessageDTO();
            messageDTO.setTitle("自主维护点检标准签审消息提醒！");
            messageDTO.setContent(msg);
            messageDTO.setCategory(roleDictItem);
            messageDTO.setFromUser("自主维护点检标准签审消息提醒提醒小助手");
            messageDTO.setToUser(user.getUsername());
            sysBaseApi.sendSysAnnouncement(messageDTO);
        }
    }


    /**
     * 批量 签审流程

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java

@@ -158,12 +158,16 @@
            String id = (String) record.get("id");
            String equipmentId = (String) record.get("equipmentId");
            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);
//            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
//            record.put("maintenanceCycles", maintenanceCycles);

            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
//            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
//            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);

            List<Map<String, Object>> operationUserDetails = dailyMaintenanceOrderService.getOperationUser(id);
            record.put("operationUserDetails", operationUserDetails);
            List<Map<String, Object>> repairUserDetails = dailyMaintenanceOrderService.getRepairUser(id);
            record.put("repairUserDetails", repairUserDetails);
            //统计工时定额
//            BigDecimal workingHourQuota = new BigDecimal(0);
//            for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
@@ -203,16 +207,20 @@
            for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
                String operateUser = finishTransferOrder.getOperateUser();
//                record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1());
                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
//                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser));
                String repairUser = finishTransferOrder.getRepairUser();
//                record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2());
                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
//                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser));
                String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
//                record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3());
                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
//                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser));
                String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
//                record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4());
                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
//                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser));
            }

        }
@@ -230,10 +238,10 @@
        List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
        for (Map<String, Object> record : records) {
            String id = (String) record.get("id");
            String equipmentId = (String) record.get("equipmentId");
            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);
//            String equipmentId = (String) record.get("equipmentId");
//            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
//            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
//            record.put("maintenanceCycles", maintenanceCycles);

            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
            //统计工时定额
@@ -654,6 +662,7 @@

        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
            maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
            dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
        }

@@ -685,6 +694,7 @@

        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
            maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
            dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
        }

@@ -778,10 +788,12 @@
        String orderId = dailyMaintenanceOrder.getId();
        String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3();
        String confirmStatus = dailyMaintenanceOrder.getConfirmStatus();
        Date maintenanceDate = dailyMaintenanceOrder.getMaintenanceDate();

        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
        String equipmentId = maintenanceOrder.getEquipmentId();
        String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3();
        maintenanceOrder.setMaintenanceDate(maintenanceDate);
        if(StringUtils.isBlank(orderUda3)){
            maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
        }

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java

@@ -181,7 +181,7 @@
    }

    /**
     * 获取日常点检工单明细
     * 二保工单明细
     * 2023-4-25 qsw
     */
    @GetMapping(value = "/getDailyMaintenanceOrderDetailList")
@@ -216,4 +216,25 @@
        return Result.ok(dailyMaintenanceOrderDetailList);
    }

    /**
     * 三保工单明细
     * 2023-4-25 qsw
     */
    @GetMapping(value = "/get3MaintenanceOrderDetailList")
    @PermissionData
    public Result<?> get3MaintenanceOrderDetailList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> dailyMaintenanceOrderDetailList = dailyMaintenanceOrderDetailService.get3MaintenanceOrderDetailList(pageNo, pageSize, params);
        for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) {
            String dailyMaintenanceOrderId = (String)record.get("dailyMaintenanceOrderId");
            DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(dailyMaintenanceOrderId);
            if("4".equals(dailyMaintenanceOrder.getStatus())){
                record.put("disabled",false);
            }else{
                record.put("disabled",true);
            }
        }
        return Result.ok(dailyMaintenanceOrderDetailList);
    }


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java

@@ -132,32 +132,32 @@
         List<Map<String, Object>> records = inspectionOrderList.getRecords();
         for (Map<String, Object> record : records) {
             String id = (String)record.get("id");
             String equipmentId = (String)record.get("equipmentId");
             String status = (String)record.get("status");
             String inspectionStandardId = (String)record.get("inspectionStandardId");
             List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
             record.put("inspectionCycles",inspectionCycles);
//             String equipmentId = (String)record.get("equipmentId");
//             String status = (String)record.get("status");
//             String inspectionStandardId = (String)record.get("inspectionStandardId");
//             List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
//             record.put("inspectionCycles",inspectionCycles);

             List<Map<String, Object>> inspectionOrderDetails = inspectionOrderService.getInspectionOrderDetailByOrderId(id);
             record.put("inspectionOrderDetails",inspectionOrderDetails);


             List<InspectionOrderDetail> failCount = inspectionOrderDetailService.lambdaQuery()
                     .eq(InspectionOrderDetail::getInspectionOrderId, id)
                     .eq(InspectionOrderDetail::getJudgmentResult, "fail")
                     .eq(InspectionOrderDetail::getDelFlag, 0).list();
//             List<InspectionOrderDetail> failCount = inspectionOrderDetailService.lambdaQuery()
//                     .eq(InspectionOrderDetail::getInspectionOrderId, id)
//                     .eq(InspectionOrderDetail::getJudgmentResult, "fail")
//                     .eq(InspectionOrderDetail::getDelFlag, 0).list();
//
//             List<InspectionOrderDetail> passCount = inspectionOrderDetailService.lambdaQuery()
//                     .eq(InspectionOrderDetail::getInspectionOrderId, id)
//                     .eq(InspectionOrderDetail::getJudgmentResult,"pass")
//                     .eq(InspectionOrderDetail::getDelFlag, 0).list();
//             record.put("result","正常:"+passCount.size()+"，"+"异常:"+failCount.size());

             List<InspectionOrderDetail> passCount = inspectionOrderDetailService.lambdaQuery()
                     .eq(InspectionOrderDetail::getInspectionOrderId, id)
                     .eq(InspectionOrderDetail::getJudgmentResult,"pass")
                     .eq(InspectionOrderDetail::getDelFlag, 0).list();
             record.put("result","正常:"+passCount.size()+"，"+"异常:"+failCount.size());

             if("5".equals(status) ){
                 record.put("distable",true);
             }else{
                 record.put("distable",false);
             }
//             if("5".equals(status) ){
//                 record.put("distable",true);
//             }else{
//                 record.put("distable",false);
//             }
         }
         return Result.ok(inspectionOrderList);
     }
@@ -570,6 +570,7 @@
             }
         }
         inspectionOrder.setActualEndTime(new Date());
         inspectionOrder.setInspectionOrderUda2(sysUser.getRealname());
         boolean b = inspectionOrderService.updateById(inspectionOrder);
         if (!b) {
             return Result.error("报工失败!");

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java

@@ -13,6 +13,7 @@
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.xwpf.usermodel.*;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -23,6 +24,8 @@
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.service.*;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -32,6 +35,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -96,6 +100,16 @@
//    private IUploadService uploadService;
    @Autowired
    private ISysBaseAPI sysBaseApi;
    @Autowired
    private ISysUserService sysUserService;
    @Resource
    private ISysRoleService sysRoleService;
    @Resource
    private ISysDictService sysDictService;
    @Resource
    private ISysDictItemService sysDictItemService;
    @Resource
    private ISysUserRoleService sysUserRoleService;

    /**
     * 分页列表查询
@@ -196,6 +210,11 @@
            maintenanceStandardDetail.setPhoto(maintenanceStandardDetail.getPhoto());
            maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
        }
        if("2".equals(maintenanceType)){
            this.maintenance2StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum());
        }else{
            this.maintenance3StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum());
        }
        return Result.OK("添加成功！");
    }

@@ -228,6 +247,11 @@
            }
            maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
            maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
        }
        if("2".equals(maintenanceStandard.getMaintenanceType())){
            this.maintenance2StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum());
        }else{
            this.maintenance3StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum());
        }
        return Result.OK("编辑成功!");
    }
@@ -704,11 +728,133 @@
        }
        boolean b = maintenanceStandardService.updateById(maintenanceStandard);
        if (b){
            //签审流程消息通知
            if(!"5".equals(approvalStatus)){//已编制
                if("2".equals(maintenanceStandard.getMaintenanceType())){
                    this.maintenance2StandardAlert(approvalStatus,maintenanceStandard.getNum());
                }else{
                    this.maintenance3StandardAlert(approvalStatus,maintenanceStandard.getNum());
                }
            }
            return Result.OK("审核成功!");
        }else{
            return Result.error("审核失败!");
        }
    }

    /**
     *二级保养标准签审流程消息提醒
     * qsw 2024-3-11
     */
    void maintenance2StandardAlert(String approvalStatus,String standardNum){

        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
        SysDictItem sysDictItem = null;
        String roleDictItem = "";
        if("1".equals(approvalStatus)){//已编制
            roleDictItem = "二级保养标准审核";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","二级保养标准审核")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("2".equals(approvalStatus)){//驳回编制
            roleDictItem = "二级保养标准编制";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","二级保养标准编制")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("3".equals(approvalStatus)){//已审核
            roleDictItem = "二级保养标准审批";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","二级保养标准审批")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("4".equals(approvalStatus)){//驳回审核
            roleDictItem = "二级保养标准审核";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","二级保养标准审核")
                    .eq("dict_id",sysDict.getId()),false);
        }
        String roleCode = sysDictItem.getItemValue();
        SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false);
        List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId()));
        for(SysUserRole sysUserRole:sysUserRoles){
            SysUser user = sysUserService.getById(sysUserRole.getUserId());
            String msg = "";
            if("1".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的二级保养标准编制成功，请到二级保养标准页面审核！";
            }else if("2".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的二级保养标准已驳回，请到二级保养标准页面查看！";
            }else if("3".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的二级保养标准审核通过，请到二级保养标准页面审批！";
            }else if("4".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的二级保养标准已驳回，请到二级保养标准页面查看！";
            }
            MessageDTO messageDTO = new MessageDTO();
            messageDTO.setTitle("二级保养标准签审消息提醒！");
            messageDTO.setContent(msg);
            messageDTO.setCategory(roleDictItem);
            messageDTO.setFromUser("二级保养标准签审消息提醒提醒小助手");
            messageDTO.setToUser(user.getUsername());
            sysBaseApi.sendSysAnnouncement(messageDTO);
        }
    }

    /**
     *三级保养标准签审流程消息提醒
     * qsw 2024-3-11
     */
    void maintenance3StandardAlert(String approvalStatus,String standardNum){

        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
        SysDictItem sysDictItem = null;
        String roleDictItem = "";
        if("1".equals(approvalStatus)){//已编制
            roleDictItem = "三级保养标准审核";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","三级保养标准审核")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("2".equals(approvalStatus)){//驳回编制
            roleDictItem = "三级保养标准编制";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","三级保养标准编制")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("3".equals(approvalStatus)){//已审核
            roleDictItem = "三级保养标准审批";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","三级保养标准审批")
                    .eq("dict_id",sysDict.getId()),false);
        }else if("4".equals(approvalStatus)){//驳回审核
            roleDictItem = "三级保养标准审核";
            sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>()
                    .eq("item_text","三级保养标准审核")
                    .eq("dict_id",sysDict.getId()),false);
        }
        String roleCode = sysDictItem.getItemValue();
        SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false);
        List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId()));
        for(SysUserRole sysUserRole:sysUserRoles){
            SysUser user = sysUserService.getById(sysUserRole.getUserId());
            String msg = "";
            if("1".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的三级保养标准编制成功，请到三级保养标准页面审核！";
            }else if("2".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的三级保养标准已驳回，请到三级保养标准页面查看！";
            }else if("3".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的三级保养标准审核通过，请到三级保养标准页面审批！";
            }else if("4".equals(approvalStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将【"+standardNum+"】的三级保养标准已驳回，请到三级保养标准页面查看！";
            }
            MessageDTO messageDTO = new MessageDTO();
            messageDTO.setTitle("三级保养标准签审消息提醒！");
            messageDTO.setContent(msg);
            messageDTO.setCategory(roleDictItem);
            messageDTO.setFromUser("三级保养标准签审消息提醒提醒小助手");
            messageDTO.setToUser(user.getUsername());
            sysBaseApi.sendSysAnnouncement(messageDTO);
        }
    }


    // 获取合并单元格的值
    private  String getMergedCellValue(XWPFTableCell cell) {
        // 对于合并单元格，获取第一个段落的文本作为合并单元格的值

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java

@@ -117,6 +117,11 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "保养日期")
    private Date maintenanceDate;

    @ApiModelProperty(value = "二保移交单确认状态（0未确认，1操作员确认，2驳回操作员，3维修确认，4驳回维修员，5维修室主任确认，6驳回维修室主任，7设备检验员确认）")
    private String confirmStatus;


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java

@@ -189,7 +189,8 @@
                }


            }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.FRIDAY){
//            }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.FRIDAY){
            }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.MONDAY){
                //保存点检工单主表数据
                InspectionOrder inspectionOrder = new InspectionOrder();
                inspectionOrder.setNum(identityService.getNumByTypeAndLength("DailylnspectionOrder",4));

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java

@@ -18,4 +18,6 @@

    IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params,String sql);

    IPage<Map<String, Object>> get3MaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params);

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderMapper.java

@@ -22,6 +22,10 @@
    //日常保养工单编辑时，回显保养项目 （手动生成日常保养工单）
    List<Map<String, Object>> getDailyMaintenanceOrderDetailByOrderId(@Param("dailyMaintenanceOrderId")String dailyMaintenanceOrderId);

    List<Map<String, Object>> getOperationUser(@Param("dailyMaintenanceOrderId")String dailyMaintenanceOrderId);

    List<Map<String, Object>> getRepairUser(@Param("dailyMaintenanceOrderId")String dailyMaintenanceOrderId);

    IPage<Map<String, Object>> getDailyMaintenanceOrderList(IPage<Map> pageData, @Param("params") Map<String,Object> params);

    IPage<Map<String, Object>> getDailyMaintenanceOrder3List(IPage<Map> pageData, @Param("params") Map<String,Object> params);

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml

@@ -18,6 +18,42 @@
            t5.name as maintenanceSpecialtyName,
            t1.daily_maintenance_order_id as dailyMaintenanceOrderId,
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2,
            t7.item_text as maintenanceRole
        FROM
            mom_eam_daily_maintenance_order_detail t1
        LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id
        LEFT JOIN mom_eam_maintenance_project t3 ON t1.maintenance_project_id = t3.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
        LEFT JOIN mom_eam_maintenance_specialty t5 ON t3.maintenance_specialty_id = t5.id
        LEFT JOIN mom_eam_maintenance_cycle t6 ON t2.maintenance_cycle_id = t6.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t2.maintenance_role
        WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0
        <if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''">
            and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId}
        </if>
        <if test="sql != '' and sql != null">
            ${sql}
        </if>
        ORDER BY t1.create_time desc
    </select>

    <select id="get3MaintenanceOrderDetailList"  parameterType="Map" resultType="Map">
        SELECT
            t1.id,
            t2.location,
            t2.photo,
            t1.maintenance_standard_detail_id as maintenanceStandardDetailId,
            t3.name as maintenanceProjectNum,
            t3.standard,
            t3.working_hour_quota as workingHourQuota,
            t4.item_text as maintenanceMethodName,
            t3.maintenance_tool as maintenanceTool,
            t3.maintenance_require as maintenanceRequire,
            t6.name as maintenanceCycleName,
            t5.name as maintenanceSpecialtyName,
            t1.daily_maintenance_order_id as dailyMaintenanceOrderId,
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM
            mom_eam_daily_maintenance_order_detail t1
@@ -26,12 +62,10 @@
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
        LEFT JOIN mom_eam_maintenance_specialty t5 ON t3.maintenance_specialty_id = t5.id
        LEFT JOIN mom_eam_maintenance_cycle t6 ON t2.maintenance_cycle_id = t6.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t2.maintenance_role
        WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0
        <if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''">
            and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId}
        </if>
        <if test="sql != '' and sql != null">
            ${sql}
        </if>
        ORDER BY t1.create_time desc
    </select>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml

@@ -76,7 +76,7 @@
            t1.plan_end_time as planEndTime,
            t1.actual_start_time as actualStartTime,
            t1.actual_end_time as actualEndTime,
            t1.maintenance_user_id as maintenanceUserId,
            t1.maintenance_date as maintenanceDate,
            t9.item_text as assignModeName,
            t1.create_by as createBy,
            t1.create_time as createTime,
@@ -106,64 +106,84 @@
        <if test="params.num != null and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')
        </if>
        <if test="params.equipmentNum != null and params.equipmentNum != ''">
            and t3.num like concat('%',#{params.equipmentNum},'%')
        </if>
        <if test="params.useDepartId != null and params.useDepartId != ''">
            and t3.use_id = #{params.useDepartId}
        </if>
        <if test="params.status != null and params.status != ''">
            and t1.status = #{params.status}
        </if>
        <if test="params.confirmStatus != null and params.confirmStatus != ''">
            and t1.confirm_status  = #{params.confirmStatus}
        </if>
        <if test="params.teamId != null and params.teamId != ''">
            and t3.team_id = #{params.teamId}
        </if>
        <if test="params.finishStartTime != null">
            and t1.actual_end_time &gt;= #{params.finishStartTime}
        </if>
        <if test="params.finishEndTime != null">
            and t1.actual_end_time &lt;= #{params.finishEndTime}
        </if>
        ORDER BY t1.create_time desc
    </select>

    <select id="getDailyMaintenanceOrder3List"  parameterType="Map" resultType="Map">
        SELECT
        t1.id,
        t1.status,
        t5.item_text as statusName,
        t1.num,
        t1.num as technologyStatusVerificationBill,
        t4.id as maintenanceCycleId,
        t4.maintenance_type as maintenanceType,
        t10.item_text as maintenanceTypeName,
        t4.cycle as maintenanceCycle,
        t4.name as maintenanceCycleName,
        t3.id as equipmentId,
        t3.num as equipmentNum,
        t3.name as equipmentName,
        t3.model as equipmentModel,
        t3.specification,
        t3.technology_status as technologyStatus,
        t3.precision_parameters as precisionParameters,
        t11.id as equipmentCategoryId,
        t11.name as equipmentCategoryName,
        t2.id as maintenanceStandardId,
        t2.num as maintenanceStandardNum,
        t2.assign_mode assignMode,
        t3.team_id teamId,
        t3.use_id as useId,
        t6.depart_name as departName,
        t7.name as teamName,
        DATEADD(DAY,-30,t1.plan_start_time)   as yellowWarningTime,
        DATEADD(DAY,-7,t1.plan_start_time)   as redWarningTime,
        CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
        t1.plan_start_time as planStartTime,
        t1.plan_end_time as planEndTime,
        t1.actual_start_time as actualStartTime,
        t1.actual_end_time as actualEndTime,
        t1.maintenance_user_id as maintenanceUserId,
        t9.item_text as assignModeName,
        t1.create_by as createBy,
        t1.create_time as createTime,
        t1.remark,
        t1.description,
        t1.precision_inspection_status as precisionInspectionStatus,
        t1.stove_exempt_status as stoveExemptStatus,
        t1.inspect_user as inspectUser,
        t1.inspect_date as inspectDate,
        t12.item_text as checkStatusName,
        t1.not_pass_reason as notPassReason,
        t1.maintenance_order_uda5 as receipts,
        t13.num as receiptsNum,
        t14.item_text as receiptsName,
        t1.maintenance_order_uda4 as receipts2,
        t15.num as receiptsNum2,
        t16.item_text as receiptsName2
            t1.id,
            t1.status,
            t5.item_text as statusName,
            t1.num,
            t1.num as technologyStatusVerificationBill,
            t4.id as maintenanceCycleId,
            t4.maintenance_type as maintenanceType,
            t10.item_text as maintenanceTypeName,
            t4.cycle as maintenanceCycle,
            t4.name as maintenanceCycleName,
            t3.id as equipmentId,
            t3.num as equipmentNum,
            t3.name as equipmentName,
            t3.model as equipmentModel,
            t3.specification,
            t3.technology_status as technologyStatus,
            t3.precision_parameters as precisionParameters,
            t11.id as equipmentCategoryId,
            t11.name as equipmentCategoryName,
            t2.id as maintenanceStandardId,
            t2.num as maintenanceStandardNum,
            t2.assign_mode assignMode,
            t3.team_id teamId,
            t3.use_id as useId,
            t6.depart_name as departName,
            t7.name as teamName,
            DATEADD(DAY,-30,t1.plan_start_time)   as yellowWarningTime,
            DATEADD(DAY,-7,t1.plan_start_time)   as redWarningTime,
            CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
            t1.plan_start_time as planStartTime,
            t1.plan_end_time as planEndTime,
            t1.actual_start_time as actualStartTime,
            t1.actual_end_time as actualEndTime,
            t9.item_text as assignModeName,
            t1.create_by as createBy,
            t1.create_time as createTime,
            t1.remark,
            t1.description,
            t1.precision_inspection_status as precisionInspectionStatus,
            t1.stove_exempt_status as stoveExemptStatus,
            t1.inspect_user as inspectUser,
            t1.inspect_date as inspectDate,
            t12.item_text as checkStatusName,
            t1.not_pass_reason as notPassReason,
            t1.maintenance_order_uda5 as receipts,
            t13.num as receiptsNum,
            t14.item_text as receiptsName,
            t1.maintenance_order_uda4 as receipts2,
            t15.num as receiptsNum2,
            t16.item_text as receiptsName2
        FROM
        mom_eam_daily_maintenance_order t1
            mom_eam_daily_maintenance_order t1
        LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
        left join mom_eam_equipment t3 on t1.equipment_id = t3.id
        left join mom_eam_equipment_category t11 on t3.equipment_category_id = t11.id
@@ -181,6 +201,24 @@
        WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType}
        <if test="params.num != null and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')
        </if>
        <if test="params.equipmentNum != null and params.equipmentNum != ''">
            and t3.num like concat('%',#{params.equipmentNum},'%')
        </if>
        <if test="params.useDepartId != null and params.useDepartId != ''">
            and t3.use_id = #{params.useDepartId}
        </if>
        <if test="params.status != null and params.status != ''">
            and t1.status = #{params.status}
        </if>
        <if test="params.teamId != null and params.teamId != ''">
            and t3.team_id = #{params.teamId}
        </if>
        <if test="params.finishStartTime != null">
            and t1.actual_end_time &gt;= #{params.finishStartTime}
        </if>
        <if test="params.finishEndTime != null">
            and t1.actual_end_time &lt;= #{params.finishEndTime}
        </if>
        ORDER BY t1.create_time desc
    </select>
@@ -213,4 +251,62 @@
            and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
        </if>
    </select>

    <select id="getRepairUser"  parameterType="Map" resultType="map">
        SELECT
            tt.id,
            t1.id AS maintenanceStandardDetailId,
            t2.id AS maintenanceStandardId,
            t1.location,
            t1.photo,
            t1.maintenance_project_id AS maintenanceProjectId,
            case t1.maintenance_role when 'operator' then '操作人员保养内容' else '维修人员保养内容' end as maintenanceRole,
            t3.num AS maintenanceProjectNum,
            t3.name as maintenanceProjectName,
            t3.standard,
            t4.item_text AS maintenanceMethod,
            t3.maintenance_tool AS maintenanceTool,
            t3.working_hour_quota AS workingHourQuota,
            tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM
            mom_eam_daily_maintenance_order_detail tt
        LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id
        LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
        LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
        WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'maintenance'
        <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
            and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
        </if>
    </select>

    <select id="getOperationUser"  parameterType="Map" resultType="map">
        SELECT
            tt.id,
            t1.id AS maintenanceStandardDetailId,
            t2.id AS maintenanceStandardId,
            t1.location,
            t1.photo,
            t1.maintenance_project_id AS maintenanceProjectId,
            case t1.maintenance_role when 'operator' then '操作人员保养内容' else '维修人员保养内容' end as maintenanceRole,
            t3.num AS maintenanceProjectNum,
            t3.name as maintenanceProjectName,
            t3.standard,
            t4.item_text AS maintenanceMethod,
            t3.maintenance_tool AS maintenanceTool,
            t3.working_hour_quota AS workingHourQuota,
            tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM
            mom_eam_daily_maintenance_order_detail tt
        LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id
        LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
        LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
        WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'operator'
        <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
            and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
        </if>
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -33,8 +33,7 @@
            t7.name as teamName,
            t4.assign_mode as assignMode,
            t8.item_text as assignModeName,
            t1.inspection_user_id as inspectionUserId,
            t9.realname as inspectionUserName,
            t1.inspection_order_uda2 as inspectionUserName,
            t1.actual_end_time as actualEndTime,
            t1.actual_start_time as actualStartTime,
            t1.inspection_order_uda1 AS repairConfirmPerson,
@@ -48,7 +47,6 @@
        left join sys_depart t6 on t2.use_id = t6.id
        left join mom_base_team t7 on t2.team_id = t7.id
        left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t8 on t8.item_value = t4.assign_mode
        left join sys_user t9 on t1.inspection_user_id = t9.id
        WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0
<!--        <if test="params.dailyInspectionStandardId != null and params.dailyInspectionStandardId != ''">-->
<!--            and t1.daily_inspection_standard_id = #{params.dailyInspectionStandardId}-->
@@ -56,6 +54,24 @@
        <if test="params.num != null and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')
        </if>
        <if test="params.equipmentNum != null and params.equipmentNum != ''">
            and t2.num like concat('%',#{params.equipmentNum},'%')
        </if>
        <if test="params.useDepartId != null and params.useDepartId != ''">
            and t2.use_id = #{params.useDepartId}
        </if>
        <if test="params.status != null and params.status != ''">
            and t1.status = #{params.status}
        </if>
        <if test="params.teamId != null and params.teamId != ''">
            and t2.team_id = #{params.teamId}
        </if>
        <if test="params.inspectionStartTime != null">
            and t1.actual_end_time &gt;= #{params.inspectionStartTime}
        </if>
        <if test="params.inspectionEndTime != null">
            and t1.actual_end_time &lt;= #{params.inspectionEndTime}
        </if>
        ORDER BY t1.create_time desc
    </select>


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml

@@ -18,7 +18,7 @@
            t3.id as maintenanceCycleId,
            t3.NAME AS maintenanceCycleName,
            t5.NAME AS maintenanceSpecialtyName,
            t7.item_value as maintenanceRole
            t7.item_text as maintenanceRole
        FROM
            mom_eam_maintenance_standard_detail t1
        LEFT JOIN mom_eam_maintenance_project t2 ON t1.maintenance_project_id = t2.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderDetailService.java

@@ -15,8 +15,13 @@
public interface IDailyMaintenanceOrderDetailService extends IService<DailyMaintenanceOrderDetail> {

    /**
     *获取日常保养工单明细
     *二级保养工单明细
     */
    IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params);

    /**
     *三级保养工单明细
     */
    IPage<Map<String, Object>> get3MaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params);

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderService.java

@@ -32,6 +32,10 @@
    //日常保养工单编辑时，回显保养项目 （手动生成日常保养工单）
    List<Map<String, Object>> getDailyMaintenanceDetailByOrderId(String dailyMaintenanceOrderId);

    List<Map<String, Object>> getOperationUser(String dailyMaintenanceOrderId);

    List<Map<String, Object>> getRepairUser(String dailyMaintenanceOrderId);

    /**
     * 日常保养工单 获取设备台站已绑定的对象部门
     * qsw 2023-7-11

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java

@@ -22,10 +22,22 @@
@Service
public class DailyMaintenanceOrderDetailServiceImpl extends ServiceImpl<DailyMaintenanceOrderDetailMapper, DailyMaintenanceOrderDetail> implements IDailyMaintenanceOrderDetailService {

    /**
     *二级保养工单明细
     */
    @Override
    public IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        String sql = QueryGenerator.installAuthJdbc(MaintenanceStandardDetail.class);
        return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params,sql);
    }

    /**
     *三级保养工单明细
     */
    @Override
    public IPage<Map<String, Object>> get3MaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return super.getBaseMapper().get3MaintenanceOrderDetailList(pageData,params);
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java

@@ -50,6 +50,16 @@
        return this.baseMapper.getDailyMaintenanceOrderDetailByOrderId(dailyMaintenanceOrderId);
    }

    @Override
    public List<Map<String, Object>> getOperationUser(String dailyMaintenanceOrderId) {
        return this.baseMapper.getOperationUser(dailyMaintenanceOrderId);
    }

    @Override
    public List<Map<String, Object>> getRepairUser(String dailyMaintenanceOrderId) {
        return this.baseMapper.getRepairUser(dailyMaintenanceOrderId);
    }

    /**
     * 日常保养工单 获取设备台站已绑定的对象部门
     * qsw 2023-7-11