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

@@ -269,9 +269,11 @@
        int successLines = 0, errorLines = 0;
        //a = 1开始读取点检项目；b = 1开始读取周保养项目；c = 1该设备导入信息存在错误；projectColumnIndex点检项目所在列；maintenanceColumnIndex周保养项目所在列
        int a = 0,b = 0,c = 0,projectColumnIndex = -1,maintenanceColumnIndex = 0;
        //表头标题
        String title = "";
        String dailyInspectionStandardId = null;
        String equipmentNum = null;
        DailyInspectionStandard dailyInspectionStandard = new DailyInspectionStandard();
        DailyInspectionStandard dailyInspectionStandard = null;
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = new ArrayList<>();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            MultipartFile file = entity.getValue();
@@ -301,6 +303,9 @@
                                if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){
                                    //点检周期存在，判断设备统一编码是否存在
                                    String strCell = cell.getStringCellValue();
                                    if(strCell.contains("生产设备自主维护点检表")){
                                        title = strCell.trim().substring(11).trim();
                                    }
                                    if(strCell.contains("设备名称：")){
                                        String[] tybh1  = strCell.split("统一编号：");
                                        String[] tybh2 = tybh1[1].split("å¹´");
@@ -325,12 +330,15 @@
                                                errorLines++;
                                            }else {
                                                c = 0;
                                                dailyInspectionStandard.setNum(identityService.getNumByTypeAndLength("DailylnspectionStandard",4));
                                                String num = identityService.getNumByTypeAndLength("DailylnspectionStandard", 4);
                                                dailyInspectionStandard = new DailyInspectionStandard();
                                                dailyInspectionStandard.setNum(num);
                                                dailyInspectionStandard.setVersionStatus("2");
                                                dailyInspectionStandard.setVersion("1.0");
                                                dailyInspectionStandard.setAssignMode("1");
                                                dailyInspectionStandard.setEquipmentId(equipment.getId());
                                                dailyInspectionStandard.setApprovalStatus("5");
                                                dailyInspectionStandard.setDisUda1(title);
                                                //dailyInspectionStandardService.save(dailyInspectionStandard);
                                                //dailyInspectionStandardId = dailyInspectionStandard.getId();
                                            }
@@ -353,9 +361,10 @@
                                            dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
                                            String dayInspectionProjectName = row.getCell(projectColumnIndex).toString();
                                            String standard = row.getCell(projectColumnIndex+3).toString();
                                            //查询点击项目，如果没有新增点检项目
                                            //查询点检项目，如果没有新增点检项目
                                            if(StringUtils.isNotBlank(dayInspectionProjectName)){
                                                List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,dayInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
                                                List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,dayInspectionProjectName)
                                                        .eq(InspectionProject::getDetectionStandard,standard).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
                                                if(CollectionUtils.isEmpty(inspectionProjectList)){
                                                    InspectionProject inspectionProject = new InspectionProject();
                                                    inspectionProject.setNum(identityService.getNumByTypeAndLength("InspectionProject",4));
@@ -400,7 +409,8 @@
                                            String weekInspectionProjectName = row.getCell(maintenanceColumnIndex).toString();
                                            String inspectionStandardName = row.getCell(maintenanceColumnIndex+3).toString();
                                            if(StringUtils.isNotBlank(weekInspectionProjectName)){
                                                List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,weekInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
                                                List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,weekInspectionProjectName)
                                                        .eq(InspectionProject::getDetectionStandard,inspectionStandardName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
                                                if(CollectionUtils.isEmpty(inspectionProjectList)){
                                                    InspectionProject inspectionProject = new InspectionProject();
                                                    inspectionProject.setNum(identityService.getNumByTypeAndLength("InspectionProject",4));

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

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -201,13 +202,17 @@
                    .eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
            for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
                String operateUser = finishTransferOrder.getOperateUser();
                record.put("operateUserName", operateUser);
//                record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1());
                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
                String repairUser = finishTransferOrder.getRepairUser();
                record.put("repairUserName", repairUser);
//                record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2());
                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
                String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
                record.put("repairDirectorUserName", repairDirectorUser);
//                record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3());
                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
                String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
                record.put("equipmentInspectorUserName", equipmentInspectorUser);
//                record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4());
                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
            }

        }
@@ -308,6 +313,7 @@
        dailyMaintenanceOrder.setConfirmStatus("0");//移交确认状态（0未确认，1主任确认，2检验员确认）
        dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//精度检验单流程状态（0未确认，1精度检验者，2维修室主任，3设备检验员，4使用单位技术主管，5设备检验员（盖章））
        dailyMaintenanceOrder.setStoveExemptStatus("0");//炉类设备豁免20项状态（0未确认，1维修室主任，2保养人员，3仪表工）
        dailyMaintenanceOrder.setStatus("3");//3:未开始
        dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -642,24 +648,23 @@
    public Result<String> report(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        dailyMaintenanceOrder.setMaintenanceUserId(userId);
//        dailyMaintenanceOrder.setMaintenanceUserId(userId);
        dailyMaintenanceOrder.setActualEndTime(new Date());
        boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

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

        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
        FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
        finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
        finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
//        finishTransferOrder.setOperateUser(userId);
//        finishTransferOrder.setRepairUser(userId);
        finishTransferOrder.setStatus("1");
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

//        this.createPrecisionInspection(maintenanceOrder);
//
//        this.createMaintenanceStoveExempt(maintenanceOrder);

        if (!b) {
            return Result.error("报工失败!");
@@ -674,9 +679,14 @@
    public Result<String> report3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        dailyMaintenanceOrder.setMaintenanceUserId(userId);
//        dailyMaintenanceOrder.setMaintenanceUserId(userId);
        dailyMaintenanceOrder.setActualEndTime(new Date());
        boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

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

        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
@@ -783,6 +793,7 @@
           FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0);
           if("1".equals(confirmStatus)){
               finishTransferOrder.setOperateUser(sysUser.getRealname());
               finishTransferOrder.setTransferOrderUda1(DateUtils.now());
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -794,6 +805,7 @@
               finishTransferOrder.setRepairDirectorUser("");
               finishTransferOrder.setRepairUser("");
               finishTransferOrder.setOperateUser("");
               finishTransferOrder.setTransferOrderUda1("");
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -802,6 +814,7 @@
               this.twoMaintenanceAlert(confirmStatus,"二保移交单操作人员",maintenanceOrder.getNum());
           }else if("3".equals(confirmStatus)){
               finishTransferOrder.setRepairUser(sysUser.getRealname());
               finishTransferOrder.setTransferOrderUda2(DateUtils.now());
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -812,6 +825,7 @@
               finishTransferOrder.setEquipmentInspectorUser("");
               finishTransferOrder.setRepairDirectorUser("");
               finishTransferOrder.setRepairUser("");
               finishTransferOrder.setTransferOrderUda2("");
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -820,6 +834,7 @@
               this.twoMaintenanceAlert(confirmStatus,"二保移交单维修人员",maintenanceOrder.getNum());
           }else if("5".equals(confirmStatus)){
               finishTransferOrder.setRepairDirectorUser(sysUser.getRealname());
               finishTransferOrder.setTransferOrderUda3(DateUtils.now());
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -828,6 +843,7 @@
               this.twoMaintenanceAlert(confirmStatus,"二保移交单检验员",maintenanceOrder.getNum());
           }else if("6".equals(confirmStatus)){
               finishTransferOrder.setRepairDirectorUser("");
               finishTransferOrder.setTransferOrderUda3("");
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -836,6 +852,7 @@
               this.twoMaintenanceAlert(confirmStatus,"二保移交单维修室主任",maintenanceOrder.getNum());
           }else if("7".equals(confirmStatus)){
               finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname());
               finishTransferOrder.setTransferOrderUda4(DateUtils.now());
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus(confirmStatus);

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

@@ -195,6 +195,55 @@
        return Result.OK(pageList);
    }

     @ApiOperation(value="mom_eam_equipment-分页列表查询", notes="mom_eam_equipment-分页列表查询")
     @GetMapping(value = "/showEquipmentList")
     public Result<IPage<Equipment>> showEquipmentList(Equipment equipment,
                                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                   HttpServletRequest req) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
         if(StringUtils.isNotBlank(equipment.getNum())){
             queryWrapper.like("num",equipment.getNum());
         }
         if(StringUtils.isNotBlank(equipment.getName())){
             queryWrapper.like("name",equipment.getName());
         }
         queryWrapper.eq("equipment_status","1");
         queryWrapper.in("technology_status","qualified","limitedUse");
         queryWrapper.eq("status","1");
         queryWrapper.eq("del_flag",0);
         queryWrapper.orderByDesc("create_time");

         Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
         IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
         return Result.OK(pageList);
     }

     @ApiOperation(value="mom_eam_equipment-分页列表查询", notes="mom_eam_equipment-分页列表查询")
     @GetMapping(value = "/findEquipmentList")
     public Result<IPage<Equipment>> findEquipmentList(Equipment equipment,
                                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                       HttpServletRequest req) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
         if(StringUtils.isNotBlank(equipment.getNum())){
             queryWrapper.like("num",equipment.getNum());
         }
         if(StringUtils.isNotBlank(equipment.getName())){
             queryWrapper.like("name",equipment.getName());
         }
         queryWrapper.eq("equipment_status","1");
         queryWrapper.in("technology_status","qualified","limitedUse");
         queryWrapper.in("equipment_importance_id","A","B","C");
         queryWrapper.eq("status","1");
         queryWrapper.eq("del_flag",0);
         queryWrapper.orderByDesc("create_time");

         Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
         IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
         return Result.OK(pageList);
     }


     /**
      * è®¾å¤‡ä¿ä¿®  èŽ·å–设备列表组件

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

@@ -231,7 +231,7 @@
             dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
             dailyMaintenanceOrder.setPlanStartTime(equipmentMaintenancePlanDetail.getPlanStartTime());
             dailyMaintenanceOrder.setPlanEndTime(equipmentMaintenancePlanDetail.getPlanEndTime());
             dailyMaintenanceOrder.setStatus(CommonConstant.STATUS_1);
             dailyMaintenanceOrder.setStatus("3");//3:未开始
             dailyMaintenanceOrder.setMaintenanceStandardId(maintenanceStandard.getId());
             dailyMaintenanceOrder.setCreateType(CommonConstant.ANNOUNCEMENT_SEND_STATUS_2);
             List<MaintenanceStandardDetail> maintenanceStandardDetailList = equipmentMaintenancePlanService.getCycle(maintenanceStandard.getId(),equipmentMaintenancePlan.getType());

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

@@ -117,9 +117,9 @@
        LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
        equipmentReportRepair.setStatus("1");
        equipmentReportRepair.setSource("1");
        equipmentReportRepair.setType("1");
        equipmentReportRepair.setIsCreateOrder(0);
        equipmentReportRepairService.save(equipmentReportRepair);
        Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
        String IS_PRODUCT_YES = "yes";
        if(IS_PRODUCT_YES.equals(equipmentReportRepair.getErrUda1())){
            String num = sysIdentityService.getNumByTypeAndLength("QuanlityConfirm",4);
@@ -133,21 +133,31 @@
            quanlityConfirm.setQuantity(equipmentReportRepair.getQuantity());
            quanlityConfirm.setOperator(curUser.getId());
            quanlityConfirmService.save(quanlityConfirm);
            MessageDTO qMessageDTO = new MessageDTO();
            qMessageDTO.setTitle("质量隐患确认提醒");
            qMessageDTO.setContent("统一编号为【"+equipment.getNum()+"】的设备需要进行质量隐患确认，请移步至质量隐患确认进行确认！单据号【"+num+"】");
            qMessageDTO.setCategory("质量隐患确认");
            qMessageDTO.setFromUser("质量隐患确认提醒小助手");
            qMessageDTO.setToUser(curUser.getUsername());
            sysBaseApi.sendSysAnnouncement(qMessageDTO);
            String fNum = sysIdentityService.getNumByTypeAndLength("FaultInfo",4);
            FaultInfo faultInfo = new FaultInfo();
            faultInfo.setNum(fNum);
            faultInfo.setQuanlityId(quanlityConfirm.getId());
            faultInfo.setOperater(quanlityConfirm.getOperator());
            faultInfo.setIsConfirm(IS_PRODUCT_NO);
            String eId = equipmentReportRepair.getEquipmentId();
            Equipment equipment = equipmentService.getById(eId);
            faultInfo.setEquipModel(equipment.getModel());
            faultInfo.setEquipName(equipment.getName());
            faultInfo.setEquipNum(equipment.getNum());
            faultInfoService.save(faultInfo);

            MessageDTO fMessageDTO = new MessageDTO();
            fMessageDTO.setTitle("设备事故登记提醒");
            fMessageDTO.setContent("统一编号为【"+equipment.getNum()+"】的设备需要进行事故登记，请移步至设备事故登记表完成确认！单据号【"+fNum+"】");
            fMessageDTO.setCategory("设备事故登记确认");
            fMessageDTO.setFromUser("设备事故登记提醒小助手");
            fMessageDTO.setToUser(curUser.getUsername());
            sysBaseApi.sendSysAnnouncement(fMessageDTO);
        }
        Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
        equipment.setEquipmentStatus("2");
        String teamId = equipment.getTeamId();
        if(ObjectUtils.isNotNull(teamId)){

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

@@ -187,6 +187,7 @@
        }
        inspectionOrder.setInspectionDeadline(date);
        inspectionOrder.setInspectionStandardType("1");
        inspectionOrder.setStatus("3");//3:未开始
        inspectionOrderService.save(inspectionOrder);

        String equipmentId = inspectionOrder.getEquipmentId();

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

@@ -595,6 +595,7 @@
//            isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId());
            isd.setMaintenanceMode(maintenanceStandardDetail.getMaintenanceMode());
            isd.setMaintenanceRequire(maintenanceStandardDetail.getMaintenanceRequire());
            isd.setMaintenanceRole(maintenanceStandardDetail.getMaintenanceRole());
            if(maintenanceCycle.size() > 0){
                isd.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
            }

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

@@ -50,6 +50,9 @@

    @Autowired
    private IEamEquipmentService equipmentService;

    @Autowired
    private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -188,6 +191,14 @@
                String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
                PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
                precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());

                List<PrecisionParametersTemplateDetail> list = precisionParametersTemplateDetailService.lambdaQuery()
                        .eq(PrecisionParametersTemplateDetail::getPrecisionParametersId, precisionParametersId)
                        .eq(PrecisionParametersTemplateDetail::getDelFlag, "0").list();
                if(list.size()>0){
                    precisionInspectionDetail.setTolerance(list.get(0).getTolerance());
                }

            }

            map.put("precisionInspectionDetails",precisionInspectionDetails);

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

@@ -194,11 +194,13 @@
     */
    @ApiOperation(value = "精度参数模板-添加", notes = "精度参数模板-添加")
    @PostMapping(value = "/addNew")
    @Transactional(rollbackFor = { Exception.class })
    public Result<?> addNew(@RequestBody PrecisionParametersTemplate precisionParametersTemplate) {
        precisionParametersTemplateService.save(precisionParametersTemplate);
        String id= precisionParametersTemplate.getId();
        List<PrecisionParametersTemplateDetail> details = precisionParametersTemplate.getPrecisionParametersTemplateDetailList();
        for(PrecisionParametersTemplateDetail precisionParametersTemplateDetail:details){
            precisionParametersTemplateDetail.setId("");
            precisionParametersTemplateDetail.setPrecisionParametersTemplateId(id);
        }
        precisionParametersTemplateDetailService.saveBatch(details);

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

@@ -269,7 +269,16 @@
        }
        return Result.error("出库单不存在");
    }


    @PostMapping(value = "/addNew")
    public Result<String> addNew(@RequestBody List<RepairOrderActualMaterial> list) {
        if(list.size()!=0){
            String id = list.get(0).getRepairOrderId();
            repairOrderActualMaterialService.remove(new QueryWrapper<RepairOrderActualMaterial>().eq("repair_order_id",id));
            repairOrderActualMaterialService.saveBatch(list);
            return Result.OK("添加成功");
        }else {
            return Result.error("添加失败");
        }
    }

}

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

