消息提醒

qushaowei

2023-11-22 e9b1f8d5a5b710a1c26aa6fd6774686be5d0f8f6

消息提醒

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

@@ -198,7 +198,7 @@
                equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult());
                eamEquipmentService.updateById(equipment);

                this.equipmentTechnologyStatuAlart(equipment.getNum());
                this.equipmentTechnologyStatuAlart(equipment.getNum(),equipment.getTechnologyStatus());
            }
            String judgmentResult = calibrationOrderReport.getJudgmentResult();
            if("disabledScrapping".equals(judgmentResult)){
@@ -208,7 +208,12 @@
        }
    }

    void equipmentTechnologyStatuAlart(String equipmentNum){
    void equipmentTechnologyStatuAlart(String equipmentNum,String technologyStatus){

        SysDict sysDictT = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","technology_status"),false);
        SysDictItem sysDictItemt = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_value",technologyStatus)
                .eq("dict_id",sysDictT.getId()),false);

        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
        SysDictItem sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_text","运保设备管理员")
@@ -218,7 +223,7 @@
        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 = sysUser.getRealname()+"将统一编号为【"+equipmentNum+"】的技术状态修改为已禁用";
            String msg = sysUser.getRealname()+"将统一编号为【"+equipmentNum+"】的技术状态修改为【"+sysDictItemt.getItemText()+"】";
            MessageDTO messageDTO = new MessageDTO();
            messageDTO.setTitle("设备台账技术状态修改");
            messageDTO.setContent(msg);

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

@@ -9,6 +9,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@@ -17,6 +18,7 @@
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.record.DVALRecord;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -38,8 +40,8 @@


import org.jeecg.modules.eam.vo.SysFileNameVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.service.*;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -110,6 +112,15 @@

    @Autowired
    private ISysFileNameService sysFileNameService;

    @Resource
    private ISysRoleService sysRoleService;
    @Resource
    private ISysDictService sysDictService;
    @Resource
    private ISysDictItemService sysDictItemService;
    @Resource
    private ISysUserRoleService sysUserRoleService;


    /**
@@ -748,6 +759,8 @@

               maintenanceOrder.setConfirmStatus(confirmStatus);
               dailyMaintenanceOrderService.updateById(maintenanceOrder);

               this.twoMaintenanceAlert(confirmStatus,"二保移交单维修人员",maintenanceOrder.getNum());
           }else if("2".equals(confirmStatus)){
               finishTransferOrder.setEquipmentInspectorUser("");
               finishTransferOrder.setRepairDirectorUser("");
@@ -757,12 +770,16 @@

               maintenanceOrder.setConfirmStatus(confirmStatus);
               dailyMaintenanceOrderService.updateById(maintenanceOrder);

               this.twoMaintenanceAlert(confirmStatus,"二保移交单操作人员",maintenanceOrder.getNum());
           }else if("3".equals(confirmStatus)){
               finishTransferOrder.setRepairUser(sysUser.getRealname());
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
               dailyMaintenanceOrderService.updateById(maintenanceOrder);

               this.twoMaintenanceAlert(confirmStatus,"二保移交单维修室主任",maintenanceOrder.getNum());
           }else if("4".equals(confirmStatus)){
               finishTransferOrder.setEquipmentInspectorUser("");
               finishTransferOrder.setRepairDirectorUser("");
@@ -771,18 +788,24 @@

               maintenanceOrder.setConfirmStatus(confirmStatus);
               dailyMaintenanceOrderService.updateById(maintenanceOrder);

               this.twoMaintenanceAlert(confirmStatus,"二保移交单维修人员",maintenanceOrder.getNum());
           }else if("5".equals(confirmStatus)){
               finishTransferOrder.setRepairDirectorUser(sysUser.getRealname());
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
               dailyMaintenanceOrderService.updateById(maintenanceOrder);

               this.twoMaintenanceAlert(confirmStatus,"二保移交单检验员",maintenanceOrder.getNum());
           }else if("6".equals(confirmStatus)){
               finishTransferOrder.setRepairDirectorUser("");
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
               dailyMaintenanceOrderService.updateById(maintenanceOrder);

               this.twoMaintenanceAlert(confirmStatus,"二保移交单维修室主任",maintenanceOrder.getNum());
           }else if("7".equals(confirmStatus)){
               finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname());
               finishTransferOrderService.updateById(finishTransferOrder);
@@ -795,6 +818,41 @@
        return Result.OK("审批成功!");
    }

    void twoMaintenanceAlert(String confirmStatus,String roleDictItem,String orderNum){

        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
        SysDictItem sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_text",roleDictItem)
                .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(confirmStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将二级保养工单号【"+orderNum+"】的完工移交单确认通过，请到二级保养页面查看！";
            }else if("2".equals(confirmStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将二级保养工单号【"+orderNum+"】的完工移交单确驳回，请到二级保养页面查看！";
            }else if("3".equals(confirmStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将二级保养工单号【"+orderNum+"】的完工移交单确认通过，请到二级保养页面查看！";
            }else if("4".equals(confirmStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将二级保养工单号【"+orderNum+"】的完工移交单确驳回，请到二级保养页面查看！";
            }else if("5".equals(confirmStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将二级保养工单号【"+orderNum+"】的完工移交单确认通过，请到二级保养页面查看！";
            }else if("6".equals(confirmStatus)){
                msg = "【"+sysUser.getRealname()+"】"+"将二级保养工单号【"+orderNum+"】的完工移交单确驳回，请到二级保养页面查看！";
            }
            MessageDTO messageDTO = new MessageDTO();
            messageDTO.setTitle("完工移交单消息提醒！");
            messageDTO.setContent(msg);
            messageDTO.setCategory(roleDictItem);
            messageDTO.setFromUser("完工移交单消息提醒提醒小助手");
            messageDTO.setToUser(user.getUsername());
            sysBaseApi.sendSysAnnouncement(messageDTO);
        }
    }

    @RequestMapping(value = "/editTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> editTechnologyStatus(@RequestBody Equipment equipment) {

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

@@ -223,7 +223,9 @@
            preInspection.setRepairDirectorUser(userId);

            maintenanceOrder.setPrecisionInspectionStatus("2");
        }else if("2".equals(precisionInspectionStatus)){
        }

        if("2".equals(precisionInspectionStatus)){
            preInspection.setEachTolerance(precisionInspection.getEachTolerance());
            preInspection.setPartTolerance(precisionInspection.getPartTolerance());
            preInspection.setEquipmentInspectorUser(userId);
@@ -233,6 +235,7 @@
            preInspection.setSparePart(precisionInspection.getSparePart());
            preInspection.setProcessPass(precisionInspection.getProcessPass());
            preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
            preInspection.setSparePart(precisionInspection.getSparePart());
            preInspection.setUseUnitDirectorUser(userId);

            maintenanceOrder.setPrecisionInspectionStatus("4");

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

@@ -12,11 +12,12 @@
            t5.realname AS equipmentInspectorUserName,
            t6.realname AS useUnitDirectorUserName,
            t7.realname AS equipmentInspectorSignUserName,
            ISNULL(t1.each_tolerance,0) AS eachTolerance,
            ISNULL(t1.part_tolerance,0)  AS partTolerance,
            ISNULL(t1.process_pass,0) AS processPass,
            ISNULL(t1.meet_process_require,0) AS meetProcessRequire,
            t1.judgment_result AS judgmentResult,
            t1.spare_part as sparePart,
            ISNULL(t1.each_tolerance,'0') AS eachTolerance,
            ISNULL(t1.part_tolerance,'0')  AS partTolerance,
            ISNULL(t1.process_pass,'0') AS processPass,
            ISNULL(t1.meet_process_require,'0') AS meetProcessRequire,
            ISNULL(t1.judgment_result,'qualified') AS judgmentResult,
            t1.remark,
            t8.name AS equipmentName,
            t8.model AS equipmentModel,