@@ -19,14 +19,19 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.RepairOrderMapper;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.EquipmentAvailabilityVo;
import org.jeecg.modules.eam.vo.RepairReportExportVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -99,6 +104,12 @@
     @Autowired
     @Lazy
     private IdentityService sysIdentityService;
     @Autowired
     private RepairOrderMapper repairOrderMapper;
     @Autowired
     private SysUserMapper sysUserMapper;
     @Value("${jeecg.path.upload}")
     private String upLoadPath;



@@ -321,15 +332,53 @@
        return Result.OK("批量删除成功!");
    }

    /**
     * å¯¼å‡º
     * @return
     */
    //@RequiresPermissions("org.jeecg.modules.demo:mom_eam_repair_order:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, RepairOrder repairOrder) {
        return super.exportXls(request, repairOrder, RepairOrder.class, "维修工单");
    }
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, RepairOrder repairOrder) {
         // Step.1 ç»„装查询条件
         String title = "维修履历";
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // Step.2 èŽ·å–导出数据
         if(StringUtils.isNotBlank(repairOrder.getUserId())){
             SysUser user = sysUserMapper.selectById(repairOrder.getUserId());
             repairOrder.setTeamId(user.getTeamId());
         }else{
             repairOrder.setTeamId("");
         }
         List<String> equipNums = new ArrayList<>();
         if(StringUtils.isNotBlank(repairOrder.getNums())){
             equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
         }
         List<RepairOrder> exportList = repairOrderMapper.getRepairOrderList(null,repairOrder.getId(),
                 repairOrder.getNum(),
                 repairOrder.getEquipmentNum(),
                 repairOrder.getEquipmentName(),
                 repairOrder.getStatus(),
                 repairOrder.getRepairOrderType(),
                 repairOrder.getEquipmentCategoryId(),
                 repairOrder.getFactoryModelId(),
                 repairOrder.getSpecificEquipment(),
                 repairOrder.getTeamId(),
                 equipNums,
                 repairOrder.getRepairOrderUda1(),
                 repairOrder.getFaultStartTime(),
                 repairOrder.getFaultEndTime(),
                 repairOrder.getCreateStartTime(),
                 repairOrder.getCreateEndTime(),
                 repairOrder.getEquipmentImportanceId());

         // Step.3 AutoPoi å¯¼å‡ºExcel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.FILE_NAME, title);
         mv.addObject(NormalExcelConstants.CLASS, RepairOrder.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
         ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
         mv.addObject(NormalExcelConstants.PARAMS,exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }

    /**
     * å¯¼å…¥
@@ -1551,10 +1600,10 @@
         List<RepairOrderActualWorkHours> hoursList = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0));
         List<RepairOrderActualWorkHours> mainStuff = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0).eq("principal_contractor","1"));
         if(hoursList.size()<2){
             return Result.error("操作失败，请至少添加两个承修人");
             return Result.error("操作失败，请至少添加两个承修人，并且设置一个主承修人");
         }
         if(mainStuff.size()!=1){
             return Result.error("操作失败，请添加主承修人，有且只有一个");
             return Result.error("操作失败，请设置主承修人，有且只有一个");
         }
         if(StringUtils.isNotBlank(repairOrder.getProjectMaintenanceOrderId())){
             //判断项目性维修子表状态

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

@@ -155,6 +155,22 @@
        streamService.save(stream);
        List<ABCAssessment> abcAssessmentList = stream.getAssessmentList();
        for(ABCAssessment abcAssessment:abcAssessmentList){
            Equipment equipment = equipmentService.getById(abcAssessment.getEquipmentId());
            boolean isD = "D".equals(abcAssessment.getFinalStandard());
            boolean a = StringUtils.isNotBlank(equipment.getStandardA())&&StringUtils.isNotBlank(abcAssessment.getStandardA())&&equipment.getStandardA().equals(abcAssessment.getStandardA());
            boolean b = StringUtils.isNotBlank(equipment.getStandardB())&&StringUtils.isNotBlank(abcAssessment.getStandardB())&&equipment.getStandardB().equals(abcAssessment.getStandardB());
            boolean c = StringUtils.isNotBlank(equipment.getStandardC())&&StringUtils.isNotBlank(abcAssessment.getStandardC())&&equipment.getStandardC().equals(abcAssessment.getStandardC());
            boolean d = StringUtils.isNotBlank(equipment.getStandardD())&&StringUtils.isNotBlank(abcAssessment.getStandardD())&&equipment.getStandardD().equals(abcAssessment.getStandardD());
            boolean e = StringUtils.isNotBlank(equipment.getStandardE())&&StringUtils.isNotBlank(abcAssessment.getStandardE())&&equipment.getStandardE().equals(abcAssessment.getStandardE());
            boolean f = StringUtils.isNotBlank(equipment.getStandardF())&&StringUtils.isNotBlank(abcAssessment.getStandardF())&&equipment.getStandardF().equals(abcAssessment.getStandardF());
            if(isD&&a&&b&&c&&d&&e&&f){
                abcAssessment.setStandardA(null);
                abcAssessment.setStandardB(null);
                abcAssessment.setStandardC(null);
                abcAssessment.setStandardD(null);
                abcAssessment.setStandardE(null);
                abcAssessment.setStandardF(null);
            }
            abcAssessment.setStreamId(stream.getId());
        }
        aBCAssessmentService.saveBatch(abcAssessmentList);
@@ -628,11 +644,10 @@
                    Date nextDayAsDate =Date.from(nextDay.atStartOfDay(ZoneId.systemDefault()).toInstant());
                    Date nextMonthAsDate = Date.from(nextMonth.atStartOfDay(ZoneId.systemDefault()).toInstant());
                    Date needingDate = equipment.getNextThirdMaintenanceTime();
                    Boolean a = StringUtils.isNotBlank(oldStandard);
                    Boolean b = oldStandard.equals("B")||oldStandard.equals("C");
                    Boolean c = newStandard.equals("A");
                    Boolean d = ObjectUtils.isNotNull(needingDate)&&needingDate.compareTo(currentDateAsDate)<0;
                    if(a&&b&&c&&d){
                    Boolean a = StringUtils.isNotBlank(oldStandard)&&(oldStandard.equals("B")||oldStandard.equals("C"));
                    Boolean b = StringUtils.isNotBlank(newStandard)&&newStandard.equals("A");;
                    Boolean c = ObjectUtils.isNotNull(needingDate)&&needingDate.compareTo(currentDateAsDate)<0;
                    if(a&&b&&c){
                        EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail = new EquipmentMaintenancePlanDetail();
                        equipmentMaintenancePlanDetail.setPlanId(hexString);
                        equipmentMaintenancePlanDetail.setEquipmentId(equipment.getId());

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

@@ -191,6 +191,50 @@
     @GetMapping("getTechnologyStatus")
     public Result<?> getTechnologyStatus(@RequestParam(name = "orderId", required = true) String orderId) {
         List<Map<String, Object>> technologyStatusList = technologyStatusService.getTechnologyStatusList(orderId);
         for (Map<String, Object> map : technologyStatusList) {
             String result_8 = (String)map.get("result_8");
             if("0".equals(result_8)){
                 map.put("hidden1Switch",false);
             }else{
                 map.put("hidden1Switch",true);
             }
             String result_9 = (String)map.get("result_9");
             if("0".equals(result_9)){
                 map.put("hidden2Switch",false);
             }else{
                 map.put("hidden2Switch",true);
             }
             String result_10 = (String)map.get("result_10");
             if("0".equals(result_10)){
                 map.put("hidden3Switch",false);
             }else{
                 map.put("hidden3Switch",true);
             }
             String result_11 = (String)map.get("result_11");
             if("0".equals(result_11)){
                 map.put("hidden4Switch",false);
             }else{
                 map.put("hidden4Switch",true);
             }
             String result_12 = (String)map.get("result_12");
             if("0".equals(result_12)){
                 map.put("hidden5Switch",false);
             }else{
                 map.put("hidden5Switch",true);
             }
             String result_13 = (String)map.get("result_13");
             if("0".equals(result_13)){
                 map.put("hidden6Switch",false);
             }else{
                 map.put("hidden6Switch",true);
             }
             String result_14 = (String)map.get("result_14");
             if("0".equals(result_14)){
                 map.put("hidden7Switch",false);
             }else{
                 map.put("hidden7Switch",true);
             }
         }
         return Result.ok(technologyStatusList);
     }


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

@@ -85,7 +85,7 @@
    /**状态（1已创建，2已下发，3未开始，4执行中，5已完成，6已过期，7已作废）*/
    @Excel(name = "状态（1已创建，2已下发，3未开始，4执行中，5已完成，6已过期，7已作废）", width = 15)
    @ApiModelProperty(value = "状态（1已创建，2已下发，3未开始，4执行中，5已完成，6已过期，7已作废）")
    private String status = CommonConstant.STATUS_1;
    private String status;
    /**备用字段1*/
    @Excel(name = "备用字段1", width = 15)
    @ApiModelProperty(value = "备用字段1")

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

@@ -152,7 +152,7 @@
    /**
     * qsw 2023-12-29
     */
    @ApiModelProperty(value = "类型（1被动报修，2主动报修）")
    @ApiModelProperty(value = "类型（1被动报修，2主动报修，3主动维修）")
    private String type;

    /*********************************************** æ‰© å±• å­— æ®µ ********************************************************/

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

@@ -143,7 +143,7 @@
    /**状态*/
    @Excel(name = "状态", width = 15)
    @ApiModelProperty(value = "状态")
    private String status = DailyInspectionOrder.STATUS_1;
    private String status;
    /**备用字段1*/
    @Excel(name = "备用字段1", width = 15)
    @ApiModelProperty(value = "备用字段1")

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

@@ -38,31 +38,28 @@
    @ApiModelProperty(value = "主键ID")
    private String id;
    /**维修订单号*/
    @Excel(name = "维修订单号", width = 15)
    @Excel(name = "维修订单号", width = 15,orderNum = "5")
    @ApiModelProperty(value = "维修订单号")
    private String num;
    /**设备台账ID*/
    @Excel(name = "设备台账ID", width = 15)
    @ApiModelProperty(value = "设备台账ID")
    private String equipmentId;
    /**故障报修单ID*/
    @Excel(name = "故障报修单ID", width = 15)
    @ApiModelProperty(value = "故障报修单ID")
    @Dict(dicCode = "id",dictTable ="mom_eam_equipment_report_repair",dicText = "num")
    private String reportRepairId;

    /**项目性维修单ID*/
    @Excel(name = "项目性维修单ID", width = 15)
    @ApiModelProperty(value = "项目性维修单ID")
    @Dict(dicCode = "id",dictTable ="mom_eam_project_maintenance_order",dicText = "num")
    private String projectMaintenanceOrderId;
    /**班组ID*/
    @Excel(name = "班组ID", width = 15)
    @Excel(name = "维修班组", width = 15,dicCode = "id",dictTable ="mom_base_team",dicText = "name",orderNum = "10")
    @ApiModelProperty(value = "班组ID")
    @Dict(dicCode = "id",dictTable ="mom_base_team",dicText = "name")
    private String teamId;
    /**使用部门ID*/
    @Excel(name = "使用部门ID", width = 15)
    @Excel(name = "使用部门", width = 15,dicCode = "id",dictTable ="sys_depart",dicText = "depart_name",orderNum ="9" )
    @ApiModelProperty(value = "使用部门ID")
    @Dict(dicCode = "id",dictTable ="sys_depart",dicText = "depart_name")
    private String departId;
@@ -87,97 +84,83 @@
    @ApiModelProperty(value = "预防措施")
    private String preventiveMeasure;
    /**故障描述*/
    @Excel(name = "故障描述", width = 15)
    @Excel(name = "故障描述", width = 15,orderNum = "16")
    @ApiModelProperty(value = "故障描述")
    private String faultDescription;
    /**故障时间*/
    @Excel(name = "故障时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "故障时间", width = 20, format = "yyyy-MM-dd HH:mm:ss",orderNum = "13")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "故障时间")
    private Date faultTime;
    /**故障照片*/
    @Excel(name = "故障照片", width = 15)
    @ApiModelProperty(value = "故障照片")
    private String photo;
    /**是否停机*/
    @Excel(name = "是否停机", width = 15)
    @ApiModelProperty(value = "是否停机")
    @Dict(dicCode = "is_stop")
    private String isStop;
    /**计划开始时间*/
    @Excel(name = "计划开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "计划开始时间")
    private Date planStartTime;
    /**计划结束时间*/
    @Excel(name = "计划结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "计划结束时间")
    private Date planEndTime;
    /**实际开始时间*/
    @Excel(name = "实际开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "实际开始时间")
    private Date actualStartTime;
    /**实际结束时间*/
    @Excel(name = "实际结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "实际结束时间")
    private Date actualEndTime;
    /**领取人ID*/
    @Excel(name = "领取人", width = 15)
    @ApiModelProperty(value = "领取人ID")
    @Dict(dicCode = "id",dictTable ="sys_user",dicText = "username")
    private String recipientUserId;
    /**报修人ID*/
    @Excel(name = "报修人", width = 15)
    @ApiModelProperty(value = "报修人ID")
    @Dict(dicCode = "id",dictTable ="sys_user",dicText = "username")
    private String reportUserId;
    /**工时定额*/
    @Excel(name = "工时定额", width = 15)
    @ApiModelProperty(value = "工时定额")
    private BigDecimal workingHourQuota;
    /**工单执行状态（数据字典：repair_order_status）*/
    @Excel(name = "工单执行状态（数据字典：repair_order_status）", width = 15)
    @ApiModelProperty(value = "工单执行状态（数据字典：true_repair_status）")
    @Dict(dicCode = "true_repair_status")
    @Excel(name = "状态", width = 15,orderNum = "3",dicCode = "true_repair_status")
    private String status;
    /**维保方式*/
    @Excel(name = "维保方式", width = 15)
    @ApiModelProperty(value = "维保方式")
    @Dict(dicCode = "maintenance_method")
    private String maintenanceMethod;
    /**备用字段1*/
    @Excel(name = "备用字段1", width = 15)
    @Excel(name = "维修状态", width = 15,orderNum = "4",dicCode = "repair_status" )
    @ApiModelProperty(value = "备用字段1")
    @Dict(dicCode = "repair_status")
    private String repairOrderUda1;
    /**备用字段2*/
    @Excel(name = "备用字段2", width = 15)
    @ApiModelProperty(value = "备用字段2")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date repairOrderUda2;
    /**备用字段3*/
    @Excel(name = "备用字段3", width = 15)
    @ApiModelProperty(value = "备用字段3")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date repairOrderUda3;
    /**备用字段4*/
    @Excel(name = "备用字段4", width = 15)
    @ApiModelProperty(value = "备用字段4")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date repairOrderUda4;
    /**备用字段5*/
    @Excel(name = "备用字段5", width = 15)
    @ApiModelProperty(value = "备用字段5")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -189,6 +172,7 @@
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    @Excel(name = "工单创建时间", width = 15,orderNum = "8",databaseFormat = "yyyy-MM-dd HH:mm:ss",exportFormat = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**修改人*/
    @ApiModelProperty(value = "修改人")
@@ -199,59 +183,48 @@
    @ApiModelProperty(value = "修改时间")
    private Date updateTime;
    /**删除状态(0-正常,1-已删除)*/
    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    @Dict(dicCode = "del_flag")
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**维修工单类型（数据字典：repair_order_type,0:正常维修工单，1:修后汇报工单）*/
    @Excel(name = "维修工单类型", width = 15)
    @ApiModelProperty(value = "维修工单类型")
    @Dict(dicCode = "repair_order_type")
    private Integer repairOrderType;
    /**租户ID*/
    @Excel(name = "租户ID", width = 15)
    @ApiModelProperty(value = "租户ID")
    private String tenantId;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**企业ID*/
    @Excel(name = "企业ID", width = 15)
    @ApiModelProperty(value = "企业ID")
    private String enterpriseId;
    /**企业ID*/
    @Excel(name = "责任人ID", width = 15)
    @Dict(dicCode = "id",dictTable ="sys_user",dicText = "realname")
    @ApiModelProperty(value = "责任人ID")
    private String responsibilityId;


    /*委外单位*/
    @Excel(name = "委外单位", width = 15)
    @ApiModelProperty(value = "委外单位")
    private String outsourcingUnit;


    /*实际工时*/
    @Excel(name = "实际工时", width = 15)
    @ApiModelProperty(value = "实际工时")
    private BigDecimal actualHour;

    /**紧急程度*/
    @Excel(name = "紧急程度", width = 15)
    @ApiModelProperty(value = "紧急程度")
    @Dict(dicCode = "urgency")
    private String urgency;

    /**派工方式*/
    @Excel(name = "派工方式", width = 15)
    @ApiModelProperty(value = "派工方式")
    @Dict(dicCode = "dispatch_method")
    private String dispatchMethod;

    /**业务类型*/
    @Excel(name = "业务类型", width = 15)
    @ApiModelProperty(value = "业务类型")
    @Dict(dicCode = "repair_order_business_type")
    private String businessType;
@@ -262,12 +235,15 @@


    @TableField(exist = false)
    @Excel(name = "统一编码", width = 15,orderNum = "6")
    private String equipmentNum;

    @TableField(exist = false)
    @Excel(name = "设备名称", width = 15,orderNum = "7")
    private String equipmentName;

    @TableField(exist = false)
    @Excel(name = "设备型号", width = 15,orderNum = "8")
    private String equipmentModel;
    @TableField(exist = false)
    private String reportRepairNum;
@@ -284,6 +260,7 @@

    @TableField(exist = false)
    @Dict(dicCode = "specific_equipment")
    @Excel(name = "关键设备标识", width = 15,orderNum = "0",dicCode = "specific_equipment")
    private String specificEquipment;
    @TableField(exist = false)
    List<RepairOrderFaultAnalysis> faultAnalysis;
@@ -302,6 +279,7 @@
    @TableField(exist = false)
    private String nums;
    @TableField(exist = false)
    @Excel(name = "报修人", width = 15,orderNum = "14")
    private String errUda2;
    @TableField(exist = false)
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -311,7 +289,25 @@
    private String errUda3;
    @TableField(exist = false)
    private BigDecimal faultHour;

    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private Date faultStartTime;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private Date faultEndTime;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private Date createStartTime;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private Date createEndTime;
    @TableField(exist = false)
    @Excel(name = "ABC标识", width = 15,orderNum = "1")
    private String equipmentImportanceId;


}

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

@@ -80,6 +80,34 @@
    @Excel(name = "result_7", width = 15)
    @ApiModelProperty(value = "result_7")
    private java.lang.String result_7;
    /**result_8*/
    @Excel(name = "result_8", width = 15)
    @ApiModelProperty(value = "result_8")
    private java.lang.String result_8;
    /**result_9*/
    @Excel(name = "result_9", width = 15)
    @ApiModelProperty(value = "result_9")
    private java.lang.String result_9;
    /**result_10*/
    @Excel(name = "result_10", width = 15)
    @ApiModelProperty(value = "result_10")
    private java.lang.String result_10;
    /**result_11*/
    @Excel(name = "result_11", width = 15)
    @ApiModelProperty(value = "result_11")
    private java.lang.String result_11;
    /**result_12*/
    @Excel(name = "result_12", width = 15)
    @ApiModelProperty(value = "result_12")
    private java.lang.String result_12;
    /**result_13*/
    @Excel(name = "result_13", width = 15)
    @ApiModelProperty(value = "result_13")
    private java.lang.String result_13;
    /**result_14*/
    @Excel(name = "result_14", width = 15)
    @ApiModelProperty(value = "result_14")
    private java.lang.String result_14;
    /**delFlag*/
    @Excel(name = "delFlag", width = 15)
    @ApiModelProperty(value = "delFlag")

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

@@ -132,6 +132,7 @@
                inspectionOrder.setInspectionStandardType("1");
                inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
                inspectionOrder.setTeamId(inspectionCycle.getTeamId());
                inspectionOrder.setStatus("3");
                inspectionOrderService.save(inspectionOrder);

                Equipment equipment = equipmentService.getById(inspectionCycle.getEquipmentId());
@@ -198,6 +199,7 @@
                inspectionOrder.setInspectionStandardType("1");
                inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
                inspectionOrder.setTeamId(inspectionCycle.getTeamId());
                inspectionOrder.setStatus("3");
                inspectionOrderService.save(inspectionOrder);
                //保存点检工单子表数据
                List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()

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

@@ -6,6 +6,7 @@
import org.jeecg.modules.eam.entity.RepairOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -37,7 +38,14 @@
                                         @Param("specificEquipment")     String     specificEquipment,
                                         @Param("teamId")   String teamId,
                                         @Param("equipNums") List<String> equipNums,
                                         @Param("repairOrderUda1") String repairOrderUda1
                                         @Param("repairOrderUda1") String repairOrderUda1,
                                         @Param("faultStartTime") Date faultStartTime,
                                         @Param("faultEndTime")Date faultEndTime,
                                         @Param("createStartTime")Date createStartTime,
                                         @Param("createEndTime")Date createEndTime,
                                         @Param("equipmentImportanceId")String equipmentImportanceId


    );

    IPage<Map<String, Object>> getUserTeam(IPage<Map> pageData, @Param("realname") String realname);

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

@@ -14,6 +14,6 @@
 * @Version: V1.0
 */
public interface StreamMapper extends BaseMapper<Stream> {
     List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId);
     List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId,@Param("num") String num);

}

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

@@ -32,7 +32,8 @@
            t1.write_person as writePerson,
            t1.audit_person as auditPerson,
            t1.approval_person as approvalPerson,
            t1.lose_efficacy_person as loseEfficacyPerson
            t1.lose_efficacy_person as loseEfficacyPerson,
            t1.dis_uda1 as disUda1
        FROM
            mom_eam_daily_inspection_standard t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id

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

@@ -9,6 +9,7 @@
            t1.location,
            t1.photo,
            t1.maintenance_project_id as maintenanceProjectId,
            t5.item_text as maintenanceRole,
            t3.num as maintenanceProjectNum,
            t3.name as maintenanceProjectName,
            t3.standard,
@@ -19,6 +20,7 @@
        LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_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 ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t5 ON t5.item_value = t1.maintenance_role
        where t1.del_flag = '0' and t2.del_flag = '0' and t3.del_flag = '0' and t2.type = 'daily'
        <if test="maintenanceStandardId != null and maintenanceStandardId != ''">
            and t2.id = #{maintenanceStandardId}
@@ -74,7 +76,7 @@
            t1.plan_end_time as planEndTime,
            t1.actual_start_time as actualStartTime,
            t1.actual_end_time as actualEndTime,
            t8.realname as maintenanceUserName,
            t1.maintenance_user_id as maintenanceUserId,
            t9.item_text as assignModeName,
            t1.create_by as createBy,
            t1.create_time as createTime,
@@ -95,7 +97,6 @@
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status
        left join sys_depart t6 on t3.use_id = t6.id
        left join mom_base_team t7 on t7.id = t3.team_id
        left join sys_user t8 on t1.maintenance_user_id = t8.id
        left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode
        left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
        left join sys_file_name t12 on t1.maintenance_order_uda3 = t12.id
@@ -143,7 +144,7 @@
        t1.plan_end_time as planEndTime,
        t1.actual_start_time as actualStartTime,
        t1.actual_end_time as actualEndTime,
        t8.realname as maintenanceUserName,
        t1.maintenance_user_id as maintenanceUserId,
        t9.item_text as assignModeName,
        t1.create_by as createBy,
        t1.create_time as createTime,
@@ -170,7 +171,6 @@
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status
        left join sys_depart t6 on t3.use_id = t6.id
        left join mom_base_team t7 on t7.id = t3.team_id
        left join sys_user t8 on t1.maintenance_user_id = t8.id
        left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode
        left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
        left join (SELECT * FROM v_sys_dict WHERE dict_code = 'check_status') t12 on t12.item_value = t1.check_status

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

@@ -3,41 +3,42 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EquipmentReportRepairMapper">
    <select id="getReportRepairList"  parameterType="Map" resultType="Map">
        SELECT
            t1.id,
            t1.err_uda1 errUda1,
            t1.err_uda2 errUda2,
            t1.num num,
            t1.equipment_id equipmentId,
            t1.fault_reason faultReason,
            t1.fault_description faultDescription,
            t1.photo photo,
            t1.is_stop isStop,
            t1.approval approval,
            t1.fault_time faultTime,
            t1.source source,
            t1.type,
            t1.source_id sourceId,
            t1.urgency urgency,
            t1.is_create_order isCreateOrder,
            t1.use_depart_id useDepartId,
            t1.remark remark,
            t1.status status,
            t1.create_by createBy,
            t1.create_time createTime,
            t1.update_by updateBy,
            t1.update_time updateTime,
            t1.accept_time acceptTime,
            t1.fault_hour faultHour,
            t2.num equipmentNum,
            t2.name equipmentName,
            t2.model equipmentModel,
            t2.team_id teamId,
            t2.specification equipmentSpecification,
            t3.depart_name departName,
            t4.item_text urgencyName,
            t5.item_text statusName,
            t6.item_text isStopName,
            t7.item_text errUda1_dictText
        t1.id,
        t1.err_uda1 errUda1,
        t1.err_uda2 errUda2,
        t1.num num,
        t1.equipment_id equipmentId,
        t1.fault_reason faultReason,
        t1.fault_description faultDescription,
        t1.photo photo,
        t1.is_stop isStop,
        t1.approval approval,
        t1.fault_time faultTime,
        t1.type,
        t1.source source,
        t1.source_id sourceId,
        t1.urgency urgency,
        t1.is_create_order isCreateOrder,
        t1.use_depart_id useDepartId,
        t1.remark remark,
        t1.status status,
        t1.create_by createBy,
        t1.create_time createTime,
        t1.update_by updateBy,
        t1.update_time updateTime,
        t1.accept_time acceptTime,
        t1.fault_hour faultHour,
        t2.num equipmentNum,
        t2.name equipmentName,
        t2.model equipmentModel,
        t2.specific_equipment specificEquipment,
        t2.team_id teamId,
        t2.specification equipmentSpecification,
        t3.depart_name departName,
        t4.item_text urgencyName,
        t5.item_text statusName,
        t6.item_text isStopName,
        t7.item_text errUda1_dictText
        FROM
        mom_eam_equipment_report_repair t1
        left join mom_eam_equipment t2 on t1.equipment_id = t2.id
@@ -89,6 +90,9 @@
        <if test="params.model != null and params.model != ''">
            and t2.model like concat('%',#{params.model},'%')
        </if>
        <if test="params.specificEquipment != null and params.specificEquipment != ''">
            and t2.specific_equipment = #{params.specificEquipment}
        </if>
        <if test="params.specification != null and params.specification != ''">
            and t2.specification like concat('%',#{params.specification},'%')
        </if>

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

@@ -29,7 +29,7 @@
        left join sys_depart t4 on t2.use_id = t4.id
        left join mom_base_team t5 on t2.team_id = t5.id
        left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
        where t1.del_flag = 0 and t1.type = #{params.type}
        where t1.del_flag = 0 and t1.type = #{params.type} and t2.technology_status in ('qualified','limitedUse')
        <if test="params.useId != null and params.useId != ''">
            and t2.use_id = #{params.useId}
        </if>
@@ -78,7 +78,7 @@
        left join sys_depart t4 on t2.use_id = t4.id
        left join mom_base_team t5 on t2.team_id = t5.id
        left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
        where t1.del_flag = 0 and t1.type = #{params.type} and t2.equipment_importance_id in ('A','B','C')
        where t1.del_flag = 0 and t1.type = #{params.type} and t2.equipment_importance_id in ('A','B','C') and t2.technology_status in ('qualified','limitedUse')
        <if test="params.useId != null and params.useId != ''">
            and t2.use_id = #{params.useId}
        </if>

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

@@ -16,7 +16,6 @@
        t1.preventive_measure preventiveMeasure,
        t1.fault_remove faultRemove,
        t1.fault_description faultDescription,
        t1.fault_time faultTime,
        t1.photo photo,
        t1.is_stop isStop,
        t1.maintenance_method maintenanceMethod,
@@ -47,10 +46,12 @@
        report.accept_time acceptTime,
        report.err_uda3 errUda3,
        report.fault_hour faultHour,
        report.fault_time faultTime,
        t2.num equipmentNum,
        t2.name equipmentName,
        t2.model equipmentModel,
        t2.specific_equipment specificEquipment,
        t2.equipment_importance_id equipmentImportanceId,
        t3.depart_name departName,
        t4.name outsourcingUnitName,
        t5.realname responsibilityName,
@@ -96,11 +97,26 @@
        <if test="specificEquipment != null and specificEquipment != ''">
            and t2.specific_equipment = #{specificEquipment}
        </if>
        <if test="equipmentImportanceId != null and  equipmentImportanceId != ''">
            and t2. equipment_importance_id = #{equipmentImportanceId}
        </if>
        <if test="teamId != null and teamId != ''">
            and t1.team_id = #{teamId}
        </if>
        <if test="repairOrderType != null and repairOrderType != ''">
        and t1.repair_order_type = #{repairOrderType}
            and t1.repair_order_type = #{repairOrderType}
        </if>
        <if test="faultStartTime != null">
            and report.fault_time &gt;= #{faultStartTime}
        </if>
        <if test="faultEndTime != null">
            and report.fault_time &lt;= #{faultEndTime}
        </if>
        <if test="createStartTime != null">
            and t1.create_time &gt;= #{createStartTime}
        </if>
        <if test="createEndTime != null">
            and t1.create_time &lt;= #{createEndTime}
        </if>
        order by t1.create_time desc
    </select>

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

@@ -6,6 +6,9 @@
        from mom_eam_stream t1
        left join sys_user t2 on t2.id = t1.create_by
        where 1=1
        <if test="num != null and num != ''">
            and t1.num like concat('%',#{num},'%')
        </if>
        <choose>
            <when test="areaId != null and areaId != ''">
                and t2.area_id = #{areaId}

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

@@ -16,6 +16,13 @@
            ISNULL( t1.result_5, 0 ) AS result_5,
            ISNULL( t1.result_6, 0 ) AS result_6,
            ISNULL( t1.result_7, 0 ) AS result_7,
            ISNULL( t1.result_8, 0 ) AS result_8,
            ISNULL( t1.result_9, 0 ) AS result_9,
            ISNULL( t1.result_10, 0 ) AS result_10,
            ISNULL( t1.result_11, 0 ) AS result_11,
            ISNULL( t1.result_12, 0 ) AS result_12,
            ISNULL( t1.result_13, 0 ) AS result_13,
            ISNULL( t1.result_14, 0 ) AS result_14,
            t1.receipts,
            t2.num AS receiptsNum,
            t3.item_text AS receiptsName,

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

@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,8 +17,12 @@
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
import org.jeecg.modules.eam.vo.RepairReportExportVo;
import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.entity.SysUserRole;
import org.jeecg.modules.system.mapper.SysRoleMapper;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.mapper.SysUserRoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -41,6 +47,10 @@
    private ISysBaseAPI sysBaseApi;
    @Autowired
    private SysUserMapper userMapper;
    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;
    @Autowired
    private SysRoleMapper sysRoleMapper;
    /**
     * æ•…障报修添加
     *
@@ -102,7 +112,15 @@
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        if(StringUtils.isNotBlank((String)params.get("userId"))){
            SysUser sysUser = userMapper.selectById((String)params.get("userId"));
            params.put("teamId",sysUser.getTeamId());
            SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("role_code","AcceptAllRepair"));
            if(ObjectUtils.isNull(sysRole)){
                params.put("teamId",sysUser.getTeamId());
            }else {
                SysUserRole sysUserRole = sysUserRoleMapper.selectOne(new QueryWrapper<SysUserRole>().eq("user_id",sysUser.getId()).eq("role_id",sysRole.getId()));
                if(ObjectUtils.isNull(sysUserRole)){
                    params.put("teamId",sysUser.getTeamId());
                }
            }
        }
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank((String)params.get("nums"))){

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

@@ -105,7 +105,24 @@
        if(StringUtils.isNotBlank(repairOrder.getNums())){
            equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
        }
        return page.setRecords(baseMapper.getRepairOrderList(page,repairOrder.getId(),repairOrder.getNum(),repairOrder.getEquipmentNum(),repairOrder.getEquipmentName(),repairOrder.getStatus(),repairOrder.getRepairOrderType(),repairOrder.getEquipmentCategoryId(),repairOrder.getFactoryModelId(),repairOrder.getSpecificEquipment(),repairOrder.getTeamId(),equipNums,repairOrder.getRepairOrderUda1()));
        return page.setRecords(baseMapper.getRepairOrderList(page,
                repairOrder.getId(),
                repairOrder.getNum(),
                repairOrder.getEquipmentNum(),
                repairOrder.getEquipmentName(),
                repairOrder.getStatus(),
                repairOrder.getRepairOrderType(),
                repairOrder.getEquipmentCategoryId(),
                repairOrder.getFactoryModelId(),
                repairOrder.getSpecificEquipment(),
                repairOrder.getTeamId(),
                equipNums,
                repairOrder.getRepairOrderUda1(),
                repairOrder.getFaultStartTime(),
                repairOrder.getFaultEndTime(),
                repairOrder.getCreateStartTime(),
                repairOrder.getCreateEndTime(),
                repairOrder.getEquipmentImportanceId()));
    }

    @Override

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

@@ -49,7 +49,7 @@

    @Override
    public Page<Stream> myPage(Page<Stream> page, Stream stream) {
        return page.setRecords(baseMapper.myPage(page,stream.getAreaId()));
        return page.setRecords(baseMapper.myPage(page,stream.getAreaId(),stream.getNum()));
    }



 lxzn-module-system/lxzn-system-start/src/main/resources/db/2024_1_11(lnl)/lnl.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1745311913753559042', N'1638420030147723265', N'计量检测设备', N'/eam/EquipmentListOfMetrological', N'eam/EquipmentListOfMetrological', NULL, NULL, 1, NULL, N'1', 10.1, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2024-01-11 13:09:21.0000000', N'admin', '2024-01-11 13:09:57.1730000', 0, NULL, N'1', 0);

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745294580473511937', N'1695985281980776449', N'计量检测设备', N'metrological', '', 15, 1, N'admin', '2024-01-11 12:00:28.6580000', NULL, NULL);

INSERT INTO [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745327833121144834', N'所有保修单接收人', N'AcceptAllRepair', NULL, N'admin', '2024-01-11 14:12:36.6980000', NULL, NULL);

INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1745365425845702657', N'物料类型', N'material_type', '', 0, N'admin', '2024-01-11 16:41:59.4940000', NULL, NULL, NULL);

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745365536852152322', N'1745365425845702657', N'加工件', N'needPart', '', 1, 1, N'admin', '2024-01-11 16:42:25.0000000', N'admin', '2024-01-11 16:45:00.3490000');

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745365875504451586', N'1745365425845702657', N'采购件', N'needSpare', '', 1, 1, N'admin', '2024-01-11 16:43:46.0000000', N'admin', '2024-01-11 16:44:24.5800000');

INSERT INTO [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745624015416393730', N'设备质量隐患确认消息接收人', N'QuanlityConfirm', NULL, N'admin', '2024-01-12 09:49:32.0660000', NULL, NULL);

INSERT INTO [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745625163405787138', N'设备事故登记消息接收人', N'FaultInfo', NULL, N'admin', '2024-01-12 09:54:05.7710000', NULL, NULL);

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745624699176026113', N'1724240975967690753', N'质量隐患确认', N'QuanlityConfirm', '', 10, 1, N'admin', '2024-01-12 09:52:15.0830000', NULL, NULL);

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745624959524864001', N'1724240975967690753', N'设备事故登记确认', N'FaultInfo', '', 11, 1, N'admin', '2024-01-12 09:53:17.1640000', NULL, NULL);